towards starting 3 controllers on a single machine

[oweals/gnunet.git] / configure.ac

diff --git a/configure.ac b/configure.ac
index 63c9e55311e8f1782c69875087ec3fabeac0176f..165e66d442ad7ca02ea8599585486f98e462d5ef 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -70,6 +70,9 @@ DEFAULT_INTERFACE="\"eth0\""
 
 funcstocheck="getnameinfo gethostname gethostbyname gethostbyaddr getaddrinfo"
 
+# Srcdir in a form that native compiler understands (i.e. DOS path on W32)
+native_srcdir=$srcdir
+
 # Check system type
 case "$host_os" in
 *darwin* | *rhapsody* | *macosx*)
@@ -91,7 +94,7 @@ linux*)
      UNIXONLY="#"
      AC_PATH_XTRA
      ;;
-freebsd*)
+*freebsd*)
      AC_DEFINE_UNQUOTED(SOMEBSD,1,[This is a BSD system])
      AC_DEFINE_UNQUOTED(FREEBSD,1,[This is a FreeBSD system])
      CFLAGS="-D_THREAD_SAFE $CFLAGS"
@@ -100,7 +103,7 @@ freebsd*)
      DLLDIR=lib
      UNIXONLY="#"
      ;;
-openbsd*)
+*openbsd*)
      AC_DEFINE_UNQUOTED(SOMEBSD,1,[This is a BSD system])
      AC_DEFINE_UNQUOTED(OPENBSD,1,[This is an OpenBSD system])
      LIBS=`echo $LIBS | sed -e "s/-ldl//"`
@@ -109,7 +112,7 @@ openbsd*)
      DLLDIR=lib
      UNIXONLY="#"
      ;;
-netbsd*)
+*netbsd*)
      AC_DEFINE_UNQUOTED(SOMEBSD,1,[This is a BSD system])
      AC_DEFINE_UNQUOTED(NETBSD,1,[This is a NetBSD system])
      LIBPREFIX=
@@ -161,6 +164,7 @@ netbsd*)
      DLLDIR=bin
      UNIXONLY=""
      funcstocheck=""
+     native_srcdir=$(cd $srcdir; pwd -W)
      ;;
 gnu*)
      AC_DEFINE_UNQUOTED(GNU,1,[This is a GNU system])
@@ -217,13 +221,25 @@ fi
 
 # libgcrypt
 gcrypt=0
-AM_PATH_LIBGCRYPT(1.2.0, gcrypt=1)
+NEED_LIBGCRYPT_API=1
+NEED_LIBGCRYPT_VERSION=1.4.2
+
+
+AM_PATH_LIBGCRYPT("$NEED_LIBGCRYPT_API:$NEED_LIBGCRYPT_VERSION", gcrypt=1)
 AC_CHECK_DECLS([gcry_mpi_lshift], [], [], [[#include <gcrypt.h>]])
 
 if test $gcrypt = 0
 then
-  AC_MSG_ERROR([GNUnet needs libgcrypt])
+  AC_MSG_ERROR([[
+***
+*** You need libgcrypt to build this program.
+**  This library is for example available at
+***   ftp://ftp.gnupg.org/gcrypt/libgcrypt/
+*** (at least version $NEED_LIBGCRYPT_VERSION (API $NEED_LIBGCRYPT_API) 
+***  is required.)
+***]])
 fi
+AC_DEFINE_UNQUOTED([NEED_LIBGCRYPT_VERSION], "$NEED_LIBGCRYPT_VERSION", [required libgcrypt version])
 
 # Adam shostack suggests the following for Windows:
 # -D_FORTIFY_SOURCE=2 -fstack-protector-all
@@ -617,15 +633,15 @@ AC_ARG_WITH(microhttpd,
             AC_CHECK_LIB([microhttpd], [MHD_start_daemon],
               [AC_MSG_CHECKING([for libmicrohttpd >= 0.9.18])
               AC_RUN_IFELSE([
-                #include "$srcdir/src/include/platform.h"
+                #include "$native_srcdir/src/include/platform.h"
                 #include <microhttpd.h>
                 int main () { return MHD_VERSION >= 0x0091200 ? 0 : 1; }
                ], [
                AC_MSG_RESULT(ok)
                lmhd=1],[AC_MSG_RESULT(failed)],lmhd=1)]),
-           [],[#include "$srcdir/src/include/platform.h"
+           [],[#include "$native_srcdir/src/include/platform.h"
                 #include <microhttpd.h>]),,
-            [#include "$srcdir/src/include/platform.h"])
+            [#include "$native_srcdir/src/include/platform.h"])
         ;;
       *)
         LDFLAGS="-L$with_microhttpd/lib $LDFLAGS"
@@ -636,15 +652,15 @@ AC_ARG_WITH(microhttpd,
               EXT_LIB_PATH="-L$with_microhttpd/lib $EXT_LIB_PATH"
               [AC_MSG_CHECKING([for libmicrohttpd >= 0.9.18])
                AC_RUN_IFELSE([
-                #include "$srcdir/src/include/platform.h"
+                #include "$native_srcdir/src/include/platform.h"
                 #include <microhttpd.h>
                 int main () { return MHD_VERSION >= 0x0091200 ? 0 : 1; }
                ], [
                AC_MSG_RESULT(ok)
                lmhd=1],[AC_MSG_RESULT(failed)],lmhd=1)]),
-           [],[#include "$srcdir/src/include/platform.h"
+           [],[#include "$native_srcdir/src/include/platform.h"
                 #include <microhttpd.h>]),,
-            [#include "$srcdir/src/include/platform.h"])
+            [#include "$native_srcdir/src/include/platform.h"])
         ;;
     esac
    ],
@@ -654,15 +670,15 @@ AC_ARG_WITH(microhttpd,
         AC_CHECK_LIB([microhttpd], [MHD_start_daemon],
           [AC_MSG_CHECKING([for libmicrohttpd >= 0.9.18])
               AC_RUN_IFELSE([
-                #include "$srcdir/src/include/platform.h"
+                #include "$native_srcdir/src/include/platform.h"
                #include <microhttpd.h>
                 int main () { return MHD_VERSION >= 0x0091200 ? 0 : 1; }
                ], [
                AC_MSG_RESULT(ok)
                lmhd=1],[AC_MSG_RESULT(failed)],lmhd=1)]),
-       [],[#include "$srcdir/src/include/platform.h"
+       [],[#include "$native_srcdir/src/include/platform.h"
             #include <microhttpd.h>]),,
-       [#include "$srcdir/src/include/platform.h"])])
+       [#include "$native_srcdir/src/include/platform.h"])])
 AM_CONDITIONAL(HAVE_MHD, test x$lmhd = x1)
 AC_DEFINE_UNQUOTED([HAVE_MHD], $lmhd, [We have libmicrohttpd])