changeset 28053:b9e28b2a119b

Don't compile the VV Config plugin unless VV is actually enabled
author Stu Tomlinson <stu@nosnilmot.com>
date Sat, 22 Aug 2009 04:44:11 +0000
parents 8bc115afec99
children 15833e4f2e09
files configure.ac pidgin/plugins/Makefile.am
diffstat 2 files changed, 6 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/configure.ac	Sat Aug 22 04:03:09 2009 +0000
+++ b/configure.ac	Sat Aug 22 04:44:11 2009 +0000
@@ -810,6 +810,7 @@
 		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])],
--- a/pidgin/plugins/Makefile.am	Sat Aug 22 04:03:09 2009 +0000
+++ b/pidgin/plugins/Makefile.am	Sat Aug 22 04:44:11 2009 +0000
@@ -67,9 +67,12 @@
 	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 @@
 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