diff options
| author | xrs <xrs@mail36.net> | 2019-10-26 15:04:41 +0200 |
|---|---|---|
| committer | xrs <xrs@mail36.net> | 2019-10-26 15:04:41 +0200 |
| commit | 5a71ae7aa440f3aa7ca490b7c72bca7982f38348 (patch) | |
| tree | 2007812ea3fa16879691ecff9ec2466848ce0230 | |
| parent | da87f37eb0766b7c0cf1664cfbfbaf6d15ef20bc (diff) | |
| parent | 53a41cfd89b80ee6bfc6fa391fdbe7e683af314f (diff) | |
| download | gnunet-5a71ae7aa440f3aa7ca490b7c72bca7982f38348.tar.gz gnunet-5a71ae7aa440f3aa7ca490b7c72bca7982f38348.zip | |
Merge branch 'master' of ssh://git.gnunet.org/gnunet
| -rw-r--r-- | configure.ac | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/configure.ac b/configure.ac index 4cc74e4fe..ecdf33b5a 100644 --- a/configure.ac +++ b/configure.ac | |||
| @@ -833,8 +833,10 @@ PKG_CHECK_MODULES([GLIB], | |||
| 833 | AM_CONDITIONAL(HAVE_ABE, [false]) | 833 | AM_CONDITIONAL(HAVE_ABE, [false]) |
| 834 | AC_DEFINE([HAVE_PBC],[0],[Lacking glib library])]) | 834 | AC_DEFINE([HAVE_PBC],[0],[Lacking glib library])]) |
| 835 | 835 | ||
| 836 | |||
| 836 | gst=0 | 837 | gst=0 |
| 837 | gstreamer_msg="no" | 838 | gstreamer_msg="no" |
| 839 | AC_MSG_CHECKING(for gstreamer) | ||
| 838 | PKG_CHECK_MODULES( | 840 | PKG_CHECK_MODULES( |
| 839 | [GST], | 841 | [GST], |
| 840 | [glib-2.0 gobject-2.0 gstreamer-1.0 gstreamer-app-1.0 gstreamer-audio-1.0], | 842 | [glib-2.0 gobject-2.0 gstreamer-1.0 gstreamer-app-1.0 gstreamer-audio-1.0], |
| @@ -842,7 +844,8 @@ PKG_CHECK_MODULES( | |||
| 842 | gstreamer_msg="yes"], | 844 | gstreamer_msg="yes"], |
| 843 | [gst=0]) | 845 | [gst=0]) |
| 844 | 846 | ||
| 845 | # Pulse Audio | 847 | # conversation |
| 848 | AC_MSG_CHECKING(conversation feature set to build) | ||
| 846 | AS_IF([test "x$pulse" != "x1" -o "x$opus" != "x1" -o "x$ogg" != "x1"],[ | 849 | AS_IF([test "x$pulse" != "x1" -o "x$opus" != "x1" -o "x$ogg" != "x1"],[ |
| 847 | AS_IF([test "x$gst" != "x1"],[ | 850 | AS_IF([test "x$gst" != "x1"],[ |
| 848 | conversation_backend=none | 851 | conversation_backend=none |