X-Git-Url: https://git.librecmc.org/?a=blobdiff_plain;f=configure.ac;h=79cfa2ec2a76e75800892523a4450a96cbad9861;hb=1f3219c222bb206e02a793e6c7d48ccc3045d604;hp=9a3441fa2db2953a56c6d09989061a40bb2b6e41;hpb=3b0d29c322aaa0e394d4e63219b9b97a29e41e30;p=oweals%2Fgnunet.git

diff --git a/configure.ac b/configure.ac
index 9a3441fa2..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
@@ -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
@@ -455,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
@@ -723,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
 
@@ -827,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])
@@ -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_REST, [test x$lmhd = x1 -a x$jansson = x1])
+AM_CONDITIONAL(HAVE_JSON, [test x$jansson = x1])
 
 # restore LIBS
 LIBS=$SAVE_LIBS
@@ -1528,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
@@ -1537,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
@@ -1551,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
@@ -1567,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
@@ -1581,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
@@ -1596,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
@@ -1606,7 +1615,7 @@ src/util/resolver.conf
 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
@@ -1635,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