adding tests for openssl and making sure that emstp is available when building monkey

[oweals/gnunet.git] / configure.ac

diff --git a/configure.ac b/configure.ac
index 1a9a3b50cf4c2044c35eb7ff702911198e9b2de7..70d47378b0c7c529d514c1fdc532ade1e3d6f092 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -244,10 +244,7 @@ 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]))
 
 # 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([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 sys/ioctl.h sys/socket.h sys/time.h unistd.h kstat.h sys/sysinfo.h kvm.h sys/file.h sys/resource.h iconv.h ifaddrs.h mach/mach.h stddef.h sys/timeb.h terminos.h argz.h])
-
-# Check for GMP header (and abort if not present)
-AC_CHECK_HEADERS([gmp.h],,AC_MSG_ERROR([Compiling GNUnet requires gmp.h (from the GNU MP library, libgmp)]))
+AC_CHECK_HEADERS([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 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])
 
 # test for libgmp
 gmp=0
@@ -481,19 +478,65 @@ AC_ARG_WITH(microhttpd,
        [#include "src/include/platform.h"])])
 AM_CONDITIONAL(HAVE_MHD, test x$lmhd = x1)
 AC_DEFINE_UNQUOTED([HAVE_MHD], $lmhd, [We have libmicrohttpd])
+
+
+# openssl
+openssl=0
+AC_MSG_CHECKING([for openssl])
+AC_ARG_WITH(openssl,
+   [  --with-openssl=PFX   base of openssl installation],
+   [AC_MSG_RESULT([$with_openssl])
+    case $with_openssl in
+      no)
+        ;;
+      yes)
+        AC_CHECK_HEADERS([openssl/ssl.h],
+            AC_CHECK_LIB([ssl], [SSL_new],
+            openssl=1))
+        ;;
+      *)
+        LDFLAGS="-L$with_openssl/lib $LDFLAGS"
+        CPPFLAGS="-I$with_openssl/include $CPPFLAGS"
+        AC_CHECK_HEADERS([openssl/ssl.h],
+            AC_CHECK_LIB([ssl], [SSL_new],
+              EXT_LIB_PATH="-L$with_openssl/lib $EXT_LIB_PATH"
+              openssl=1))
+        ;;
+    esac
+   ],
+   [AC_MSG_RESULT([--with-openssl not specified])
+    AC_CHECK_HEADERS([openssl/ssl.h],
+        AC_CHECK_LIB([ssl], [SSL_new],
+          openssl=1))])
+AM_CONDITIONAL(HAVE_OPENSSL, test x$openssl = x1)
+AC_DEFINE_UNQUOTED([HAVE_OPENSSL], $openssl, [We have openssl])
+
+
+
+
+
+
 # restore LIBS
 LIBS=$SAVE_LIBS
 
 # check for python & pexpect (used for some testcases only)
-AC_MSG_CHECKING([for python and pexpect])
-/usr/bin/python -c "import pexpect" &> /dev/null
-PYEX=$?
-AM_CONDITIONAL(HAVE_PYTHON_PEXPECT, test $PYEX -eq 0)
-if test $PYEX -eq 0
+AM_PATH_PYTHON([2.5],, [:])
+AM_CONDITIONAL([HAVE_PYTHON], [test "$PYTHON" != :])
+
+if test "$PYTHON" != :
 then
-  AC_MSG_RESULT([yes])
+  AC_MSG_CHECKING([for pexpect])
+  $PYTHON -c "import pexpect" > /dev/null 2> /dev/null
+  PYEX=$?
+  AM_CONDITIONAL(HAVE_PYTHON_PEXPECT, test $PYEX -eq 0)
+  if test $PYEX -eq 0
+  then
+    AC_MSG_RESULT([yes])
+  else
+    AC_MSG_RESULT([not found])
+  fi
 else
-  AC_MSG_RESULT([not found])
+  AM_CONDITIONAL(HAVE_PYTHON_PEXPECT, 0)
 fi
 
 # libesmtp
@@ -530,8 +573,8 @@ AC_DEFINE_UNQUOTED([HAVE_ESMTP], $esmtp, [We have libesmtp])
 LIBS=$SAVE_LIBS
 
 # check for gettext
-AM_GNU_GETTEXT_VERSION([0.16.1])
 AM_GNU_GETTEXT([external])
+AM_GNU_GETTEXT_VERSION([0.16.1])
 
 # check for iconv
 AM_ICONV
@@ -645,6 +688,7 @@ m4/Makefile
 po/Makefile.in 
 src/Makefile
 src/arm/Makefile
+src/block/Makefile
 src/core/Makefile
 src/datacache/Makefile
 src/datastore/Makefile
@@ -656,6 +700,7 @@ src/hello/Makefile
 src/include/Makefile
 src/include/gnunet_directories.h
 src/hostlist/Makefile
+src/monkey/Makefile
 src/nat/Makefile
 src/nat/libnatpmp/Makefile
 src/nat/miniupnp/Makefile
@@ -667,6 +712,7 @@ src/testing/Makefile
 src/topology/Makefile
 src/transport/Makefile
 src/util/Makefile
+src/vpn/Makefile
 ])
 AC_OUTPUT