# HG changeset patch
# User Mike Ruprecht <maiku@soc.pidgin.im>
# Date 1212000063 0
# Node ID 3f835618356ae431df4dc7d45a174067b0c0760f
# Parent  5f4807116f8cfacfbfe321dc80f12802b8129467
Change configure script to have a separate check for voice and video
that relies on Farsight and GStreamer-properties.

diff -r 5f4807116f8c -r 3f835618356a configure.ac
--- a/configure.ac	Tue May 27 04:30:36 2008 +0000
+++ b/configure.ac	Wed May 28 18:41:03 2008 +0000
@@ -724,8 +724,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], [
@@ -758,6 +758,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)
@@ -2448,7 +2461,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