1 files changed, 23 insertions, 0 deletions

diff --git a/configure.ac b/configure.ac
index 2bf8ac3e..60867c5a 100644
--- a/configure.ac
+++ b/configure.ac
@@ -408,6 +408,7 @@ AC_DEFINE_UNQUOTED([GNUNET_EXTRA_LOGGING],[$extra_logging],[1 if extra logging i
 
 # test for GNUnet core
 gnunet=0
+gnunet_conversation=0
 lookin=${prefix}
 GNUNET_CFLAGS=""
 GNUNET_CPPFLAGS=""
@@ -431,6 +432,14 @@ AC_ARG_WITH(gnunet,
    [
      AC_MSG_RESULT([--with-gnunet not specified])
      PKG_CHECK_MODULES([GNUNET], [gnunetutil >= 0.9.0], gnunet=1)
+     AC_CHECK_HEADERS([gnunet/gnunet_conversation_service.h],
+     AC_CHECK_LIB([gnunetspeaker], [GNUNET_SPEAKER_destroy],
+      [
+        gnunet_conversation=1
+        EXT_LIB_PATH="-L${lookin}/lib $EXT_LIB_PATH"
+      ]
+      ),,[#include <gnunet/platform.h>]
+     )
    ]
 )
 
@@ -454,6 +463,14 @@ then
       ]
     ),,[#include <gnunet/platform.h>]
   )
+  AC_CHECK_HEADERS([gnunet/gnunet_conversation_service.h],
+    AC_CHECK_LIB([gnunetspeaker], [GNUNET_SPEAKER_destroy],
+      [
+        gnunet_conversation=1
+        EXT_LIB_PATH="-L${lookin}/lib $EXT_LIB_PATH"
+      ]
+    ),,[#include <gnunet/platform.h>]
+  )
   LIBS="$backup_LIBS"
   CFLAGS="$backup_CFLAGS"
   CPPFLAGS="$backup_CPPFLAGS"
@@ -467,6 +484,8 @@ fi
 AC_SUBST(GNUNET_CFLAGS)
 AC_SUBST(GNUNET_LIBS)
 
+AM_CONDITIONAL(HAVE_CONVERSATION, test x$gnunet_conversation != x0)
+
 backup_CPPFLAGS="$CPPFLAGS"
 CPPFLAGS="$GNUNET_CPPFLAGS $backup_CPPFLAGS"
 AC_CHECK_HEADERS([gnunet/gnunet_fs_service.h gnunet/gnunet_statistics_service.h gnunet/gnunet_core_service.h], [],
@@ -561,3 +580,7 @@ then
  AC_MSG_WARN([gnunet-setup will not include QR support])
 fi
 
+if test "x$gnunet_conversation" == "x0"
+then
+  AC_MSG_ERROR([gnunet-conversation-gtk will not be built])
+fi