X-Git-Url: https://git.librecmc.org/?a=blobdiff_plain;f=configure.ac;h=fe414b31ed0d60fa73c7ac2026bf0e150b10a9d7;hb=a56f758246cd672b67e4a8369da3631ab1eedfc5;hp=9d82295d1fa62b7a8f8683fdd5234637f62ec9ee;hpb=85aebf0bc477953b80f62bd26cd528a8932501a4;p=oweals%2Fgnunet.git

diff --git a/configure.ac b/configure.ac
index 9d82295d1..fe414b31e 100644
--- a/configure.ac
+++ b/configure.ac
@@ -21,15 +21,18 @@
 #
 #
 AC_PREREQ(2.61)
-AC_INIT([gnunet], [0.9.0pre2],[bug-gnunet@gnu.org])
-AM_INIT_AUTOMAKE([gnunet], [0.9.0pre2])
+# Checks for programs.
+AC_INIT([gnunet], [0.9.0pre3],[bug-gnunet@gnu.org])
+
+AC_CANONICAL_TARGET
+AC_CANONICAL_HOST
+AC_CANONICAL_SYSTEM
+
+AM_INIT_AUTOMAKE([gnunet], [0.9.0pre3])
 m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])])
 AC_CONFIG_HEADERS([gnunet_config.h])
-
 AH_TOP([#define _GNU_SOURCE  1])
 
-# Checks for programs.
-AC_CANONICAL_HOST
 AC_PROG_AWK
 AC_PROG_CC
 AC_PROG_CPP
@@ -39,7 +42,6 @@ AC_PROG_INSTALL
 AC_PROG_LN_S
 AC_PROG_MAKE_SET
 AM_PROG_CC_C_O
-AC_CANONICAL_HOST
 LT_INIT([disable-static dlopen win32-dll])
 LTDL_INIT
 AC_SUBST(LTDLINCL)
@@ -191,6 +193,8 @@ then
   AC_MSG_ERROR([GNUnet needs libgcrypt])
 fi
 
+if test $build = $target
+then
 AC_MSG_CHECKING([for working HMAC])
 AC_LANG_PUSH(C)
 LIBS="$LIBS $LIBGCRYPT_LIBS"
@@ -239,12 +243,36 @@ AC_RUN_IFELSE(
    fi
   ])
 AC_LANG_POP(C)
+fi	# $build = $target
 
 # libcurl
 LIBCURL_CHECK_CONFIG(,7.20.1,,AC_MSG_ERROR([GNUnet requires libcurl >= 7.20.1]))
 # restore LIBS
 LIBS=$SAVE_LIBS
 
+AC_ARG_ENABLE([ats],
+  [AS_HELP_STRING([--enable-ats], [enable ATS code])],
+  [enable_ats=${enableval}],
+  [enable_ats=no])
+if test x${enable_ats} = xyes
+then
+	AC_CHECK_HEADERS([glpk.h],[glpk=true],[gplk=false])
+	AC_CHECK_LIB([glpk],[glp_create_prob],,[gplk=false])
+	# GLPK must support atm MLP presolving, version >= 4.32
+	AC_CHECK_MEMBERS(glp_iocp.presolve,,[gplk=false],[[#include <glpk.h>]])
+	if test x$gplk = xfalse
+	then
+		AM_CONDITIONAL(HAVE_LIBGLPK, false)
+		AC_MSG_WARN([GNUnet requires GLPK  >= 4.32])
+	else
+		AM_CONDITIONAL(HAVE_LIBGLPK, true)
+		AC_DEFINE([HAVE_LIBGLPK],[1],[Have GLPK])
+	fi
+else
+	AM_CONDITIONAL(HAVE_LIBGLPK, false)
+	AC_MSG_RESULT([no])
+fi
+
 # test for kvm and kstat (for CPU stats under BSD/Solaris)
 AC_CHECK_LIB([kvm],[kvm_open])
 AC_CHECK_LIB([kstat],[kstat_open])
@@ -293,7 +321,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 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])
+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 ucred.h endian.h sys/endian.h])
 
 SAVE_LDFLAGS=$LDFLAGS
 SAVE_CPPFLAGS=$CPPFLAGS
