# 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
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
# check for jansson library
jansson=0
AC_CHECK_HEADER([jansson.h],jansson=1)
-AM_CONDITIONAL(HAVE_REST, [test "$jansson" = 1])
-if test "$jansson" = 1
+AM_CONDITIONAL(HAVE_JANSSON, [test "$jansson" = 1])
+if test "x$jansson" = x1
then
- AC_DEFINE([HAVE_REST],[1],[Have jansson library])
+ AC_DEFINE([HAVE_JANSSON],[1],[Have jansson library])
else
- AC_DEFINE([HAVE_REST],[0],[Lacking jansson library])
+ AC_DEFINE([HAVE_JANSSON],[0],[Lacking jansson library])
fi
# check for libpulse(audio) library
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
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
postgres=false
AX_LIB_POSTGRESQL([])
if test "$found_postgresql" = "yes"; then
+ CFLAGS="$CFLAGS $POSTGRESQL_CPPFLAGS"
CPPFLAGS="$CPPFLAGS $POSTGRESQL_CPPFLAGS"
AC_CHECK_HEADERS([libpq-fe.h],
postgres=true)
AC_MSG_CHECKING(for mysql)
AC_ARG_WITH(mysql,
[ --with-mysql=PFX base of MySQL installation],
- [AC_MSG_RESULT("$with_mysql")
- if test "$with_mysql" != "no"
- then
- if test "$with_mysql" != "yes"
- then
+ [AC_MSG_RESULT([$with_mysql])
+ case $with_mysql in
+ no)
+ ;;
+ yes|"")
+ AC_CHECK_HEADERS(mysql/mysql.h,
+ AC_CHECK_LIB(mysqlclient, mysql_init,
+
+ mysql=true), [], [$CYGWIN_MYSQL_MAGIC])
+ ;;
+ *)
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])
- fi
+ mysql=true), [], [$CYGWIN_MYSQL_MAGIC])
+ ;;
+ esac
],
[AC_MSG_RESULT([--with-mysql not specified])
if test -d "/usr/lib64/mysql"; then
case $with_microhttpd in
no)
;;
- yes)
+ yes|"")
AC_CHECK_HEADERS([microhttpd.h],
AC_CHECK_DECL(MHD_OPTION_PER_IP_CONNECTION_LIMIT,
AC_CHECK_LIB([microhttpd], [MHD_get_fdset2],
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
src/consensus/consensus.conf
src/conversation/Makefile
src/conversation/conversation.conf
+src/curl/Makefile
src/datacache/Makefile
src/datastore/Makefile
src/datastore/datastore.conf
src/dns/dns.conf
src/dv/Makefile
src/dv/dv.conf
-src/env/Makefile
src/exit/Makefile
src/fragmentation/Makefile
src/fs/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
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
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
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
src/vpn/Makefile
src/vpn/vpn.conf
src/rest/Makefile
-src/identity-token/Makefile
+src/identity-provider/Makefile
pkgconfig/Makefile
pkgconfig/gnunetarm.pc
pkgconfig/gnunetats.pc
pkgconfig/gnunetnat.pc
pkgconfig/gnunetnse.pc
pkgconfig/gnunetpeerinfo.pc
+pkgconfig/gnunetpq.pc
pkgconfig/gnunetpostgres.pc
pkgconfig/gnunetpsyc.pc
pkgconfig/gnunetpsycstore.pc