-fix getting peer identity via mesh_get_info

[oweals/gnunet.git] / configure.ac

diff --git a/configure.ac b/configure.ac
index 40dd0bbf5068f4ac04036a6ba2220718303e1ed7..78c07fa480c2e288a7c9c47129ae45f83d7c294b 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -360,7 +360,7 @@ fi  # $build = $target
 
 # check for bluetooth library
 bluetooth=0
-AC_CHECK_LIB(bluetooth, ba2str, bluetooth=1, bluetooth=0) 
+AC_CHECK_LIB(bluetooth, ba2str,[AC_CHECK_HEADER([bluetooth/bluetooth.h],bluetooth=1)])
 if test "$bluetooth" = 1
 then
   AM_CONDITIONAL(HAVE_LIBBLUETOOTH, true)
@@ -373,6 +373,34 @@ then
   bluetooth=1
 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
+  AM_CONDITIONAL(HAVE_PULSE, true)
+  AC_DEFINE([HAVE_PULSE],[1],[Have libpulse(audio) library])
+else
+  AM_CONDITIONAL(HAVE_PULSE, false)
+fi
+if test "$build_target" = "mingw"
+then
+  pulse=0
+fi
+
+# check for libopus(audio) library
+opus=0
+AC_CHECK_LIB(opus,opus_decode_float,
+  [AC_CHECK_HEADER([opus/opus.h],opus=1)])
+if test "$opus" = 1
+then
+  AM_CONDITIONAL(HAVE_OPUS, true)
+  AC_DEFINE([HAVE_OPUS],[1],[Have libopus library])
+else
+  AM_CONDITIONAL(HAVE_OPUS, false)
+fi
+
 
 # libcurl
 LIBCURL_CHECK_CONFIG(,7.21.3,curl=1,curl=0)
@@ -501,8 +529,10 @@ AC_ARG_WITH(ltdl,
     AC_CHECK_HEADERS(ltdl.h,
      AC_CHECK_LIB([ltdl], [lt_dlopenext],
       ltdl=1))])
-if test "$ltdl" != 1
+if test x$ltdl = x1
 then
+ AC_MSG_RESULT([libltdl found])
+else
  AC_MSG_ERROR([GNUnet requires libltdl (from GNU libtool), try installing libltdl-dev])
 fi
 # restore LIBS
@@ -737,7 +767,7 @@ AC_ARG_WITH(microhttpd,
               AC_RUN_IFELSE([AC_LANG_SOURCE([
                 #include "$native_srcdir/src/include/platform.h"
                 #include <microhttpd.h>
-                int main () { return MHD_VERSION >= 0x0093001 ? 0 : 1; }
+                int main () { return MHD_VERSION >= 0x0093002 ? 0 : 1; }
                ])], [
                AC_MSG_RESULT(ok)
                lmhd=1],[AC_MSG_RESULT(failed)],lmhd=1)]),
@@ -756,7 +786,7 @@ AC_ARG_WITH(microhttpd,
                AC_RUN_IFELSE([AC_LANG_SOURCE([
                 #include "$native_srcdir/src/include/platform.h"
                 #include <microhttpd.h>
-                int main () { return MHD_VERSION >= 0x0093001 ? 0 : 1; }
+                int main () { return MHD_VERSION >= 0x0093002 ? 0 : 1; }
                ])], [
                AC_MSG_RESULT(ok)
                lmhd=1],[AC_MSG_RESULT(failed)],lmhd=1)]),
@@ -774,7 +804,7 @@ AC_ARG_WITH(microhttpd,
               AC_RUN_IFELSE([AC_LANG_SOURCE([
                 #include "$native_srcdir/src/include/platform.h"
                #include <microhttpd.h>
-                int main () { return MHD_VERSION >= 0x0093001 ? 0 : 1; }
+                int main () { return MHD_VERSION >= 0x0093002 ? 0 : 1; }
                ])], [
                AC_MSG_RESULT(ok)
                lmhd=1],[AC_MSG_RESULT(failed)],lmhd=1)]),
@@ -1294,6 +1324,8 @@ src/core/Makefile
 src/core/core.conf
 src/consensus/Makefile
 src/consensus/consensus.conf
+src/conversation/Makefile
+src/conversation/conversation.conf
 src/datacache/Makefile
 src/datastore/Makefile
 src/datastore/datastore.conf
@@ -1303,6 +1335,7 @@ src/dns/Makefile
 src/dns/dns.conf
 src/dv/Makefile
 src/dv/dv.conf
+src/env/Makefile
 src/exit/Makefile
 src/experimentation/Makefile
 src/experimentation/experimentation.conf
@@ -1342,6 +1375,8 @@ src/psycstore/psycstore.conf
 src/pt/Makefile
 src/regex/Makefile
 src/regex/regex.conf
+src/revocation/Makefile
+src/revocation/revocation.conf
 src/scalarproduct/Makefile
 src/scalarproduct/scalarproduct.conf
 src/set/Makefile
@@ -1433,11 +1468,24 @@ then
   AC_MSG_NOTICE([NOTICE: opening ports for gnunet-java bindings by default.])
 fi
 
+# MHD
 if test "x$lmhd" != "x1"
 then
  AC_MSG_NOTICE([NOTICE: libmicrohttpd not found, http transport will not be installed.])
 fi
 
+# Pulse Audio
+if test "x$pulse" != "x1"
+then
+ AC_MSG_NOTICE([NOTICE: libpulse(audio) not found, conversation will not be built.])
+fi
+
+# Opus
+if test "x$opus" != "x1"
+then
+ AC_MSG_NOTICE([NOTICE: libopus not found, conversation will not be built.])
+fi
+
 AC_MSG_NOTICE([NOTICE: Database support is set to MySQL: $mysql, SQLite: $sqlite, Postgres: $postgres])
 
 if test "$enable_framework_build" = "yes"