diff options
author | LRN <lrn1986@gmail.com> | 2014-01-08 14:14:44 +0000 |
---|---|---|
committer | LRN <lrn1986@gmail.com> | 2014-01-08 14:14:44 +0000 |
commit | 73bbb9dfcfaa75720f90d35f4f9e9bf731ea9bc5 (patch) | |
tree | 3e6090b210a75efeaae2e624abfe53a71230ca64 /configure.ac | |
parent | 39d0485fb4ec8cb5b3142c86130b276ed455cb65 (diff) | |
download | gnunet-73bbb9dfcfaa75720f90d35f4f9e9bf731ea9bc5.tar.gz gnunet-73bbb9dfcfaa75720f90d35f4f9e9bf731ea9bc5.zip |
Add GStreamer-based implementation of conversation helpers
Diffstat (limited to 'configure.ac')
-rw-r--r-- | configure.ac | 58 |
1 files changed, 44 insertions, 14 deletions
diff --git a/configure.ac b/configure.ac index a9ba0125c..7aea4d12e 100644 --- a/configure.ac +++ b/configure.ac | |||
@@ -388,10 +388,7 @@ AC_CHECK_LIB(pulse,pa_stream_peek, | |||
388 | [AC_CHECK_HEADER([pulse/simple.h],pulse=1)]) | 388 | [AC_CHECK_HEADER([pulse/simple.h],pulse=1)]) |
389 | if test "$pulse" = 1 | 389 | if test "$pulse" = 1 |
390 | then | 390 | then |
391 | AM_CONDITIONAL(HAVE_PULSE, true) | ||
392 | AC_DEFINE([HAVE_PULSE],[1],[Have libpulse(audio) library]) | 391 | AC_DEFINE([HAVE_PULSE],[1],[Have libpulse(audio) library]) |
393 | else | ||
394 | AM_CONDITIONAL(HAVE_PULSE, false) | ||
395 | fi | 392 | fi |
396 | if test "$build_target" = "mingw" | 393 | if test "$build_target" = "mingw" |
397 | then | 394 | then |
@@ -404,12 +401,39 @@ AC_CHECK_LIB(opus,opus_decode_float, | |||
404 | [AC_CHECK_HEADER([opus/opus.h],opus=1)]) | 401 | [AC_CHECK_HEADER([opus/opus.h],opus=1)]) |
405 | if test "$opus" = 1 | 402 | if test "$opus" = 1 |
406 | then | 403 | then |
407 | AM_CONDITIONAL(HAVE_OPUS, true) | ||
408 | AC_DEFINE([HAVE_OPUS],[1],[Have libopus library]) | 404 | AC_DEFINE([HAVE_OPUS],[1],[Have libopus library]) |
409 | else | ||
410 | AM_CONDITIONAL(HAVE_OPUS, false) | ||
411 | fi | 405 | fi |
412 | 406 | ||
407 | gst=0 | ||
408 | PKG_CHECK_MODULES( | ||
409 | [GST], | ||
410 | [glib-2.0 gobject-2.0 gstreamer-1.0 gstreamer-app-1.0 gstreamer-audio-1.0], | ||
411 | [ | ||
412 | gst=1 | ||
413 | AC_MSG_RESULT(ok) | ||
414 | ], [ | ||
415 | gst=0 | ||
416 | AC_MSG_RESULT(not found) | ||
417 | ]) | ||
418 | |||
419 | # Pulse Audio | ||
420 | if test "x$pulse" != "x1" -o "x$opus" != "x1" | ||
421 | then | ||
422 | if test "x$gst" != "x1" -o "x$opus" != "x1" | ||
423 | then | ||
424 | conversation_backend=none | ||
425 | AM_CONDITIONAL(BUILD_PULSE_HELPERS, false) | ||
426 | AM_CONDITIONAL(BUILD_GST_HELPERS, false) | ||
427 | else | ||
428 | conversation_backend=gst | ||
429 | AM_CONDITIONAL(BUILD_PULSE_HELPERS, false) | ||
430 | AM_CONDITIONAL(BUILD_GST_HELPERS, true) | ||
431 | fi | ||
432 | else | ||
433 | conversation_backend=pulse | ||
434 | AM_CONDITIONAL(BUILD_PULSE_HELPERS, true) | ||
435 | AM_CONDITIONAL(BUILD_GST_HELPERS, false) | ||
436 | fi | ||
413 | 437 | ||
414 | # libgnurl | 438 | # libgnurl |
415 | LIBGNURL_CHECK_CONFIG(,7.34.0,gnurl=1,gnurl=0) | 439 | LIBGNURL_CHECK_CONFIG(,7.34.0,gnurl=1,gnurl=0) |
@@ -1519,17 +1543,23 @@ then | |||
1519 | AC_MSG_NOTICE([NOTICE: libmicrohttpd not found, http transport will not be installed.]) | 1543 | AC_MSG_NOTICE([NOTICE: libmicrohttpd not found, http transport will not be installed.]) |
1520 | fi | 1544 | fi |
1521 | 1545 | ||
1522 | # Pulse Audio | 1546 | # conversation |
1523 | if test "x$pulse" != "x1" | 1547 | if test "x$conversation_backend" == "xnone" |
1524 | then | 1548 | then |
1525 | AC_MSG_NOTICE([NOTICE: libpulse(audio) not found, conversation will not be built.]) | 1549 | if test "x$pulse" != "x1" |
1550 | then | ||
1551 | AC_MSG_NOTICE([NOTICE: libpulse(audio) not found, conversation will not be built.]) | ||
1552 | fi | ||
1553 | if test "x$opus" != "x1" | ||
1554 | then | ||
1555 | AC_MSG_NOTICE([NOTICE: libopus not found, conversation will not be built.]) | ||
1556 | fi | ||
1557 | if test "x$gst" != "x1" | ||
1558 | then | ||
1559 | AC_MSG_NOTICE([NOTICE: GStreamer not found, conversation will not be built.]) | ||
1560 | fi | ||
1526 | fi | 1561 | fi |
1527 | 1562 | ||
1528 | # Opus | ||
1529 | if test "x$opus" != "x1" | ||
1530 | then | ||
1531 | AC_MSG_NOTICE([NOTICE: libopus not found, conversation will not be built.]) | ||
1532 | fi | ||
1533 | 1563 | ||
1534 | AC_MSG_NOTICE([NOTICE: Database support is set to MySQL: $mysql, SQLite: $sqlite, Postgres: $postgres]) | 1564 | AC_MSG_NOTICE([NOTICE: Database support is set to MySQL: $mysql, SQLite: $sqlite, Postgres: $postgres]) |
1535 | 1565 | ||