diff configure.ac @ 23809:7d2e5f57dbca

propagate from branch 'im.pidgin.pidgin.vv' (head 9443004596a4fc55992da8548ef5b438de22c8ef) to branch 'im.pidgin.soc.2008.vv' (head 99d72a9b9b6887865627081565f052f29516d19b)

--- a/configure.ac	Tue May 27 06:51:21 2008 +0000
+++ b/configure.ac	Tue May 27 16:30:26 2008 +0000
@@ -325,6 +325,9 @@
 AC_SUBST(GLIB_CFLAGS)
 AC_SUBST(GLIB_LIBS)
 
+GLIB_GENMARSHAL=`pkg-config --variable=glib_genmarshal glib-2.0`
+AC_SUBST(GLIB_GENMARSHAL)
+
 AC_ARG_WITH([extraversion],
 			AC_HELP_STRING([--with-extraversion=STRING],
 						   [extra version number to be displayed in Help->About and --help (for packagers)]),
@@ -728,16 +731,15 @@
 dnl #######################################################################
 dnl # Check for Farsight
 dnl #######################################################################
-AC_ARG_ENABLE(farsight,
+AC_ARG_ENABLE(vv,
 	[AC_HELP_STRING([--disable-vv], [compile without voice and video support])],
 	enable_farsight="$enableval", enable_farsight="yes")
 if test "x$enable_farsight" != "xno"; then
-	PKG_CHECK_MODULES(FARSIGHT, [farsight-0.1], [
+	PKG_CHECK_MODULES(FARSIGHT, [farsight2-0.10 gstreamer-0.10 gstreamer-plugins-base-0.10 libxml-2.0], [
 		AC_DEFINE(USE_FARSIGHT, 1, [Use Farsight for voice and video])
 		AC_SUBST(FARSIGHT_CFLAGS)
 		AC_SUBST(FARSIGHT_LIBS)
 	], [
-		AC_MSG_RESULT(no)
 		enable_farsight="no"
 	])
 fi
@@ -759,7 +761,6 @@
   		AC_SUBST(GSTPROPS_LIBS)
   		AC_SUBST(GSTPROPS_CFLAGS)
   ], [
-		AC_MSG_RESULT(no)
 		enable_gstprops="no"
   ])
 fi