diff options
Diffstat (limited to 'configure.in')
| -rw-r--r-- | configure.in | 95 |
1 files changed, 73 insertions, 22 deletions
diff --git a/configure.in b/configure.in index 0f658c8cbde6..00a5d5dde8b5 100644 --- a/configure.in +++ b/configure.in @@ -129,7 +129,7 @@ AC_ARG_ENABLE(evolution2, ],,) AC_ARG_WITH(system-stdlibs, [ --with-system-stdlibs use libstdc++/libgcc_s already on system -],,checkforstdlibproblems=yes) +],,) AC_ARG_ENABLE(cups, [ --disable-cups disable cups support in the psprint project ],,enable_cups=yes) @@ -515,6 +515,9 @@ AC_ARG_WITH(system-curl, AC_ARG_WITH(system-boost, [ --with-system-boost Use boost already on system ],,) +AC_ARG_WITH(system-mdds, +[ --with-system-mdds Use mdds already on system +],,) AC_ARG_WITH(system-vigra, [ --with-system-vigra Use vigra already on system ],,) @@ -813,6 +816,9 @@ AC_ARG_ENABLE(verbose, [ --enable-verbose Increase build verbosity. --disable-verbose Decrease build verbosity. ],,) +AC_ARG_ENABLE(dependency-tracking, +[ --disable-dependency-tracking Disables generation of dependency information. +],,) BUILD_TYPE="OOo" @@ -3498,23 +3504,6 @@ AC_SUBST(MINGWCXX) AC_SUBST(MINGWSTRIP) dnl =================================================================== -dnl Check for prelinked libgcc_s.so.1 -dnl =================================================================== -if test "$_os" = "Linux" -a -z "$with_system_stdlibs" -a -z "$with_system_libs"; then - if test -n "$checkforstdlibproblems"; then - if test -f /etc/rpm/macros.prelink; then - with_system_stdlibs=yes - AC_MSG_WARN([prelinked libgcc_s.so.1, enabling --with-system-stdlibs, use --without-system-stdlibs to override]) - echo "prelinked libgcc_s.so.1, enabling --with-system-stdlibs, use --without-system-stdlibs to override" >> warn - elif test "$GCC" = "yes" -a ! -e `$CC -print-file-name=libgcc_s.so.1`; then - with_system_stdlibs=yes - AC_MSG_WARN([platform doesn't have a libgcc_s.so.1, enabling --with-system-stdlibs, use --without-system-stdlibs to override]) - echo "platform doesn't have a libgcc_s.so.1, enabling --with-system-stdlibs, use --without-system-stdlibs to override" >> warn - fi - fi -fi - -dnl =================================================================== dnl Check for system stdlibs dnl =================================================================== AC_MSG_CHECKING([whether to provide libstdc++/libgcc_s in the installset]) @@ -4192,6 +4181,25 @@ AC_SUBST(CURL_CFLAGS) AC_SUBST(CURL_LIBS) dnl =================================================================== +dnl Check for system mdds +dnl =================================================================== +AC_MSG_CHECKING([which mdds to use]) +if test -n "$with_system_mdds" -o -n "$with_system_headers" && \ + test "$with_system_mdds" != "no"; then + AC_MSG_RESULT([external]) + SYSTEM_MDDS=YES + AC_LANG_PUSH([C++]) + AC_CHECK_HEADER(mdds/flat_segment_tree.hpp, [], + [AC_MSG_ERROR(mdds/flat_segment_tree.hpp not found. install mdds)], []) + AC_LANG_POP([C++]) +else + AC_MSG_RESULT([internal]) + BUILD_TYPE="$BUILD_TYPE MDDS" + SYSTEM_MDDS=NO +fi +AC_SUBST(SYSTEM_MDDS) + +dnl =================================================================== dnl Check for system boost dnl =================================================================== AC_MSG_CHECKING([which boost to use]) @@ -5090,15 +5098,30 @@ AC_MSG_CHECKING([which mythes to use]) if test -n "$with_system_mythes" && test "$with_system_mythes" != "no"; then AC_MSG_RESULT([external]) SYSTEM_MYTHES=YES - AC_CHECK_HEADER(mythes.hxx, [], - [ AC_MSG_ERROR(mythes.hxx headers not found.)], []) - AC_CHECK_LIB(mythes, main, [], - [ AC_MSG_ERROR(mythes library not found.)], []) + AC_LANG_PUSH([C++]) + PKG_CHECK_MODULES(MYTHES, mythes, MYTHES_PKGCONFIG=yes, MYTHES_PKGCONFIG=no) + if test "$MYTHES_PKGCONFIG" = "no"; then + AC_CHECK_HEADER(mythes.hxx, [], + [ AC_MSG_ERROR(mythes.hxx headers not found.)], []) + AC_CHECK_LIB(mythes-1.2, main, [], + [ MYTHES_FOUND=no], []) + if test "$MYTHES_FOUND" = "no"; then + AC_CHECK_LIB(mythes, main, [MYTHES_FOUND=yes], + [ MYTHES_FOUND=no], []) + fi + if test "$MYTHES_FOUND" = "no"; then + AC_MSG_ERROR([mythes library not found!.]) + fi + fi + AC_LANG_POP([C++]) else AC_MSG_RESULT([internal]) SYSTEM_MYTHES=NO + BUILD_TYPE="$BUILD_TYPE MYTHES" fi AC_SUBST(SYSTEM_MYTHES) +AC_SUBST(MYTHES_CFLAGS) +AC_SUBST(MYTHES_LIBS) dnl =================================================================== dnl Checking for lpsolve @@ -5134,6 +5157,21 @@ if test "$_os" = "Linux"; then fi fi +if test "$_os" != "WNT"; then + AC_CHECK_FUNCS(getopt, HAVE_GETOPT=YES, [HAVE_GETOPT=NO]) + AC_CHECK_FUNCS(readdir_r, HAVE_READDIR_R=YES, [HAVE_READDIR_R=NO]) + if test "$HAVE_GETOPT" = "YES" -a "$HAVE_READDIR_R" = "YES"; then + SYSTEM_LIBC=YES + fi +else + HAVE_GETOPT=NO + HAVE_READDIR_R=NO + SYSTEM_LIBC=YES +fi +AC_SUBST(HAVE_GETOPT) +AC_SUBST(HAVE_READDIR_R) +AC_SUBST(SYSTEM_LIBC) + dnl ========================================= dnl Check for the Microsoft Platform SDK. dnl ========================================= @@ -6868,6 +6906,19 @@ fi AC_SUBST(VERBOSE) dnl =================================================================== +dnl Hook up OOos nodep environmental variable to automake's equivalent +dnl --enable-dependency-tracking configure option +dnl =================================================================== +AC_MSG_CHECKING([whether to enable dependency tracking]) +if test "$enable_dependency_tracking" = "no"; then + nodep=TRUE + AC_MSG_RESULT([no]) +else + AC_MSG_RESULT([yes]) +fi +AC_SUBST(nodep) + +dnl =================================================================== dnl Setting up the environment. dnl =================================================================== echo "********************************************************************" |