X-Git-Url: https://git.librecmc.org/?a=blobdiff_plain;f=configure.ac;h=3e7fd9dba18e7649f0a08e6bde1feca192f2323c;hb=a1d37f58a2f5dad49539fb271c5c027907fc34eb;hp=ce0d8973f995571ca4529d6534e2536ae507bb9d;hpb=7f1941219ee787cc5dce4df2b6a8d16d8e141158;p=oweals%2Fgnunet.git diff --git a/configure.ac b/configure.ac index ce0d8973f..3e7fd9dba 100644 --- a/configure.ac +++ b/configure.ac @@ -43,9 +43,6 @@ AC_PROG_LN_S AC_PROG_MAKE_SET AM_PROG_CC_C_O LT_INIT([disable-static dlopen win32-dll]) -LTDL_INIT -AC_SUBST(LTDLINCL) -AC_SUBST(LIBLTDL) AC_SUBST(MKDIR_P) # large file support @@ -157,7 +154,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 +358,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,25 +392,20 @@ 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 AC_CHECK_HEADERS([glpk.h],[glpk=true],[gplk=false]) -AC_CHECK_LIB([glpk],[glp_create_prob],,[gplk=false]) +# GLPK must support glpk_init_env, version >= 4.43 +AC_CHECK_LIB([glpk],[glp_init_env],,[gplk=false]) # GLPK must support atm MLP presolving, version >= 4.32 AC_CHECK_MEMBERS(glp_iocp.presolve,,[gplk=false],[[#include ]]) if test x$gplk = xfalse @@ -413,34 +417,6 @@ 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 - -#libgtop -PKG_CHECK_MODULES(LIBGTOP,libgtop-2.0, [gtop=true] , [gtop=false] ) -if test x$gtop = xfalse -then - AM_CONDITIONAL(HAVE_LIBGTOP, false) - AC_MSG_WARN([GNUnet requires libgtop]) -else - AM_CONDITIONAL(HAVE_LIBGTOP, true) - AC_DEFINE([HAVE_LIBGTOP],[1],[Have libgtop]) - LIBS="$LIBS $LIBGTOP_LIBS" - CFLAGS="$CFLAGS $LIBGTOP_CFLAGS" -fi - - AC_CHECK_HEADERS([nss.h],[nss=true],[nss=false]) @@ -493,6 +469,41 @@ fi # restore LIBS LIBS=$SAVE_LIBS +# Check for libltdl header (#2999) +ltdl=0 +AC_MSG_CHECKING(for libltdl) +AC_ARG_WITH(ltdl, + [ --with-ltdl=PFX base of libltdl installation], + [AC_MSG_RESULT([$with_ltdl]) + case $with_ltdl in + no) + ;; + yes) + AC_CHECK_HEADERS(ltdl.h, + AC_CHECK_LIB([ltdl], [lt_dlopenext], + ltdl=1)) + ;; + *) + LDFLAGS="-L$with_ltdl/lib $LDFLAGS" + CPPFLAGS="-I$with_ltdl/include $CPPFLAGS" + AC_CHECK_HEADERS(ltdl.h, + AC_CHECK_LIB([ltdl], [lt_dlopenext], + EXT_LIB_PATH="-L$with_ltdl/lib $EXT_LIB_PATH" + ltdl=1)) + ;; + esac + ], + [AC_MSG_RESULT([--with-ltdl not specified]) + AC_CHECK_HEADERS(ltdl.h, + AC_CHECK_LIB([ltdl], [lt_dlopenext], + ltdl=1))]) +if test "$ltdl" != 1 +then + AC_MSG_ERROR([GNUnet requires libltdl (from GNU libtool), try installing libltdl-dev]) +fi +# restore LIBS +LIBS=$SAVE_LIBS + # test for libunistring gl_LIBUNISTRING if test $HAVE_LIBUNISTRING != yes; then @@ -513,8 +524,10 @@ 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])) + + # 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 @@ -583,14 +596,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 ]) @@ -692,11 +729,11 @@ AC_ARG_WITH(microhttpd, AC_CHECK_HEADERS([microhttpd.h], AC_CHECK_DECL(MHD_OPTION_PER_IP_CONNECTION_LIMIT, AC_CHECK_LIB([microhttpd], [MHD_start_daemon], - [AC_MSG_CHECKING([for libmicrohttpd >= 0.9.18]) + [AC_MSG_CHECKING([for libmicrohttpd >= 0.9.30]) AC_RUN_IFELSE([ #include "$native_srcdir/src/include/platform.h" #include - int main () { return MHD_VERSION >= 0x0091200 ? 0 : 1; } + int main () { return MHD_VERSION >= 0x0093000 ? 0 : 1; } ], [ AC_MSG_RESULT(ok) lmhd=1],[AC_MSG_RESULT(failed)],lmhd=1)]), @@ -711,11 +748,11 @@ AC_ARG_WITH(microhttpd, AC_CHECK_DECL(MHD_OPTION_PER_IP_CONNECTION_LIMIT, AC_CHECK_LIB([microhttpd], [MHD_start_daemon], EXT_LIB_PATH="-L$with_microhttpd/lib $EXT_LIB_PATH" - [AC_MSG_CHECKING([for libmicrohttpd >= 0.9.18]) + [AC_MSG_CHECKING([for libmicrohttpd >= 0.9.30]) AC_RUN_IFELSE([ #include "$native_srcdir/src/include/platform.h" #include - int main () { return MHD_VERSION >= 0x0091200 ? 0 : 1; } + int main () { return MHD_VERSION >= 0x0093000 ? 0 : 1; } ], [ AC_MSG_RESULT(ok) lmhd=1],[AC_MSG_RESULT(failed)],lmhd=1)]), @@ -729,11 +766,11 @@ AC_ARG_WITH(microhttpd, AC_CHECK_HEADERS([microhttpd.h], AC_CHECK_DECL(MHD_OPTION_PER_IP_CONNECTION_LIMIT, AC_CHECK_LIB([microhttpd], [MHD_start_daemon], - [AC_MSG_CHECKING([for libmicrohttpd >= 0.9.18]) + [AC_MSG_CHECKING([for libmicrohttpd >= 0.9.30]) AC_RUN_IFELSE([ #include "$native_srcdir/src/include/platform.h" #include - int main () { return MHD_VERSION >= 0x0091200 ? 0 : 1; } + int main () { return MHD_VERSION >= 0x0093000 ? 0 : 1; } ], [ AC_MSG_RESULT(ok) lmhd=1],[AC_MSG_RESULT(failed)],lmhd=1)]), @@ -794,7 +831,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 @@ -982,6 +1019,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], @@ -1002,7 +1060,7 @@ AC_MSG_RESULT($enable_monkey) AM_CONDITIONAL([ENABLE_MONKEY], [test "x$enable_monkey" = "xyes"]) if test "x$enable_monkey" = "xyes" then - MONKEYPREFIX="monkey" + MONKEYPREFIX="pathologist -d $(eval echo ${datarootdir}/gnunet/gnunet.sqlite) -p 30 --" else MONKEYPREFIX="" fi @@ -1042,6 +1100,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], @@ -1208,6 +1275,7 @@ Makefile contrib/Makefile doc/Makefile doc/man/Makefile +doc/doxygen/Makefile m4/Makefile po/Makefile.in src/Makefile @@ -1216,9 +1284,8 @@ src/arm/arm.conf src/ats/Makefile src/ats/ats.conf src/ats-tool/Makefile +src/ats-tests/Makefile src/block/Makefile -src/chat/Makefile -src/chat/chat.conf src/core/Makefile src/core/core.conf src/consensus/Makefile @@ -1233,6 +1300,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 @@ -1240,13 +1309,19 @@ 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 src/mesh/Makefile src/mesh/mesh.conf +src/multicast/Makefile +src/multicast/multicast.conf src/mysql/Makefile src/namestore/Makefile src/namestore/namestore.conf @@ -1257,13 +1332,16 @@ src/peerinfo/Makefile src/peerinfo/peerinfo.conf src/peerinfo-tool/Makefile src/postgres/Makefile +src/psycstore/psycstore.conf 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/sysmon/Makefile -src/sysmon/sysmon.conf src/template/Makefile src/testbed/Makefile src/testbed/testbed.conf @@ -1276,7 +1354,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 @@ -1332,6 +1409,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