/pidgin/main: f9cc1bceb60a: Fix VV configure stuff.

Elliott Sales de Andrade qulogic at pidgin.im
Sat Sep 8 19:20:47 EDT 2012


Changeset: f9cc1bceb60afbfd2a794518a7ebd75044d55057
Author:	 Elliott Sales de Andrade <qulogic at pidgin.im>
Date:	 2012-09-02 01:27 -0400
Branch:	 default
URL: http://hg.pidgin.im/pidgin/main/rev/f9cc1bceb60a

Description:

Fix VV configure stuff.

The variable $enable_gstreamer does not exist, so it will always
be unequal to "no". Fortunately, gstinterfaces required GStreamer,
and was in that same check, so this was not a problem.

Additionally, the USE_VV conditional was set based on the existence
of the dependencies, which would ignore a user-supplied --disable-vv.
I'm not sure why no-one ran into a problem with that, though.

diffstat:

 configure.ac |  4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diffs (21 lines):

diff --git a/configure.ac b/configure.ac
--- a/configure.ac
+++ b/configure.ac
@@ -913,7 +913,7 @@ 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_gstreamer" != "xno" -a "x$enable_gstinterfaces" != "xno" -a "x$enable_farstream" != "xno"; then
+	if test "x$enable_gst" != "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"
@@ -926,7 +926,7 @@ Or use --disable-vv if you do not need v
 		fi
 	fi
 fi
-AM_CONDITIONAL(USE_VV, test "x$enable_gstreamer" != "xno" -a "x$enable_gstinterfaces" != "xno" -a "x$enable_farstream" != "xno")
+AM_CONDITIONAL(USE_VV, test "x$enable_vv" != "xno")
 
 dnl #######################################################################
 dnl # Check for Internationalized Domain Name support



More information about the Commits mailing list