X-Git-Url: https://git.librecmc.org/?a=blobdiff_plain;f=configure.ac;h=c676164be1e288bb022e93f493cae87edd69d79a;hb=b1ed5b9a472bd56796646a70068eb48da0db3e2f;hp=8a6fb3a7d5821172833f7f6007f24303d5a82ea7;hpb=8fb73cef0924f46c39d09aabbb3b5748e7ae68c7;p=oweals%2Fgnunet.git

diff --git a/configure.ac b/configure.ac
index 8a6fb3a7d..c676164be 100644
--- a/configure.ac
+++ b/configure.ac
@@ -43,6 +43,7 @@ AC_PROG_LN_S
 AC_PROG_MAKE_SET
 AM_PROG_CC_C_O
 LT_INIT([disable-static dlopen win32-dll])
+LT_CONFIG_LTDL_DIR([libltdl])
 LTDL_INIT
 AC_SUBST(LTDLINCL)
 AC_SUBST(LIBLTDL)
@@ -157,7 +158,7 @@ linux*)
      LDFLAGS="$LDFLAGS -Wl,-no-undefined -Wl,--export-all-symbols"
      LIBS="$LIBS -lws2_32 -lplibc -lgnurx -lole32"
      CFLAGS="-mms-bitfields $CFLAGS"
-     CPPFLAGS="-D_WIN32_WINNT=0x0501 -DHAVE_STAT64=1 $CPPFLAGS"
+     CPPFLAGS="-D_WIN32_WINNT=0x0501 -DHAVE_STAT64=1 -D__USE_MINGW_ANSI_STDIO=1 $CPPFLAGS"
      build_target="mingw"
      AC_PROG_CXX
      LIBPREFIX=lib
@@ -361,6 +362,18 @@ AC_RUN_IFELSE(
 AC_LANG_POP(C)
 fi	# $build = $target
 
+# check for bluetooth library
+bluetooth=0
+AC_CHECK_LIB(bluetooth, ba2str, bluetooth=1, bluetooth=0) 
+if test "$bluetooth" = 1
+then
+  AM_CONDITIONAL(HAVE_LIBBLUETOOTH, true)
+  AC_DEFINE([HAVE_LIBBLUETOOTH],[1],[Have bluetooth library])
+else
+  AM_CONDITIONAL(HAVE_LIBBLUETOOTH, false)
+fi
+
+
 # libcurl
 LIBCURL_CHECK_CONFIG(,7.21.3,curl=1,curl=0)
 if test "$curl" = 1
@@ -383,19 +396,13 @@ if test "$libidn" != "no"; then
      CPPFLAGS="${CPPFLAGS} -I$libidn/include"
   fi
   AC_CHECK_HEADER(idna.h,
-  AC_CHECK_LIB(idn, stringprep_check_version,
-    [libidn=yes LIBS="${LIBS} -lidn"], libidn=no),
-     libidn=no)
-fi
-if test "$libidn" != "no" ; then
-  AC_DEFINE(LIBIDN, 1, [Define to 1 if you want IDN support.])
-  else
-  AC_MSG_FAILURE([Libidn not found])
+    AC_CHECK_LIB(idn, stringprep_check_version,
+      [libidn=yes LIBS="${LIBS} -lidn"], 
+      AC_MSG_FAILURE([GNUnet requires libidn])),
+    AC_MSG_FAILURE([GNUnet requires libidn]))
 fi
 AC_MSG_RESULT($libidn)
 
-
-
 # restore LIBS
 LIBS=$SAVE_LIBS
 
@@ -414,19 +421,7 @@ else
 	AC_DEFINE([HAVE_LIBGLPK],[1],[Have GLPK])
 fi
 
-# test for glib
-# Minimum required version for glibtop is 2.6.0
-AM_PATH_GLIB_2_0(2.6.0, [glib2=true] , [glib2=false] ,)
-if test x$glib2 = xfalse
-then
-	AM_CONDITIONAL(HAVE_GLIB2, false)
-	AC_MSG_WARN([GNUnet requires GLIB >= 2.6.0])
-else
-	AM_CONDITIONAL(HAVE_GLIB2, true)
-	AC_DEFINE([HAVE_GLIB2],[1],[Have glib2])
-	LIBS="$LIBS $GLIB_LIBS"
-	CFLAGS="$CFLAGS $GLIB_CFLAGS"
-fi
+
 
 AC_CHECK_HEADERS([nss.h],[nss=true],[nss=false])
 if test x$nss = xfalse
