Clean up the pkgs declared for use in the .pc files.

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

svn path=/trunk/; revision=2177

diff --git a/ChangeLog b/ChangeLog
index 10d2e61..b268263 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2008-11-22  Christian Persch  <chpe@gnome.org>
+
+       * configure.in:
+       * vte-uninstalled.pc.in:
+       * vte.pc.in: Clean up the pkgs declared for use in the .pc files.
+
 2008-11-22  Christian Persch  <chpe@gnome.org>
 
        * configure.in: Depend on gtk 2.12. Bug #398862.

diff --git a/configure.in b/configure.in
index aa8ff34..8ee9b00 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -217,14 +217,13 @@ case $host in
 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 @@ fi
 
 
 # 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

diff --git a/vte-uninstalled.pc.in b/vte-uninstalled.pc.in
index c74095c..1d9fa86 100644 (file)
--- a/vte-uninstalled.pc.in
+++ b/vte-uninstalled.pc.in
@@ -8,6 +8,6 @@ defaultemulation=@VTE_DEFAULT_EMULATION@
 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

diff --git a/vte.pc.in b/vte.pc.in
index 2c07bd8..fc8795a 100644 (file)
--- a/vte.pc.in
+++ b/vte.pc.in
@@ -8,6 +8,6 @@ defaultemulation=@VTE_DEFAULT_EMULATION@
 Name: vte
 Description: Vte terminal widget.
 Version: @VERSION@
-Requires: @NEEDEDPACKAGES@
+Requires: @VTE_PKGS@
 Libs: -L${libdir} -lvte
 Cflags: -I${includedir}