@@ -362,39 +390,6 @@ AM_CONDITIONAL(HAVE_POSTGRES, test x$postgres = xtrue)
 AC_SUBST(POSTGRES_CPPFLAGS)
 AC_SUBST(POSTGRES_LDFLAGS)
 
-# test for pcap
-pcap=0
-AC_MSG_CHECKING(for libpcap)
-AC_ARG_WITH(pcap,
-  [  --with-pcap=PFX       base of pcap installation],
-  [AC_MSG_RESULT("$with_pcap")
-   case $with_pcap in
-   no)
-     ;;
-   yes)
-    AC_CHECK_HEADERS(pcap.h,
-     pcap=1)
-     ;;
-   *)
-    LDFLAGS="-L$with_pcap/lib $LDFLAGS"
-    CPPFLAGS="-I$with_pcap/include $CPPFLAGS"
-    AC_CHECK_HEADERS(pcap.h,
-     EXT_LIB_PATH="-L$with_pcap/lib $EXT_LIB_PATH"
-     PCAP_LDFLAGS="-L$with_pcap/lib"
-     PCAP_CPPFLAGS="-I$with_pcap/include"
-     pcap=1)
-    LDFLAGS=$SAVE_LDFLAGS
-    CPPFLAGS=$SAVE_CPPFLAGS
-    ;;
-   esac
-  ],
-  [AC_MSG_RESULT([--with-pcap not specified])
-    AC_CHECK_HEADERS(pcap.h, pcap=1)])
-AM_CONDITIONAL(HAVE_PCAP, test x$pcap = x1)
-AC_SUBST(PCAP_CPPFLAGS)
-AC_SUBST(PCAP_LDFLAGS)
-
-
 # test for libz (maybe required for linking mysql)
 zlib=1
 AC_CHECK_LIB(z, compress,,zlib=0)
@@ -528,42 +523,6 @@ 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
 
@@ -587,38 +546,6 @@ else
   AM_CONDITIONAL(HAVE_PYTHON_PEXPECT, 0)
 fi
 
-# libesmtp
-esmtp=0
-AC_MSG_CHECKING([for libesmtp])
-AC_ARG_WITH(esmtp,
-   [  --with-esmtp=PFX        base of libesmtp installation],
-   [AC_MSG_RESULT([$with_esmtp])
-    case $with_esmtp in
-      no)
-        ;;
-      yes)
-        AC_CHECK_HEADERS(libesmtp.h,
-          AC_CHECK_LIB([esmtp], [smtp_start_session],
-            esmtp=1))
-        ;;
-      *)
-        LDFLAGS="-L$with_esmtp/lib $LDFLAGS"
-        CPPFLAGS="-I$with_esmtp/include $CPPFLAGS"
-        AC_CHECK_HEADERS(libesmtp.h,
-          AC_CHECK_LIB([esmtp], [smtp_start_session],
-            EXT_LIB_PATH="-L$with_esmtp/lib $EXT_LIB_PATH"
-              esmtp=1))
-        ;;
-    esac
-   ],
-   [AC_MSG_RESULT([--with-esmtp not specified])
-    AC_CHECK_HEADERS(libesmtp.h,
-      AC_CHECK_LIB([esmtp], [smtp_start_session],
-          esmtp=1))])
-AM_CONDITIONAL(HAVE_ESMTP, test x$esmtp = x1)
-AC_DEFINE_UNQUOTED([HAVE_ESMTP], $esmtp, [We have libesmtp])
-# restore LIBS
-LIBS=$SAVE_LIBS
 
 # check for gettext
 AM_GNU_GETTEXT([external])
@@ -664,7 +591,7 @@ AC_FUNC_VPRINTF
 AC_HEADER_SYS_WAIT
 AC_TYPE_OFF_T
 AC_TYPE_UID_T
