projects
/
oweals
/
gnunet.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
indentation, moving API towards MQ-style
[oweals/gnunet.git]
/
configure.ac
diff --git
a/configure.ac
b/configure.ac
index 9e3b3e8d2884e57554c9a400fbfae4d62399bd7c..79cfa2ec2a76e75800892523a4450a96cbad9861 100644
(file)
--- a/
configure.ac
+++ b/
configure.ac
@@
-1,5
+1,5
@@
# This file is part of GNUnet.
# This file is part of GNUnet.
-# (C) 2001--201
5 Christian Grothoff (and other contributing authors)
+# (C) 2001--201
6 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
#
# 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
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
AC_PROG_CPP
AC_PROG_CXX
AC_PROG_OBJC
@@
-455,15
+455,19
@@
then
conversation_backend=none
AM_CONDITIONAL(BUILD_PULSE_HELPERS, false)
AM_CONDITIONAL(BUILD_GST_HELPERS, false)
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)
else
conversation_backend=gst
AM_CONDITIONAL(BUILD_PULSE_HELPERS, false)
AM_CONDITIONAL(BUILD_GST_HELPERS, true)
+ AM_CONDITIONAL(BUILD_EXPERIMENTAL_HELPERS, false)
fi
else
fi
else
+
conversation_backend=pulse
AM_CONDITIONAL(BUILD_PULSE_HELPERS, true)
AM_CONDITIONAL(BUILD_GST_HELPERS, false)
conversation_backend=pulse
AM_CONDITIONAL(BUILD_PULSE_HELPERS, true)
AM_CONDITIONAL(BUILD_GST_HELPERS, false)
+ AM_CONDITIONAL(BUILD_EXPERIMENTAL_HELPERS, false)
fi
# libgnurl
fi
# libgnurl
@@
-723,6
+727,8
@@
fi
if test $gl_libunistring_hexversion -le 2305; then
AC_MSG_ERROR([GNUnet requires libunistring >= 0.9.1.1])
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
# restore LIBS
LIBS=$SAVE_LIBS
@@
-966,7
+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_MHD, test x$lmhd = x1)
AC_DEFINE_UNQUOTED([HAVE_MHD], $lmhd, [We have libmicrohttpd])
-AM_CONDITIONAL(HAVE_
REST, [test x$lmhd = x1 -a
x$jansson = x1])
+AM_CONDITIONAL(HAVE_
JSON, [test
x$jansson = x1])
# restore LIBS
LIBS=$SAVE_LIBS
# restore LIBS
LIBS=$SAVE_LIBS
@@
-1528,6
+1534,7
@@
src/consensus/Makefile
src/consensus/consensus.conf
src/conversation/Makefile
src/conversation/conversation.conf
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/datacache/Makefile
src/datastore/Makefile
src/datastore/datastore.conf
@@
-1537,7
+1544,6
@@
src/dns/Makefile
src/dns/dns.conf
src/dv/Makefile
src/dv/dv.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/exit/Makefile
src/fragmentation/Makefile
src/fs/Makefile
@@
-1551,9
+1557,12
@@
src/identity/Makefile
src/identity/identity.conf
src/include/Makefile
src/integration-tests/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/hostlist/Makefile
src/multicast/Makefile
src/multicast/multicast.conf
+src/my/Makefile
src/mysql/Makefile
src/namecache/Makefile
src/namecache/namecache.conf
src/mysql/Makefile
src/namecache/Makefile
src/namecache/namecache.conf
@@
-1567,7
+1576,9
@@
src/peerinfo/peerinfo.conf
src/peerinfo-tool/Makefile
src/peerstore/Makefile
src/peerstore/peerstore.conf
src/peerinfo-tool/Makefile
src/peerstore/Makefile
src/peerstore/peerstore.conf
+src/pq/Makefile
src/postgres/Makefile
src/postgres/Makefile
+src/psycutil/Makefile
src/psyc/Makefile
src/psyc/psyc.conf
src/psycstore/Makefile
src/psyc/Makefile
src/psyc/psyc.conf
src/psycstore/Makefile
@@
-1581,10
+1592,6
@@
src/rps/Makefile
src/rps/rps.conf
src/secretsharing/Makefile
src/secretsharing/secretsharing.conf
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/scalarproduct/Makefile
src/scalarproduct/scalarproduct.conf
src/set/Makefile
@@
-1596,6
+1603,8
@@
src/statistics/statistics.conf
src/template/Makefile
src/testbed/Makefile
src/testbed/testbed.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
src/testing/Makefile
src/topology/Makefile
src/transport/Makefile
@@
-1606,7
+1615,7
@@
src/util/resolver.conf
src/vpn/Makefile
src/vpn/vpn.conf
src/rest/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/Makefile
pkgconfig/gnunetarm.pc
pkgconfig/gnunetats.pc
@@
-1635,6
+1644,7
@@
pkgconfig/gnunetnamestore.pc
pkgconfig/gnunetnat.pc
pkgconfig/gnunetnse.pc
pkgconfig/gnunetpeerinfo.pc
pkgconfig/gnunetnat.pc
pkgconfig/gnunetnse.pc
pkgconfig/gnunetpeerinfo.pc
+pkgconfig/gnunetpq.pc
pkgconfig/gnunetpostgres.pc
pkgconfig/gnunetpsyc.pc
pkgconfig/gnunetpsycstore.pc
pkgconfig/gnunetpostgres.pc
pkgconfig/gnunetpsyc.pc
pkgconfig/gnunetpsycstore.pc