pidgin: 0696d14c: Don't compile the VV Config plugin unles...

[nosnilmot at pidgin.im]

-----------------------------------------------------------------
Revision: 0696d14c26cfe65de7a3f68a2b9d14b283f88e1f
Ancestor: b52bb36ca238de4cb07977ae13fa819671722530
Author: nosnilmot at pidgin.im
Date: 2009-08-22T04:44:11
Branch: im.pidgin.pidgin
URL: http://d.pidgin.im/viewmtn/revision/info/0696d14c26cfe65de7a3f68a2b9d14b283f88e1f

Modified files:
        configure.ac pidgin/plugins/Makefile.am

ChangeLog: 

Don't compile the VV Config plugin unless VV is actually enabled

-------------- next part --------------
============================================================
--- configure.ac	2f76c87a54a881605b75ac989887345679a5ffb3
+++ configure.ac	e5a3278806a785d20c0ca0223bd58db36b411db7
@@ -810,6 +810,7 @@ fi
 		fi
 	fi
 fi
+AM_CONDITIONAL(USE_VV, test "x$enable_gstreamer" != "xno" -a "x$enable_gstinterfaces" != "xno" -a "x$enable_farsight" != "xno")
 
 AC_ARG_ENABLE(idn,
 	[AC_HELP_STRING([--disable-idn], [compile without IDN support])],
============================================================
--- pidgin/plugins/Makefile.am	75f8f4a59c4d03c418be29fff09a4a1f6716d3c8
+++ pidgin/plugins/Makefile.am	5f1a4faa05e7c83795ba069cd79f61c46cd9dd1e
@@ -67,9 +67,12 @@ plugin_LTLIBRARIES = \
 	themeedit.la         \
 	timestamp.la        \
 	timestamp_format.la \
-	vvconfig.la         \
 	xmppconsole.la
 
+if USE_VV
+plugin_LTLIBRARIES +=	vvconfig.la
+endif
+
 noinst_LTLIBRARIES = \
 	contact_priority.la \
 	gtk_signals_test.la
@@ -109,7 +112,7 @@ timestamp_format_la_LIBADD  = $(GTK_LIBS
 themeedit_la_LIBADD         = $(GTK_LIBS)
 timestamp_la_LIBADD         = $(GTK_LIBS)
 timestamp_format_la_LIBADD  = $(GTK_LIBS)
-vvconfig_la_LIBADD          = $(GTK_LIBS)
+vvconfig_la_LIBADD          = $(GTK_LIBS) $(GSTREAMER_LIBS)
 xmppconsole_la_LIBADD       = $(GTK_LIBS)
 
 endif # PLUGINS