X-Git-Url: https://git.librecmc.org/?a=blobdiff_plain;f=configure.ac;h=e4d3fa6a18fd27f09d6f994aa0320143a54095fd;hb=93cf4031938ca0f3d13ce491ba9be2c77763ffae;hp=011d69501d94e0af34f09d2a8c8cb6be8841fb39;hpb=12804e128c0d8256a17ae443c3c881773a2648a3;p=oweals%2Fgnunet.git diff --git a/configure.ac b/configure.ac index 011d69501..e4d3fa6a1 100644 --- a/configure.ac +++ b/configure.ac @@ -1,5 +1,5 @@ # This file is part of GNUnet. -# (C) 2001--2015 Christian Grothoff (and other contributing authors) +# (C) 2001--2016 GNUnet e.V. # # GNUnet is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published @@ -34,7 +34,7 @@ AC_CONFIG_HEADERS([gnunet_config.h]) AH_TOP([#define _GNU_SOURCE 1]) AC_CONFIG_MACRO_DIR([m4]) AC_PROG_AWK -AC_PROG_CC +AC_PROG_CC_C99 AC_PROG_CPP AC_PROG_CXX AC_PROG_OBJC @@ -202,6 +202,8 @@ AM_CONDITIONAL(HAVE_GETOPT_BINARY, $VAR_GETOPT_BINARY) AC_CHECK_PROG(VAR_SSH_BINARY,ssh,true,false) AM_CONDITIONAL(HAVE_SSH_BINARY, $VAR_SSH_BINARY) +AM_CONDITIONAL(HAVE_SSH_KEY, ssh -D 12345 -o "BatchMode yes" -o "UserKnownHostsFile /tmp/gnunet_test_cosks_ssh_garbage" -o "StrictHostKeyChecking no" 127.0.0.1 echo -n) +rm -f /tmp/gnunet_test_cosks_ssh_garbage AC_CHECK_MEMBER(struct tm.tm_gmtoff, @@ -375,13 +377,23 @@ then bluetooth=1 fi AM_CONDITIONAL(HAVE_LIBBLUETOOTH, [test "$bluetooth" = 1]) -if test "$bluetooth" = 1 +if test "$bluetooth" = 1 then AC_DEFINE([HAVE_LIBBLUETOOTH],[1],[Have bluetooth library]) else AC_DEFINE([HAVE_LIBBLUETOOTH],[0],[Lacking bluetooth library]) fi +# check for jansson library +jansson=0 +AC_CHECK_HEADER([jansson.h],jansson=1) +AM_CONDITIONAL(HAVE_JANSSON, [test "$jansson" = 1]) +if test "x$jansson" = x1 +then + AC_DEFINE([HAVE_JANSSON],[1],[Have jansson library]) +else + AC_DEFINE([HAVE_JANSSON],[0],[Lacking jansson library]) +fi # check for libpulse(audio) library pulse=0 @@ -443,15 +455,19 @@ then conversation_backend=none AM_CONDITIONAL(BUILD_PULSE_HELPERS, false) AM_CONDITIONAL(BUILD_GST_HELPERS, false) + AM_CONDITIONAL(BUILD_EXPERIMENTAL_HELPERS, false) else conversation_backend=gst AM_CONDITIONAL(BUILD_PULSE_HELPERS, false) AM_CONDITIONAL(BUILD_GST_HELPERS, true) + AM_CONDITIONAL(BUILD_EXPERIMENTAL_HELPERS, false) fi else + conversation_backend=pulse AM_CONDITIONAL(BUILD_PULSE_HELPERS, true) AM_CONDITIONAL(BUILD_GST_HELPERS, false) + AM_CONDITIONAL(BUILD_EXPERIMENTAL_HELPERS, false) fi # libgnurl @@ -781,7 +797,7 @@ postgres=false AX_LIB_POSTGRESQL([]) if test "$found_postgresql" = "yes"; then CPPFLAGS="$CPPFLAGS $POSTGRESQL_CPPFLAGS" - AC_CHECK_HEADERS([libpq-fe.h], + AC_CHECK_HEADERS([libpq-fe.h], postgres=true) fi @@ -815,13 +831,13 @@ AC_ARG_WITH(mysql, then LDFLAGS="-L$with_mysql/lib -L$with_mysql/lib/mysql $LDFLAGS $ZLIBS" CPPFLAGS="-I$with_mysql/include $CPPFLAGS" - fi - AC_CHECK_HEADERS(mysql/mysql.h, - AC_CHECK_LIB(mysqlclient, mysql_init, - MYSQL_LDFLAGS="-L$with_mysql/lib -L$with_mysql/lib/mysql" - MYSQL_CPPFLAGS="-I$with_mysql/include" + AC_CHECK_HEADERS(mysql/mysql.h, + AC_CHECK_LIB(mysqlclient, mysql_init, + MYSQL_LDFLAGS="-L$with_mysql/lib -L$with_mysql/lib/mysql" + MYSQL_CPPFLAGS="-I$with_mysql/include" - mysql=true), [], [$CYGWIN_MYSQL_MAGIC]) + mysql=true), [], [$CYGWIN_MYSQL_MAGIC]) + fi fi ], [AC_MSG_RESULT([--with-mysql not specified]) @@ -954,6 +970,7 @@ AC_ARG_WITH(microhttpd, AM_CONDITIONAL(HAVE_MHD, test x$lmhd = x1) AC_DEFINE_UNQUOTED([HAVE_MHD], $lmhd, [We have libmicrohttpd]) +AM_CONDITIONAL(HAVE_JSON, [test x$jansson = x1]) # restore LIBS LIBS=$SAVE_LIBS @@ -1002,7 +1019,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 random srandom stat statfs statvfs]) +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 wait4]) # restore LIBS LIBS=$SAVE_LIBS @@ -1288,15 +1305,6 @@ AC_ARG_ENABLE([wachs], AC_MSG_RESULT($enable_wachs) AM_CONDITIONAL([HAVE_WACHS], [test "x$enable_wachs" = "xyes"]) -# REST API -AC_MSG_CHECKING(whether to compile REST API) -AC_ARG_ENABLE([rest], - [AS_HELP_STRING([--enable-rest], [enable REST])], - [enable_rest=${enableval}], - [enable_rest=no]) -AC_MSG_RESULT($enable_rest) -AM_CONDITIONAL([HAVE_REST], [test "x$enable_rest" = "xyes"]) - # should malicious code be compiled (should only be used for testing)? AC_MSG_CHECKING(whether to compile malicious code) AC_ARG_ENABLE([malicious], @@ -1524,6 +1532,7 @@ src/consensus/Makefile src/consensus/consensus.conf src/conversation/Makefile src/conversation/conversation.conf +src/curl/Makefile src/datacache/Makefile src/datastore/Makefile src/datastore/datastore.conf @@ -1533,7 +1542,6 @@ src/dns/Makefile src/dns/dns.conf src/dv/Makefile src/dv/dv.conf -src/env/Makefile src/exit/Makefile src/fragmentation/Makefile src/fs/Makefile @@ -1547,9 +1555,12 @@ src/identity/Makefile src/identity/identity.conf src/include/Makefile src/integration-tests/Makefile +src/json/Makefile +src/jsonapi/Makefile src/hostlist/Makefile src/multicast/Makefile src/multicast/multicast.conf +src/my/Makefile src/mysql/Makefile src/namecache/Makefile src/namecache/namecache.conf @@ -1563,7 +1574,9 @@ src/peerinfo/peerinfo.conf src/peerinfo-tool/Makefile src/peerstore/Makefile src/peerstore/peerstore.conf +src/pq/Makefile src/postgres/Makefile +src/psycutil/Makefile src/psyc/Makefile src/psyc/psyc.conf src/psycstore/Makefile @@ -1577,10 +1590,6 @@ src/rps/Makefile src/rps/rps.conf src/secretsharing/Makefile src/secretsharing/secretsharing.conf -src/sensor/Makefile -src/sensor/sensor.conf -src/sensordashboard/Makefile -src/sensordashboard/sensordashboard.conf src/scalarproduct/Makefile src/scalarproduct/scalarproduct.conf src/set/Makefile @@ -1592,6 +1601,8 @@ src/statistics/statistics.conf src/template/Makefile src/testbed/Makefile src/testbed/testbed.conf +src/testbed-logger/Makefile +src/testbed-logger/testbed-logger.conf src/testing/Makefile src/topology/Makefile src/transport/Makefile @@ -1602,6 +1613,7 @@ src/util/resolver.conf src/vpn/Makefile src/vpn/vpn.conf src/rest/Makefile +src/identity-provider/Makefile pkgconfig/Makefile pkgconfig/gnunetarm.pc pkgconfig/gnunetats.pc @@ -1630,6 +1642,7 @@ pkgconfig/gnunetnamestore.pc pkgconfig/gnunetnat.pc pkgconfig/gnunetnse.pc pkgconfig/gnunetpeerinfo.pc +pkgconfig/gnunetpq.pc pkgconfig/gnunetpostgres.pc pkgconfig/gnunetpsyc.pc pkgconfig/gnunetpsycstore.pc @@ -1745,7 +1758,7 @@ AC_MSG_NOTICE([******************************************** Please make sure NOW that you have created a user and group 'gnunet' and additionally a group 'gnunetdns'. On Debian and Ubuntu GNU/Linux, type: addgroup gnunetdns - adduser --system --group --disabled-login --shell /bin/bash --home /var/lib/gnunet gnunet + adduser --system --group --disabled-login --home /var/lib/gnunet gnunet Make sure that '/var/lib/gnunet' is owned (and writable) by user 'gnunet'. Then, you can compile GNUnet with