-AC_CHECK_FUNCS([floor gethostname memmove rmdir strncasecmp strrchr strtol atoll dup2 fdatasync ftruncate gettimeofday memset mkdir mkfifo select socket strcasecmp strchr strdup strerror strstr clock_gettime getrusage rand uname setlocale getcwd mktime gmtime_r gmtime strlcpy strlcat ftruncate stat64 sbrk mmap mremap setrlimit sysconf gethostbyaddr initgroups getifaddrs freeifaddrs getnameinfo getaddrinfo inet_ntoa localtime_r nl_langinfo putenv realpath strndup gethostbyname2 gethostbyname])
+AC_CHECK_FUNCS([floor gethostname memmove rmdir strncasecmp strrchr strtol atoll dup2 fdatasync ftruncate gettimeofday memset mkdir mkfifo select socket strcasecmp strchr strdup strerror strstr clock_gettime getrusage rand uname setlocale getcwd mktime gmtime_r gmtime strlcpy strlcat ftruncate stat64 sbrk mmap mremap setrlimit sysconf gethostbyaddr initgroups getifaddrs freeifaddrs getnameinfo getaddrinfo inet_ntoa localtime_r nl_langinfo putenv realpath strndup gethostbyname2 gethostbyname getpeerucred getpeereid])
 
 # restore LIBS
 LIBS=$SAVE_LIBS
@@ -724,64 +651,92 @@ AC_SUBST(EXT_LIB_PATH)
 
 # should 'make check' run tests?
 AC_MSG_CHECKING(whether to run tests)
