Mercurial > pidgin.yaz
diff configure.ac @ 25660:10f5a529d2a6
merge of '38838bc806900103298d383237d2ae7cd60bbd82'
and '96c6198726fb7811a7762a8b11f05d257843729b'
| author | Mike Ruprecht <maiku@soc.pidgin.im> |
|---|---|
| date | Wed, 28 May 2008 21:13:36 +0000 |
| parents | 7d2e5f57dbca 3f835618356a |
| children | 3da0957e7821 |
line wrap: on
line diff
--- a/configure.ac Tue May 27 16:30:26 2008 +0000 +++ b/configure.ac Wed May 28 21:13:36 2008 +0000 @@ -731,8 +731,8 @@ dnl ####################################################################### dnl # Check for Farsight dnl ####################################################################### -AC_ARG_ENABLE(vv, - [AC_HELP_STRING([--disable-vv], [compile without voice and video support])], +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 gstreamer-0.10 gstreamer-plugins-base-0.10 libxml-2.0], [ @@ -765,6 +765,19 @@ ]) fi +dnl ####################################################################### +dnl # Check for Voice and Video support +dnl ####################################################################### +AC_ARG_ENABLE(vv, + [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_farsight" != "xno" -a "x$enable_gstprops" != "xno"; then + AC_DEFINE(USE_VV, 1, [Use voice and video]) + else + enable_vv="no" + fi +fi dnl ####################################################################### dnl # Check for Meanwhile headers (for Sametime) @@ -2444,7 +2457,7 @@ echo Protocols to link statically.. : $STATIC_PRPLS echo echo Build with GStreamer support.. : $enable_gst -echo Build with voice and video.... : $enable_farsight +echo Build with voice and video.... : $enable_vv echo Build with D-Bus support...... : $enable_dbus if test "x$enable_dbus" = "xyes" ; then eval eval echo D-Bus services directory...... : $DBUS_SERVICES_DIR