Mercurial > pidgin
diff configure.ac @ 32766:fd1b4bbefc6b
Port to Farstream
Farstream is the new name of Farsight.
The changes to support Farstream are from ocrete. rlaager modified the
patch to retain the Farsight code using #ifdef HAVE_FARSIGHT.
committer: Richard Laager <rlaager@wiktel.com>
author | olivier.crete@collabora.com |
---|---|
date | Thu, 05 Apr 2012 03:18:40 +0000 |
parents | b87d880acab3 |
children | d9d55a03ec7b 9350878c0b38 |
line wrap: on
line diff
--- a/configure.ac Wed Apr 04 22:54:48 2012 +0000 +++ b/configure.ac Thu Apr 05 03:18:40 2012 +0000 @@ -786,20 +786,26 @@ fi dnl ####################################################################### -dnl # Check for Farsight +dnl # Check for Farstream dnl ####################################################################### -AC_ARG_ENABLE(farsight, - [AC_HELP_STRING([--disable-farsight], [compile without farsight support])], - enable_farsight="$enableval", enable_farsight="yes") -if test "x$enable_farsight" != "xno"; then - PKG_CHECK_MODULES(FARSIGHT, [farsight2-0.10 >= 0.0.9], [ - AC_DEFINE(USE_FARSIGHT, 1, [Use Farsight for voice and video]) - AC_SUBST(FARSIGHT_CFLAGS) - AC_SUBST(FARSIGHT_LIBS) - ], [ - enable_farsight="no" - ]) -fi +AC_ARG_ENABLE(farstream, + [AC_HELP_STRING([--disable-farstream], [compile without farstream support])], + enable_farstream="$enableval", enable_farstream="yes") +if test "x$enable_farstream" != "xno"; then + PKG_CHECK_MODULES(FARSTREAM, [farstream-0.1], [ + AC_SUBST(FARSTREAM_CFLAGS) + AC_SUBST(FARSTREAM_LIBS) + ], [ + # Try farsight. + PKG_CHECK_MODULES(FARSTREAM, [farsight2-0.10 >= 0.0.9], [ + AC_DEFINE(HAVE_FARSIGHT, 1, [Use Farsight instead of Farstream]) + AC_SUBST(FARSTREAM_CFLAGS) + AC_SUBST(FARSTREAM_LIBS) + ], [ + enable_farstream="no" + ]) + ]) + fi dnl ####################################################################### dnl # Check for Voice and Video support @@ -808,20 +814,20 @@ [AC_HELP_STRING([--disable-vv], [compile without voice and video support])], enable_vv="$enableval", enable_vv="yes") if test "x$enable_vv" != "xno"; then - if test "x$enable_gstreamer" != "xno" -a "x$enable_gstinterfaces" != "xno" -a "x$enable_farsight" != "xno"; then + if test "x$enable_gstreamer" != "xno" -a "x$enable_gstinterfaces" != "xno" -a "x$enable_farstream" != "xno"; then AC_DEFINE(USE_VV, 1, [Use voice and video]) else enable_vv="no" if test "x$force_deps" = "xyes"; then AC_MSG_ERROR([ Dependencies for voice/video were not met. -Install the necessary gstreamer and farsight packages first. +Install the necessary gstreamer and farstream packages first. Or use --disable-vv if you do not need voice/video support. ]) fi fi fi -AM_CONDITIONAL(USE_VV, test "x$enable_gstreamer" != "xno" -a "x$enable_gstinterfaces" != "xno" -a "x$enable_farsight" != "xno") +AM_CONDITIONAL(USE_VV, test "x$enable_gstreamer" != "xno" -a "x$enable_gstinterfaces" != "xno" -a "x$enable_farstream" != "xno") dnl ####################################################################### dnl # Check for Internationalized Domain Name support