-AC_ARG_ENABLE(testruns,
-   [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_ARG_ENABLE([testruns],
+   [AS_HELP_STRING([--disable-testruns], [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"])
+AM_CONDITIONAL([ENABLE_TEST_RUN], [test "x$enable_tests_run" = "xyes"])
+
+# should expensive tests be run?
+AC_MSG_CHECKING(whether to run expensive tests)
+AC_ARG_ENABLE([expensivetests],
+   [AS_HELP_STRING([--enable-expensive-tests], [enable running expensive testcases])],
+   [enable_expensive=${enableval}],
+   [enable_expensive=no])
+AC_MSG_RESULT($enable_expensive)
+AM_CONDITIONAL([HAVE_EXPENSIVE_TESTS], [test "x$enable_expensive" = "xyes"])
+
+# should benchmarks be run?
+AC_MSG_CHECKING(whether to run benchmarks during make check)
+AC_ARG_ENABLE([benchmarks],
+   [AS_HELP_STRING([--enable-benchmarks], [enable running benchmarks during make check])],
+   [enable_benchmarks=${enableval}],
+   [enable_benchmarks=no])
+AC_MSG_RESULT($enable_benchmarks)
+AM_CONDITIONAL([HAVE_BENCHMARKS], [test "x$enable_benchmarks" = "xyes"])
 
 # should experimental code be compiled (code that may not yet compile)?
-disable_experimental=yes
 AC_MSG_CHECKING(whether to compile experimental code)
-AC_ARG_ENABLE(experimental,
-   [AS_HELP_STRING([--enable-experimental],
-               [enable compiling experimental code])],
-   [enable_experimental=$enableval],
-   [enable_experimental="no"])
+AC_ARG_ENABLE([experimental],
+   [AS_HELP_STRING([--enable-experimental], [enable compiling experimental code])],
+   [enable_experimental=${enableval}],
+   [enable_experimental=no])
 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_ARG_ENABLE([malicious],
+   [AS_HELP_STRING([--enable-malicious], [enable compiling malicious code (only for developers for testing)])],
+   [enable_malicious=${enableval}],
+   [enable_malicious=no])
 AC_MSG_RESULT($enable_malicious)
-AM_CONDITIONAL([HAVE_MALICIOUS], [test "x$enable_malicious" = "x1"])
-AC_DEFINE_UNQUOTED([HAVE_MALICIOUS], $enable_malicious, [Compile malicious code])
+AM_CONDITIONAL([HAVE_MALICIOUS], [test "x$enable_malicious" = "xyes"])
+if test "$enable_malicious" = "yes"
+then
+ AC_DEFINE([HAVE_MALICIOUS],[1],[include malicious code])
+else
+ AC_DEFINE([HAVE_MALICIOUS],[0],[disable malicious code])
+fi
 
 # should code be enabled that works around missing OS functionality on Windows?
 # used for test cases
-AC_ARG_ENABLE(windows_workarounds, [AS_HELP_STRING([--enable-windows_workarounds],
-               [enable workarounds used on Windows (only useful for test cases)])])
 if test $build_target = "mingw"
 then
 	workarounds=1
 else
-	if test x$enable_windows_workarounds = "xyes"
-	then
-		workarounds=1
-	else
-		workarounds=0
-	fi
+  AC_MSG_CHECKING(whether to enable windows workarounds)
+  AC_ARG_ENABLE([windows_workarounds], 
+     [AS_HELP_STRING([--enable-windows_workarounds], [enable workarounds used on Windows (only useful for test cases)])],
+     [enable_workarounds=${enableval}],
+     [enable_workarounds=no])
+  AC_MSG_RESULT($enable_workarounds)
+  if test x$enable_windows_workarounds = "xyes"
+  then
+     workarounds=1
+  else
+     workarounds=0
+   fi
 fi
 AC_DEFINE_UNQUOTED([ENABLE_WINDOWS_WORKAROUNDS], $workarounds, [enable workarounds used on Windows (only useful for test cases)])
 
 # gcov compilation
-use_gcov=no
-AC_ARG_ENABLE([coverage], AS_HELP_STRING([--enable-coverage],
-                                        [Compile the library with code coverage support (default is NO)]),
-                                        [use_gcov=yes], [use_gcov=no])
+AC_MSG_CHECKING(whether to compile with support for code coverage analysis)
+AC_ARG_ENABLE([coverage], 
+              AS_HELP_STRING([--enable-coverage],
+                             [compile the library with code coverage support]),
+              [use_gcov=${enableval}], 
+              [use_gcov=no])
+AC_MSG_RESULT($use_gcov)
 AM_CONDITIONAL([USE_COVERAGE], [test "x$use_gcov" = "xyes"])
 
+
 AC_CONFIG_FILES([ 
 Makefile
 contrib/Makefile
+doc/Makefile
+doc/man/Makefile
 m4/Makefile
 po/Makefile.in 
 src/Makefile
@@ -799,8 +754,8 @@ src/include/Makefile
 src/include/gnunet_directories.h
 src/hostlist/Makefile
 src/mesh/Makefile
-src/monkey/Makefile
 src/nat/Makefile
+src/nse/Makefile
 src/peerinfo/Makefile
 src/peerinfo-tool/Makefile
 src/statistics/Makefile
@@ -810,6 +765,7 @@ src/topology/Makefile
 src/transport/Makefile
 src/util/Makefile
 src/vpn/Makefile
+src/chat/Makefile
 pkgconfig/Makefile
 pkgconfig/gnunetarm.pc
 pkgconfig/gnunetblock.pc
@@ -849,21 +805,6 @@ then
  AC_MSG_NOTICE([NOTICE: libmicrohttpd not found, http transport will not be installed.])
 fi
 
-if test "x$esmtp" != "x1"
-then
- AC_MSG_NOTICE([NOTICE: libesmtp not found, monkey will not be installed.])
-fi
-
-if test "x$pcap" != "x1"
-then
- AC_MSG_NOTICE([NOTICE: libpcap not found, WiFi support will not be installed.])
-fi
-
-if test "x$openssl" != "x1"
-then
- AC_MSG_NOTICE([NOTICE: OpenSSL not found, monkey will not be installed.])
-fi
-
 AC_MSG_NOTICE([NOTICE: Database support is set to MySQL: $mysql, SQLite: $sqlite, Postgres: $postgres])
 
 if test "$enable_framework_build" = "yes"
@@ -883,8 +824,8 @@ You also need to create an configuration file that should
 specify the path where GNUnet should store data.  For example,
 you could store in "/etc/gnunet.conf" the following lines:
 
-[PATHS]
-SERVICEHOME = /opt/gnunet/
+[[PATHS]]
+SERVICEHOME = /var/lib/gnunet
 DEFAULTCONFIG = /etc/gnunet.conf
 
 Now, in order to start your peer, run as the 'gnunet' user
@@ -895,5 +836,7 @@ configuration file:
 	mkdir $HOME/.gnunet/
 	touch $HOME/.gnunet/gnunet.conf
 	
-Optionally, download and compile gnunet-gtk to get a GUI.
+Optionally, download and compile:
+- gnunet-gtk to get a GUI for file-sharing.
+- gnunet-setup to get a GUI for configuration.
 ********************************************])