-fixing build issues in vpn related to #3047
[oweals/gnunet.git] / configure.ac
index 5d28de60afd4f803d0c2b3e5d52eea29359d108b..471be3e29551e3d9f9d5cc4a40005c5b208ed43d 100644 (file)
 #
 AC_PREREQ(2.61)
 # Checks for programs.
-AC_INIT([gnunet], [0.9.5a],[bug-gnunet@gnu.org])
+AC_INIT([gnunet], [0.9.5a], [bug-gnunet@gnu.org])
 
 AC_CANONICAL_TARGET
 AC_CANONICAL_HOST
 AC_CANONICAL_SYSTEM
 
-AM_INIT_AUTOMAKE([gnunet], [0.9.5a])
+AM_INIT_AUTOMAKE
 m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])])
 AC_CONFIG_HEADERS([gnunet_config.h])
 AH_TOP([#define _GNU_SOURCE  1])
@@ -43,10 +43,6 @@ AC_PROG_LN_S
 AC_PROG_MAKE_SET
 AM_PROG_CC_C_O
 LT_INIT([disable-static dlopen win32-dll])
-LT_CONFIG_LTDL_DIR([libltdl])
-LTDL_INIT
-AC_SUBST(LTDLINCL)
-AC_SUBST(LIBLTDL)
 AC_SUBST(MKDIR_P)
 
 # large file support
@@ -372,6 +368,10 @@ then
 else
   AM_CONDITIONAL(HAVE_LIBBLUETOOTH, false)
 fi
+if test "$build_target" = "mingw"
+then
+  bluetooth=1
+fi
 
 
 # libcurl
@@ -421,19 +421,7 @@ else
        AC_DEFINE([HAVE_LIBGLPK],[1],[Have GLPK])
 fi
 
-# test for glib
-# Minimum required version for glibtop is 2.6.0
-AM_PATH_GLIB_2_0(2.6.0, [glib2=true] , [glib2=false] ,)
-if test x$glib2 = xfalse
-then
-       AM_CONDITIONAL(HAVE_GLIB2, false)
-       AC_MSG_WARN([GNUnet requires GLIB >= 2.6.0])
-else
-       AM_CONDITIONAL(HAVE_GLIB2, true)
-       AC_DEFINE([HAVE_GLIB2],[1],[Have glib2])
-       LIBS="$LIBS $GLIB_LIBS"
-       CFLAGS="$CFLAGS $GLIB_CFLAGS"
-fi
+
 
 AC_CHECK_HEADERS([nss.h],[nss=true],[nss=false])
 if test x$nss = xfalse
@@ -485,6 +473,43 @@ fi
 # restore LIBS
 LIBS=$SAVE_LIBS
 
+# Check for libltdl header (#2999)
+ltdl=0
+AC_MSG_CHECKING(for libltdl)
+AC_ARG_WITH(ltdl,
+   [  --with-ltdl=PFX    base of libltdl installation],
+   [AC_MSG_RESULT([$with_ltdl])
+    case $with_ltdl in
+      no)
+        ;;
+      yes)
+        AC_CHECK_HEADERS(ltdl.h,
+          AC_CHECK_LIB([ltdl], [lt_dlopenext],
+            ltdl=1))
+        ;;
+      *)
+        LDFLAGS="-L$with_ltdl/lib $LDFLAGS"
+        CPPFLAGS="-I$with_ltdl/include $CPPFLAGS"
+        AC_CHECK_HEADERS(ltdl.h,
+          AC_CHECK_LIB([ltdl], [lt_dlopenext],
+            EXT_LIB_PATH="-L$with_ltdl/lib $EXT_LIB_PATH"
+            ltdl=1))
+        ;;
+    esac
+   ],
+   [AC_MSG_RESULT([--with-ltdl not specified])
+    AC_CHECK_HEADERS(ltdl.h,
+     AC_CHECK_LIB([ltdl], [lt_dlopenext],
+      ltdl=1))])
+if test x$ltdl = x1
+then
+ AC_MSG_RESULT([libltdl found])
+else
+ AC_MSG_ERROR([GNUnet requires libltdl (from GNU libtool), try installing libltdl-dev])
+fi
+# restore LIBS
+LIBS=$SAVE_LIBS
+
 # test for libunistring
 gl_LIBUNISTRING
 if test $HAVE_LIBUNISTRING != yes; then