@@ -498,8 +493,12 @@ AC_HEADER_STDC
 # Check for headers that are ALWAYS required
 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]))
 
+
+# Check for libltdl header (#2999)
+AC_CHECK_HEADERS([ltdl.h],,AC_MSG_ERROR([Compiling GNUnet requires libltdl headers (try installing libltdl-dev)]))
+
 # 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([malloc.h malloc/malloc.h 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 execinfo.h])
+AC_CHECK_HEADERS([malloc.h malloc/malloc.h 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 netinet/ip.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 execinfo.h])
 
 SAVE_LDFLAGS=$LDFLAGS
 SAVE_CPPFLAGS=$CPPFLAGS
@@ -568,14 +567,38 @@ AM_CONDITIONAL(HAVE_POSTGRES, test x$postgres = xtrue)
 AC_SUBST(POSTGRES_CPPFLAGS)
 AC_SUBST(POSTGRES_LDFLAGS)
 
-# test for libz (maybe required for linking mysql)
-zlib=1
-AC_CHECK_LIB(z, compress,,zlib=0)
-AM_CONDITIONAL(HAVE_ZLIB, test x$zlib = x1)
-if test "$zlib" != 1
-then
- AC_MSG_ERROR([GNUnet requires zlib])
-fi
+# test for zlib
+SAVE_LDFLAGS=$LDFLAGS
+SAVE_CPPFLAGS=$CPPFLAGS
+AC_ARG_WITH(zlib,
+	    [  --with-zlib[[=DIR]]       use libz in DIR],
+	    [AS_IF([test "$withval" = "no"],
+		   [AC_MSG_ERROR([GNUnet requires zlib])],
+		   [test "$withval" != "yes"],
+		   [
+		     Z_DIR=$withval
+		     CPPFLAGS="${CPPFLAGS} -I$withval/include"
+		     LDFLAGS="${LDFLAGS} -L$withval/lib"
+		   ])
+	    ])
+AC_CHECK_HEADER(zlib.h,
+		[],
+	       	[AC_MSG_ERROR([GNUnet requires zlib])])
+AC_CHECK_LIB(z, compress2,
+	     [
+	      AC_DEFINE([HAVE_ZLIB], [], [Have compression library])
+	      if test "x${Z_DIR}" != "x"; then
+		      Z_CFLAGS="-I${Z_DIR}/include"
+		      Z_LIBS="-L${Z_DIR}/lib -lz"
+	      else
+		      Z_LIBS="-lz"
+	      fi],
+	      [AC_MSG_ERROR([GNUnet requires zlib])])
+AC_SUBST(Z_CFLAGS)
+AC_SUBST(Z_LIBS)
+
+LDFLAGS=$SAVE_LDFLAGS
+CPPFLAGS=$SAVE_CPPFLAGS
 
 # mysql & windows
 AC_CHECK_TYPES([sigset_t, off_t], [], [], [#include <sys/types.h>])
@@ -779,7 +802,7 @@ AC_FUNC_VPRINTF
 AC_HEADER_SYS_WAIT
 AC_TYPE_OFF_T
 AC_TYPE_UID_T
-AC_CHECK_FUNCS([atoll stat64 strnlen mremap getrlimit setrlimit sysconf initgroups strndup gethostbyname2 getpeerucred getpeereid setresuid $funcstocheck getifaddrs freeifaddrs getresgid mallinfo malloc_size malloc_usable_size getrusage])
+AC_CHECK_FUNCS([atoll stat64 strnlen mremap getrlimit setrlimit sysconf initgroups strndup gethostbyname2 getpeerucred getpeereid setresuid $funcstocheck getifaddrs freeifaddrs getresgid mallinfo malloc_size malloc_usable_size getrusage random srandom stat statfs statvfs])
 
 # restore LIBS
 LIBS=$SAVE_LIBS
@@ -967,6 +990,27 @@ AC_MSG_RESULT($enable_ll)
 AM_CONDITIONAL([ENABLE_LL], [test "x$ll" = "x1"])
 AC_DEFINE_UNQUOTED([ENABLE_LL], [$ll], [Build with LL support])
 
+# Check if NSE has to send timestamp information to testbed logger for
+# generating histogram of messages received
+AC_MSG_CHECKING(if NSE has to send timestamp information to testbed logger)
+AC_ARG_ENABLE([nse-histogram],
+    [AS_HELP_STRING([--enable-nse-histogram],
+       [have NSE send timestamp information to testbed logger for generating
+       histogram of received messages.  NOT useful for production (default is
+       NO)])],
+    [if test "x$enableval" = "xno"
+     then
+       nse_histogram=0
+     else
+       nse_histogram=1
+     fi],
+    [nse_histogram=0
+     enable_nse_histogram=no])
+AC_MSG_RESULT($enable_nse_histogram)
+AM_CONDITIONAL([ENABLE_NSE_HISTOGRAM], [test "x$nse_histogram" = "x1"])
+AC_DEFINE_UNQUOTED([ENABLE_NSE_HISTOGRAM], [$nse_histogram],
+                   [have NSE send timestamp information to testbed logger])
+
 # should 'make check' run tests?
 AC_MSG_CHECKING(whether to run tests)
 AC_ARG_ENABLE([testruns],
@@ -1027,6 +1071,15 @@ AC_ARG_ENABLE([benchmarks],
 AC_MSG_RESULT($enable_benchmarks)
 AM_CONDITIONAL([HAVE_BENCHMARKS], [test "x$enable_benchmarks" = "xyes"])
 
+# should gnunet-testing be compiled
+AC_MSG_CHECKING(wether to compile gnunet-testing)
+AC_ARG_ENABLE([testing],
+   [AS_HELP_STRING([--disable-testing], [do not build gnunet-testing])],
+   [enable_testing=${enableval}],
+   [enable_testing=yes])
+AC_MSG_RESULT($enable_testing)
+AM_CONDITIONAL([HAVE_TESTING], [test "x$enable_testing" = "xyes"])
+
 # should experimental code be compiled (code that may not yet compile)?
 AC_MSG_CHECKING(whether to compile experimental code)
 AC_ARG_ENABLE([experimental],
@@ -1193,6 +1246,7 @@ Makefile
 contrib/Makefile
 doc/Makefile
 doc/man/Makefile
+doc/doxygen/Makefile
 m4/Makefile
 po/Makefile.in 
 src/Makefile
@@ -1202,8 +1256,6 @@ src/ats/Makefile
 src/ats/ats.conf
 src/ats-tool/Makefile
 src/block/Makefile
-src/chat/Makefile
-src/chat/chat.conf
 src/core/Makefile
 src/core/core.conf
 src/consensus/Makefile
@@ -1218,6 +1270,8 @@ src/dns/dns.conf
 src/dv/Makefile
 src/dv/dv.conf
 src/exit/Makefile
+src/experimentation/Makefile
+src/experimentation/experimentation.conf
 src/fragmentation/Makefile
 src/fs/Makefile
 src/fs/fs.conf
@@ -1225,8 +1279,12 @@ src/gns/Makefile
 src/gns/gns.conf
 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
 src/hostlist/Makefile
 src/lockmanager/Makefile
 src/lockmanager/lockmanager.conf
@@ -1244,11 +1302,13 @@ src/peerinfo-tool/Makefile
 src/postgres/Makefile
 src/pt/Makefile
 src/regex/Makefile
+src/regex/regex.conf
+src/scalarproduct/Makefile
+src/scalarproduct/scalarproduct.conf
 src/set/Makefile
 src/set/set.conf
 src/statistics/Makefile
 src/statistics/statistics.conf
-src/stream/Makefile
 src/template/Makefile
 src/testbed/Makefile
 src/testbed/testbed.conf
@@ -1261,7 +1321,6 @@ src/util/Makefile
 src/util/resolver.conf
 src/vpn/Makefile
 src/vpn/vpn.conf
-src/integration-tests/Makefile
 pkgconfig/Makefile
 pkgconfig/gnunetats.pc
 pkgconfig/gnunetarm.pc
@@ -1317,6 +1376,12 @@ then
   AC_MSG_NOTICE([NOTICE: libcurl not found.  http client support will not be compiled.])
 fi
 
+# bluetooth
+if test "x$bluetooth" = "x0"
+then
+  AC_MSG_NOTICE([NOTICE: bluetooth library not found.  bluetooth support will not be compiled.])
+fi
+
 #gnutls
 if test x$gnutls != xtrue
 then