X-Git-Url: https://git.librecmc.org/?a=blobdiff_plain;f=configure.ac;h=79cfa2ec2a76e75800892523a4450a96cbad9861;hb=e153588726b9b3d409f0768c781885591b9141f7;hp=443e27321e3341df7a45874b55a87f2c36d8d1ea;hpb=3773c3902311de95b299a65885f3e3b2da3f7749;p=oweals%2Fgnunet.git diff --git a/configure.ac b/configure.ac index 443e27321..79cfa2ec2 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 @@ -13,8 +13,8 @@ # # You should have received a copy of the GNU General Public License # along with GNUnet; see the file COPYING. If not, write to the -# Free Software Foundation, Inc., 59 Temple Place - Suite 330, -# Boston, MA 02111-1307, USA. +# Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, +# Boston, MA 02110-1301, USA. # # # Process this file with autoconf to produce a configure script. @@ -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 @@ -200,6 +200,10 @@ AC_CHECK_LIB(c, getloadavg, AC_DEFINE(HAVE_GETLOADAVG,1,[getloadavg supported])) AC_CHECK_PROG(VAR_GETOPT_BINARY, getopt, true, false) 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, @@ -368,31 +372,41 @@ fi # $build = $target # check for bluetooth library bluetooth=0 AC_CHECK_LIB(bluetooth, ba2str,[AC_CHECK_HEADER([bluetooth/bluetooth.h],bluetooth=1)]) +if test "$build_target" = "mingw" +then + bluetooth=1 +fi +AM_CONDITIONAL(HAVE_LIBBLUETOOTH, [test "$bluetooth" = 1]) if test "$bluetooth" = 1 then - AM_CONDITIONAL(HAVE_LIBBLUETOOTH, true) AC_DEFINE([HAVE_LIBBLUETOOTH],[1],[Have bluetooth library]) else - AM_CONDITIONAL(HAVE_LIBBLUETOOTH, false) + AC_DEFINE([HAVE_LIBBLUETOOTH],[0],[Lacking bluetooth library]) fi -if test "$build_target" = "mingw" + +# 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 - bluetooth=1 + 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 AC_CHECK_LIB(pulse,pa_stream_peek, [AC_CHECK_HEADER([pulse/simple.h],pulse=1)]) -if test "$pulse" = 1 -then - AC_DEFINE([HAVE_PULSE],[1],[Have libpulse(audio) library]) -fi if test "$build_target" = "mingw" then pulse=0 fi +if test "$pulse" = 1 +then + AC_DEFINE([HAVE_PULSE],[1],[Have libpulse(audio) library]) +fi # check for libopus(audio) library opus=0 @@ -441,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) + 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 @@ -460,6 +478,7 @@ then AC_DEFINE([HAVE_LIBGNURL],[1],[Have libgnurl]) else AM_CONDITIONAL(HAVE_LIBGNURL, false) + AC_DEFINE([HAVE_LIBGNURL],[0],[Lacking libgnurl]) fi SAVE_CPPFLAGS=$CPPFLAGS @@ -496,7 +515,7 @@ then AM_CONDITIONAL(HAVE_LIBCURL, false) if test "$gnurl" = 0 then - AC_MSG_WARN([GNUnet requires libcurl-gnutls >= 7.34]) + AC_MSG_WARN([GNUnet requires libcurl-gnutls or gnurl >= 7.34]) fi else AM_CONDITIONAL(HAVE_LIBCURL, true) @@ -708,6 +727,8 @@ fi if test $gl_libunistring_hexversion -le 2305; then AC_MSG_ERROR([GNUnet requires libunistring >= 0.9.1.1]) fi +AC_CHECK_HEADERS([unistr.h],,AC_MSG_ERROR([Compiling GNUnet requires unistr.h (from libunistring) to be installed])) + # restore LIBS LIBS=$SAVE_LIBS @@ -777,10 +798,14 @@ AC_SUBST(SQLITE_LDFLAGS) postgres=false AX_LIB_POSTGRESQL([]) if test "$found_postgresql" = "yes"; then - postgres=true + CPPFLAGS="$CPPFLAGS $POSTGRESQL_CPPFLAGS" + AC_CHECK_HEADERS([libpq-fe.h], + postgres=true) fi + AM_CONDITIONAL(HAVE_POSTGRESQL, test x$postgres = xtrue) + LDFLAGS=$SAVE_LDFLAGS CPPFLAGS=$SAVE_CPPFLAGS @@ -808,13 +833,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]) @@ -947,6 +972,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 @@ -957,7 +983,7 @@ AM_CONDITIONAL([HAVE_PYTHON], [test "$PYTHON" != :]) # check for gettext AM_GNU_GETTEXT([external]) -AM_GNU_GETTEXT_VERSION([0.18.3]) +AM_GNU_GETTEXT_VERSION([0.18.1]) # Checks for standard typedefs, structures, and compiler characteristics. AC_TYPE_PID_T @@ -995,7 +1021,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 @@ -1281,15 +1307,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], @@ -1517,6 +1534,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 @@ -1526,7 +1544,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 @@ -1540,9 +1557,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 @@ -1556,7 +1576,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 @@ -1570,10 +1592,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 @@ -1585,6 +1603,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 @@ -1595,6 +1615,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 @@ -1623,6 +1644,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 @@ -1658,7 +1680,7 @@ then fi # libgnurl -if test "x$gnurl" = "xfalse" +if test "$gnurl" = "0" then if test "x$curl" = "xfalse" then @@ -1736,9 +1758,9 @@ fi AC_MSG_NOTICE([******************************************** Please make sure NOW that you have created a user and group 'gnunet' -and additionally a group 'gnunetdns': +and additionally a group 'gnunetdns'. On Debian and Ubuntu GNU/Linux, type: addgroup gnunetdns - adduser 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 @@ -1755,6 +1777,8 @@ require fresh login to come into effect): "USERNAME" with the respective login names). If you have a global IP address, no further configuration is required. +For more detailed setup instructions, see https://gnunet.org/installation + Optionally, download and compile gnunet-gtk to get a GUI for file-sharing and configuration. This is particularly recommended if your network setup is non-trivial, as gnunet-setup can be