[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[GNUnet-SVN] r32347 - in gnunet-gtk: . src/conversation
From: |
gnunet |
Subject: |
[GNUnet-SVN] r32347 - in gnunet-gtk: . src/conversation |
Date: |
Sat, 15 Feb 2014 18:47:01 +0100 |
Author: grothoff
Date: 2014-02-15 18:47:00 +0100 (Sat, 15 Feb 2014)
New Revision: 32347
Modified:
gnunet-gtk/configure.ac
gnunet-gtk/src/conversation/Makefile.am
Log:
add configure checks for conversation API and speaker library before building
libgnunetconversation
Modified: gnunet-gtk/configure.ac
===================================================================
--- gnunet-gtk/configure.ac 2014-02-15 10:13:05 UTC (rev 32346)
+++ gnunet-gtk/configure.ac 2014-02-15 17:47:00 UTC (rev 32347)
@@ -408,6 +408,7 @@
# test for GNUnet core
gnunet=0
+gnunet_conversation=0
lookin=${prefix}
GNUNET_CFLAGS=""
GNUNET_CPPFLAGS=""
@@ -431,6 +432,14 @@
[
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 @@
]
),,[#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 @@
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 @@
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
Modified: gnunet-gtk/src/conversation/Makefile.am
===================================================================
--- gnunet-gtk/src/conversation/Makefile.am 2014-02-15 10:13:05 UTC (rev
32346)
+++ gnunet-gtk/src/conversation/Makefile.am 2014-02-15 17:47:00 UTC (rev
32347)
@@ -7,7 +7,9 @@
@GNUNET_CFLAGS@ \
@GLADE_CFLAGS@
+if HAVE_CONVERSATION
bin_PROGRAMS = gnunet-conversation-gtk
+endif
gnunet_conversation_gtk_SOURCES = \
gnunet-conversation-gtk.c \
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [GNUnet-SVN] r32347 - in gnunet-gtk: . src/conversation,
gnunet <=