soc.2008.vv: 25b76296: Change configure script to have a separa...

[maiku at soc.pidgin.im]

-----------------------------------------------------------------
Revision: 25b76296d1571dd987e4660eff89c440da04cb3f
Ancestor: 8222acabc1382453e8dda5b8d507e4df0f0a91ff
Author: maiku at soc.pidgin.im
Date: 2008-05-28T18:41:03
Branch: im.pidgin.soc.2008.vv
URL: http://d.pidgin.im/viewmtn/revision/info/25b76296d1571dd987e4660eff89c440da04cb3f

Modified files:
        configure.ac

ChangeLog: 

Change configure script to have a separate check for voice and video 
that relies on Farsight and GStreamer-properties.

-------------- next part --------------
============================================================
--- configure.ac	fd935288e0a4d11daf4057596505a4cffdaff609
+++ configure.ac	cbe81ef79ce187c510ffc6a4bbeae8b959b9baeb
@@ -724,8 +724,8 @@ dnl ####################################
 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], [
@@ -758,6 +758,19 @@ fi
   ])
 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)
@@ -2448,7 +2461,7 @@ echo Build with GStreamer support.. : $e
 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