X-Git-Url: http://lists.indexdata.com/cgi-bin?a=blobdiff_plain;f=configure.ac;h=6658ba9c007800ab3ba881bd2393b339e00fbb8d;hb=219ffa015c0e35b03fae0788b0e8e6abcfde1a81;hp=bba803dbd795f4ff4501475db947a59085dd51b4;hpb=efe16756b891974b3cd72e8de8ed5bdbdb5ba980;p=metaproxy-moved-to-github.git

diff --git a/configure.ac b/configure.ac
index bba803d..6658ba9 100644
--- a/configure.ac
+++ b/configure.ac
@@ -23,57 +23,58 @@ AC_PROG_MAKE_SET
 AC_PROG_RANLIB
 AM_PROG_LIBTOOL
 
-# Use C++ compilers only for tests
-AC_LANG(C++)
+# Default language to use for tests (some tests may switch to C++)
+AC_LANG(C)
 
 if test "$enable_shared" = "yes"; then
-   	AC_DEFINE([HAVE_DL_SUPPORT],[1],
-                [Define to 1 if you have shared module support])
+    AC_DEFINE([HAVE_DL_SUPPORT],[1],
+	[Define to 1 if you have shared module support])
 fi
 
 # Checks for libraries.
 AC_CHECK_LIB(dl,dlopen)
+AC_CHECK_LIB(m,main)
 
+## YAZPP checks
+YAZPP_INIT(threads,1.0.2)
+if test -z "$YAZPPLIB"; then
+    AC_MSG_ERROR([YAZ++ development libraries missing])
+fi
+YAZ_DOC
+CPPFLAGS="$YAZPPINC $CPPFLAGS"
 
 # check for Boost C++ development libs and headers
 
 AX_BOOST([1.32])
 if test "$ax_cv_boost_base" = "no"; then
-   AC_MSG_ERROR([install libboost-dev or similar])
+    AC_MSG_ERROR([install libboost-dev or similar])
 fi
 if test "$ax_cv_boost_date_time" = "no"; then
-   AC_MSG_ERROR([install libboost-date-time-dev or similar])
+    AC_MSG_ERROR([install libboost-date-time-dev or similar])
 fi
 if test "$ax_cv_boost_program_options" = "no"; then
-   AC_MSG_ERROR([install libboost-program-options-dev or similar])
+    AC_MSG_ERROR([install libboost-program-options-dev or similar])
 fi
 if test "$ax_cv_boost_thread" = "no"; then
-   AC_MSG_ERROR([install libboost-thread-dev or similar])
+    AC_MSG_ERROR([install libboost-thread-dev or similar])
 fi
 if test "$ax_cv_boost_unit_test_framework" = "no"; then
-   AC_MSG_ERROR([install libboost-test-dev or similar])
+    AC_MSG_ERROR([install libboost-test-dev or similar])
 fi
     
 
-## YAZPP checks
-YAZPP_INIT(threads,1.0.2)
-if test -z "$YAZPPLIB"; then
-	AC_MSG_ERROR([YAZ++ development libraries missing])
-fi
-YAZ_DOC
 
 # Checks for header files.
 ##AC_HEADER_STDC
 ##AC_HEADER_SYS_WAIT
 ##AC_HEADER_TIME 
-AC_CHECK_HEADERS(sys/select.h sys/socket.h iostream list vector stdexcept)
+AC_CHECK_HEADERS(sys/select.h sys/socket.h)
 
 # Checks for typedefs, structures, and compiler characteristics.
 ##AC_TYPE_SIZE_T 
 ##AC_CHECK_SIZEOF(int)
 ##AC_CHECK_SIZEOF(long int)
 
-
 # Checks for library functions.
 
 AC_CONFIG_FILES([
@@ -125,3 +126,8 @@ echo \
   Bugreport:                  ${PACKAGE_BUGREPORT}
 
 ------------------------------------------------------------------------"
+dnl Local Variables:
+dnl mode:shell-script
+dnl sh-indentation: 2
+dnl sh-basic-offset: 4
+dnl End: