-rollback accidental commit

[oweals/gnunet.git] / configure.ac

diff --git a/configure.ac b/configure.ac
index e39c26e2436e7d1fdbc031d7f7905e8c1c063b4d..055d5533442d1ec266026fb32b27d813ac9b3954 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -368,6 +368,10 @@ then
 else
   AM_CONDITIONAL(HAVE_LIBBLUETOOTH, false)
 fi
+if test "$build_target" = "mingw"
+then
+  bluetooth=1
+fi
 
 
 # libcurl
@@ -497,8 +501,10 @@ AC_ARG_WITH(ltdl,
     AC_CHECK_HEADERS(ltdl.h,
      AC_CHECK_LIB([ltdl], [lt_dlopenext],
       ltdl=1))])
-if test "$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
@@ -729,11 +735,11 @@ 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.30])
+              [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 >= 0x0093000 ? 0 : 1; }
+                int main () { return MHD_VERSION >= 0x0093002 ? 0 : 1; }
                ])], [
                AC_MSG_RESULT(ok)
                lmhd=1],[AC_MSG_RESULT(failed)],lmhd=1)]),
@@ -748,11 +754,11 @@ 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.30])
+              [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 >= 0x0093000 ? 0 : 1; }
+                int main () { return MHD_VERSION >= 0x0093002 ? 0 : 1; }
                ])], [
                AC_MSG_RESULT(ok)
                lmhd=1],[AC_MSG_RESULT(failed)],lmhd=1)]),
@@ -766,11 +772,11 @@ 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.30])
+          [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 >= 0x0093000 ? 0 : 1; }
+                int main () { return MHD_VERSION >= 0x0093002 ? 0 : 1; }
                ])], [
                AC_MSG_RESULT(ok)
                lmhd=1],[AC_MSG_RESULT(failed)],lmhd=1)]),
@@ -1311,7 +1317,6 @@ src/gns/nss/Makefile
 src/hello/Makefile
 src/identity/Makefile
 src/identity/identity.conf
-src/psycstore/Makefile
 src/include/Makefile
 src/include/gnunet_directories.h
 src/integration-tests/Makefile
@@ -1332,6 +1337,9 @@ 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