fix

[oweals/gnunet.git] / configure.ac

diff --git a/configure.ac b/configure.ac
index 0a46e77ac80e3f62b4da8f56da7b752246d393d2..13b370f21c998128ede68ab0676e392e5aa31062 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -182,6 +182,7 @@ SAVE_LIBS=$LIBS
 # libgcrypt
 gcrypt=0
 AM_PATH_LIBGCRYPT(1.2.0, gcrypt=1)
+AC_CHECK_DECLS([gcry_mpi_lshift], [], [], [[#include <gcrypt.h>]])
 
 if test $gcrypt = 0
 then
@@ -244,39 +245,6 @@ AC_CHECK_HEADERS([fcntl.h math.h errno.h ctype.h limits.h stdio.h stdlib.h strin
 # 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 netinet/in_systm.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
-AC_MSG_CHECKING(for libgmp)
-AC_ARG_WITH(gmp,
-   [  --with-gmp=PFX          base of libgmp installation],
-   [AC_MSG_RESULT([$with_gmp])
-    case $with_gmp in
-      no)
-        ;;
-      yes)
-        AC_CHECK_HEADERS(gmp.h,
-          AC_CHECK_LIB([gmp], [__gmpz_add],
-            gmp=1))
-        ;;
-      *)
-        LDFLAGS="-L$with_gmp/lib $LDFLAGS"
-        CPPFLAGS="-I$with_gmp/include $CPPFLAGS"
-        AC_CHECK_HEADERS(gmp.h,
-          AC_CHECK_LIB([gmp], [__gmpz_add],
-            EXT_LIB_PATH="-L$with_gmp/lib $EXT_LIB_PATH"
-            gmp=1))
-        ;;
-    esac
-   ],
-   [AC_MSG_RESULT([--with-gmp not specified])
-    AC_CHECK_HEADERS(gmp.h,
-     AC_CHECK_LIB([gmp], [__gmpz_add],
-      gmp=1))])
-if test "$gmp" != 1
-then
- AC_MSG_ERROR([GNUnet requires libgmp])
-fi
-
 SAVE_LDFLAGS=$LDFLAGS
 SAVE_CPPFLAGS=$CPPFLAGS
 
@@ -330,8 +298,8 @@ AC_ARG_WITH(postgres,
     CPPFLAGS="-I$with_postgres/include $CPPFLAGS"
     AC_CHECK_HEADERS(postgresql/libpq-fe.h,
      EXT_LIB_PATH="-L$with_postgres/lib $EXT_LIB_PATH"
-     SQLITE_LDFLAGS="-L$with_postgres/lib"
-     SQLITE_CPPFLAGS="-I$with_postgres/include"
+     POSTGRES_LDFLAGS="-L$with_postgres/lib"
+     POSTGRES_CPPFLAGS="-I$with_postgres/include"
      postgres=true)
     LDFLAGS=$SAVE_LDFLAGS
     CPPFLAGS=$SAVE_CPPFLAGS
@@ -345,7 +313,7 @@ AC_SUBST(POSTGRES_CPPFLAGS)
 AC_SUBST(POSTGRES_LDFLAGS)
 
 # test for pcap
-pcap=false
+pcap=0
 AC_MSG_CHECKING(for libpcap)
 AC_ARG_WITH(pcap,
   [  --with-pcap=PFX       base of pcap installation],
@@ -355,7 +323,7 @@ AC_ARG_WITH(pcap,
      ;;
    yes)
     AC_CHECK_HEADERS(pcap.h,
-     pcap=true)
+     pcap=1)
      ;;
    *)
     LDFLAGS="-L$with_pcap/lib $LDFLAGS"
@@ -364,15 +332,15 @@ AC_ARG_WITH(pcap,
      EXT_LIB_PATH="-L$with_pcap/lib $EXT_LIB_PATH"
      PCAP_LDFLAGS="-L$with_pcap/lib"
      PCAP_CPPFLAGS="-I$with_pcap/include"
-     pcap=true)
+     pcap=1)
     LDFLAGS=$SAVE_LDFLAGS
     CPPFLAGS=$SAVE_CPPFLAGS
     ;;
    esac
   ],
   [AC_MSG_RESULT([--with-pcap not specified])
-    AC_CHECK_HEADERS(pcap.h, pcap=true)])
-AM_CONDITIONAL(HAVE_PCAP, test x$pcap = xtrue)
+    AC_CHECK_HEADERS(pcap.h, pcap=1)])
+AM_CONDITIONAL(HAVE_PCAP, test x$pcap = x1)
 AC_SUBST(PCAP_CPPFLAGS)
 AC_SUBST(PCAP_LDFLAGS)
 
@@ -705,14 +673,14 @@ AC_SUBST(EXT_LIB_PATH)
 
 
 # should 'make check' run tests?
-AC_MSG_CHECKING(whether to disable running tests)
+AC_MSG_CHECKING(whether to run tests)
 AC_ARG_ENABLE(testruns,
-   [AS_HELP_STRING([--enable-test-suppression],
-               [disable running tests on make check])],
-   [disable_tests_run=$enableval],
-   [disable_tests_run="no"])
-AC_MSG_RESULT($disable_test_run)
-AM_CONDITIONAL([DISABLE_TEST_RUN], [test "x$disable_tests_run" = "xyes"])
+   [AS_HELP_STRING([--enable-testruns=yes/no],
+               [disable running tests on make check (default is YES)])],
+   [enable_tests_run=$enableval],
+   [enable_tests_run="yes"])
+AC_MSG_RESULT($enable_test_run)
+AM_CONDITIONAL([DISABLE_TEST_RUN], [test "x$enable_tests_run" = "xno"])
 
 # should experimental code be compiled (code that may not yet compile)?
 disable_experimental=yes
@@ -725,6 +693,18 @@ AC_ARG_ENABLE(experimental,
 AC_MSG_RESULT($enable_experimental)
 AM_CONDITIONAL([HAVE_EXPERIMENTAL], [test "x$enable_experimental" = "xyes"])
 
+# should malicious code be compiled (code used for testing with malicious peers)
+enable_malicious=0
+AC_MSG_CHECKING(whether to compile malicious code)
+AC_ARG_ENABLE(malicious,
+   [AS_HELP_STRING([--enable-malicious],
+               [enable compiling malicious code (only for developers for testing)])],
+   [enable_malicious=1],
+   [enable_malicious=0])
+AC_MSG_RESULT($enable_malicious)
+AM_CONDITIONAL([HAVE_MALICIOUS], [test "x$enable_malicious" = "x1"])
+AC_DEFINE_UNQUOTED([HAVE_MALICIOUS], $enable_malicious, [Compile malicious code])
+
 # gcov compilation
 use_gcov=no
 AC_ARG_ENABLE([coverage], AS_HELP_STRING([--enable-coverage],
@@ -753,8 +733,6 @@ src/include/gnunet_directories.h
 src/hostlist/Makefile
 src/monkey/Makefile
 src/nat/Makefile
-src/nat/libnatpmp/Makefile
-src/nat/miniupnp/Makefile
 src/peerinfo/Makefile
 src/peerinfo-tool/Makefile
 src/statistics/Makefile