vte r2177 - trunk

[chpe svn gnome org]

Author: chpe
Date: Sat Nov 22 13:45:52 2008
New Revision: 2177
URL: http://svn.gnome.org/viewvc/vte?rev=2177&view=rev

Log:
	* configure.in:
	* vte-uninstalled.pc.in:
	* vte.pc.in: Clean up the pkgs declared for use in the .pc files.

Modified:
   trunk/ChangeLog
   trunk/configure.in
   trunk/vte-uninstalled.pc.in
   trunk/vte.pc.in

Modified: trunk/configure.in
==============================================================================
--- trunk/configure.in	(original)
+++ trunk/configure.in	Sat Nov 22 13:45:52 2008
@@ -217,14 +217,13 @@
 esac
 
 GLIB_REQUIRED=2.14.0
+PANGO_REQUIRED=1.22.0
 GTK_REQUIRED=2.12.0
 AC_DEFINE(GDK_MULTIHEAD_SAFE,1,[Force use of GDK's multihead-safe APIs.])
 PKG_CHECK_MODULES(GLIB,[glib-2.0 > $GLIB_REQUIRED])
 PKG_CHECK_MODULES(GOBJECT,[glib-2.0 gobject-2.0])
 PKG_CHECK_MODULES(GTK,[glib-2.0 >= $GLIB_REQUIRED gobject-2.0 gtk+-2.0 >= $GTK_REQUIRED])
 
-wantedmodules="glib-2.0 gobject-2.0 gtk+-2.0 fontconfig pango >= 1.22.0"
-
 AC_ARG_ENABLE(deprecation,
 	      [AS_HELP_STRING([--enable-deprecation],
 			      [prohibit VTE from using deprecated GLib/Pango/GDK/GTK+ features])
@@ -292,9 +291,9 @@
 
 
 # Search for the required modules.
-PKG_CHECK_MODULES(VTE,[$wantedmodules])
-NEEDEDPACKAGES="$wantedmodules"
-AC_SUBST(NEEDEDPACKAGES)
+VTE_PKGS="glib-2.0 >= $GLIB_REQUIRED gobject-2.0 pango >= $PANGO_REQUIRED gtk+-2.0 >= $GTK_REQUIRED"
+PKG_CHECK_MODULES([VTE],[$VTE_PKGS])
+AC_SUBST([VTE_PKGS])
 
 wcs_funcs_includes="
 #ifdef HAVE_STRING_H

Modified: trunk/vte-uninstalled.pc.in
==============================================================================
--- trunk/vte-uninstalled.pc.in	(original)
+++ trunk/vte-uninstalled.pc.in	Sat Nov 22 13:45:52 2008
@@ -8,6 +8,6 @@
 Name: vte
 Description: Vte terminal widget.
 Version: @VERSION@
-Requires: @NEEDEDPACKAGES@
+Requires: @VTE_PKGS@
 Libs: ${pc_top_builddir}/${pcfiledir}/src/libvte.la
 Cflags: -I${pc_top_builddir}/${pcfiledir}/src

Modified: trunk/vte.pc.in
==============================================================================
--- trunk/vte.pc.in	(original)
+++ trunk/vte.pc.in	Sat Nov 22 13:45:52 2008
@@ -8,6 +8,6 @@
 Name: vte
 Description: Vte terminal widget.
 Version: @VERSION@
-Requires: @NEEDEDPACKAGES@
+Requires: @VTE_PKGS@
 Libs: -L${libdir} -lvte
 Cflags: -I${includedir}