@@ -506,8 +531,6 @@ AC_HEADER_STDC
 AC_CHECK_HEADERS([fcntl.h math.h errno.h ctype.h limits.h stdio.h stdlib.h string.h unistd.h stdarg.h signal.h locale.h sys/stat.h sys/types.h],,AC_MSG_ERROR([Compiling GNUnet requires standard UNIX headers files]))
 
 
-# Check for libltdl header (#2999)
-AC_CHECK_HEADERS([ltdl.h],,AC_MSG_ERROR([Compiling GNUnet requires libltdl headers (try installing libltdl-dev)]))
 
 # Checks for headers that are only required on some systems or opional (and where we do NOT abort if they are not there)
 AC_CHECK_HEADERS([malloc.h malloc/malloc.h langinfo.h sys/param.h sys/mount.h sys/statvfs.h sys/select.h sockLib.h sys/mman.h sys/msg.h sys/vfs.h arpa/inet.h fcntl.h libintl.h netdb.h netinet/in.h netinet/in_systm.h netinet/ip.h sys/ioctl.h sys/socket.h sys/time.h unistd.h kstat.h sys/sysinfo.h kvm.h sys/file.h sys/resource.h ifaddrs.h mach/mach.h stddef.h sys/timeb.h terminos.h argz.h ucred.h endian.h sys/endian.h execinfo.h])
