Switch to unified view

a/src/configure.ac b/src/configure.ac
1
AC_INIT([Recoll], m4_esyscmd_s(cat VERSION))
1
AC_INIT([Recoll], m4_esyscmd_s(cat VERSION))
2
AC_CONFIG_HEADERS([common/autoconfig.h])
2
AC_CONFIG_HEADERS([common/autoconfig.h])
3
AH_BOTTOM([#include "conf_post.h"])
3
AC_PREREQ(2.53)
4
AC_PREREQ(2.53)
4
AC_CONFIG_SRCDIR(index/recollindex.cpp)
5
AC_CONFIG_SRCDIR(index/recollindex.cpp)
5
6
6
AM_INIT_AUTOMAKE([1.10 no-define subdir-objects foreign])
7
AM_INIT_AUTOMAKE([1.10 no-define subdir-objects foreign])
7
AC_DISABLE_STATIC
8
AC_DISABLE_STATIC
...
...
39
AC_LANG_PUSH([C++])
40
AC_LANG_PUSH([C++])
40
AC_CHECK_HEADER(tr1/unordered_map,[AC_DEFINE([HAVE_TR1_UNORDERED],
41
AC_CHECK_HEADER(tr1/unordered_map,[AC_DEFINE([HAVE_TR1_UNORDERED],
41
    [],["Have tr1"])],[])
42
    [],["Have tr1"])],[])
42
AC_CHECK_HEADER(unordered_map,[AC_DEFINE([HAVE_CXX0X_UNORDERED],
43
AC_CHECK_HEADER(unordered_map,[AC_DEFINE([HAVE_CXX0X_UNORDERED],
43
    [],["Have C++0x"])],[])
44
    [],["Have C++0x"])],[])
45
AC_TRY_COMPILE([
46
    #include <memory>
47
  ],[
48
    std::shared_ptr<int> ptr;
49
  ], rcl_shared_ptr_std="1", rcl_shared_ptr_std="0")
50
AC_TRY_COMPILE([
51
    #include <tr1/memory>
52
  ],[
53
    std::tr1::shared_ptr<int> ptr;
54
  ], rcl_shared_ptr_tr1="1", rcl_shared_ptr_tr1="0")
55
if test X$rcl_shared_ptr_std = X1; then 
56
   AC_DEFINE(HAVE_SHARED_PTR_STD, [], [Has std::shared_ptr])
57
elif test X$rcl_shared_ptr_tr1 = X1; then 
58
   AC_DEFINE(HAVE_SHARED_PTR_TR1, [], [Has std::tr1::shared_ptr])
59
fi
44
AC_LANG_POP([C++])
60
AC_LANG_POP([C++])
45
61
46
AC_CHECK_HEADERS([sys/mount.h sys/statfs.h sys/statvfs.h sys/vfs.h], [], [],
62
AC_CHECK_HEADERS([sys/mount.h sys/statfs.h sys/statvfs.h sys/vfs.h], [], [],
47
[#ifdef HAVE_SYS_PARAM_H
63
[#ifdef HAVE_SYS_PARAM_H
48
# include <sys/param.h>
64
# include <sys/param.h>