@@ -712,12 +735,12 @@ AC_ARG_WITH(microhttpd,
         AC_CHECK_HEADERS([microhttpd.h],
          AC_CHECK_DECL(MHD_OPTION_PER_IP_CONNECTION_LIMIT,
             AC_CHECK_LIB([microhttpd], [MHD_start_daemon],
-              [AC_MSG_CHECKING([for libmicrohttpd >= 0.9.18])
-              AC_RUN_IFELSE([
+              [AC_MSG_CHECKING([for libmicrohttpd >= 0.9.31])
+              AC_RUN_IFELSE([AC_LANG_SOURCE([
                 #include "$native_srcdir/src/include/platform.h"
                 #include <microhttpd.h>
-                int main () { return MHD_VERSION >= 0x0091200 ? 0 : 1; }
-               ], [
+                int main () { return MHD_VERSION >= 0x0093002 ? 0 : 1; }
+               ])], [
                AC_MSG_RESULT(ok)
                lmhd=1],[AC_MSG_RESULT(failed)],lmhd=1)]),
            [],[#include "$native_srcdir/src/include/platform.h"
@@ -731,12 +754,12 @@ AC_ARG_WITH(microhttpd,
          AC_CHECK_DECL(MHD_OPTION_PER_IP_CONNECTION_LIMIT,
             AC_CHECK_LIB([microhttpd], [MHD_start_daemon],
               EXT_LIB_PATH="-L$with_microhttpd/lib $EXT_LIB_PATH"
-              [AC_MSG_CHECKING([for libmicrohttpd >= 0.9.18])
-               AC_RUN_IFELSE([
+              [AC_MSG_CHECKING([for libmicrohttpd >= 0.9.31])
+               AC_RUN_IFELSE([AC_LANG_SOURCE([
                 #include "$native_srcdir/src/include/platform.h"
                 #include <microhttpd.h>
-                int main () { return MHD_VERSION >= 0x0091200 ? 0 : 1; }
-               ], [
+                int main () { return MHD_VERSION >= 0x0093002 ? 0 : 1; }
+               ])], [
                AC_MSG_RESULT(ok)
                lmhd=1],[AC_MSG_RESULT(failed)],lmhd=1)]),
            [],[#include "$native_srcdir/src/include/platform.h"
@@ -749,12 +772,12 @@ AC_ARG_WITH(microhttpd,
     AC_CHECK_HEADERS([microhttpd.h],
       AC_CHECK_DECL(MHD_OPTION_PER_IP_CONNECTION_LIMIT,
         AC_CHECK_LIB([microhttpd], [MHD_start_daemon],
-          [AC_MSG_CHECKING([for libmicrohttpd >= 0.9.18])
-              AC_RUN_IFELSE([
+          [AC_MSG_CHECKING([for libmicrohttpd >= 0.9.31])
+              AC_RUN_IFELSE([AC_LANG_SOURCE([
                 #include "$native_srcdir/src/include/platform.h"
                #include <microhttpd.h>
-                int main () { return MHD_VERSION >= 0x0091200 ? 0 : 1; }
-               ], [
+                int main () { return MHD_VERSION >= 0x0093002 ? 0 : 1; }
+               ])], [
                AC_MSG_RESULT(ok)
                lmhd=1],[AC_MSG_RESULT(failed)],lmhd=1)]),
        [],[#include "$native_srcdir/src/include/platform.h"
@@ -1043,7 +1066,7 @@ AC_MSG_RESULT($enable_monkey)
 AM_CONDITIONAL([ENABLE_MONKEY], [test "x$enable_monkey" = "xyes"])
 if test "x$enable_monkey" = "xyes"
 then
-  MONKEYPREFIX="monkey"
+  MONKEYPREFIX="pathologist -d $(eval echo ${datarootdir}/gnunet/gnunet.sqlite) -p 30 --"
 else
   MONKEYPREFIX=""
 fi
@@ -1267,6 +1290,7 @@ src/arm/arm.conf
 src/ats/Makefile
 src/ats/ats.conf
 src/ats-tool/Makefile
+src/ats-tests/Makefile
 src/block/Makefile
 src/core/Makefile
 src/core/core.conf
@@ -1281,6 +1305,7 @@ src/dns/Makefile
 src/dns/dns.conf
 src/dv/Makefile
 src/dv/dv.conf
+src/env/Makefile
 src/exit/Makefile
 src/experimentation/Makefile
 src/experimentation/experimentation.conf
@@ -1291,15 +1316,18 @@ src/gns/Makefile
 src/gns/gns.conf
 src/gns/nss/Makefile
 src/hello/Makefile
-src/include/Makefile
-src/include/gnunet_directories.h
 src/identity/Makefile
 src/identity/identity.conf
+src/include/Makefile
+src/include/gnunet_directories.h
+src/integration-tests/Makefile
 src/hostlist/Makefile
 src/lockmanager/Makefile
 src/lockmanager/lockmanager.conf
 src/mesh/Makefile
 src/mesh/mesh.conf
+src/multicast/Makefile
+src/multicast/multicast.conf
 src/mysql/Makefile
 src/namestore/Makefile
 src/namestore/namestore.conf
@@ -1310,9 +1338,17 @@ src/peerinfo/Makefile
 src/peerinfo/peerinfo.conf
 src/peerinfo-tool/Makefile
 src/postgres/Makefile
+src/psyc/Makefile
+src/psyc/psyc.conf
+src/psycstore/Makefile
+src/psycstore/psycstore.conf
 src/pt/Makefile
 src/regex/Makefile
 src/regex/regex.conf
+src/revocation/Makefile
+src/revocation/revocation.conf
+src/scalarproduct/Makefile
+src/scalarproduct/scalarproduct.conf
 src/set/Makefile
 src/set/set.conf
 src/statistics/Makefile
@@ -1329,7 +1365,6 @@ src/util/Makefile
 src/util/resolver.conf
 src/vpn/Makefile
 src/vpn/vpn.conf
-src/integration-tests/Makefile
 pkgconfig/Makefile
 pkgconfig/gnunetats.pc
 pkgconfig/gnunetarm.pc