gucharmap r1536 - branches/gnome-2-22

[chpe svn gnome org]

Author: chpe
Date: Fri Jan 25 21:59:14 2008
New Revision: 1536
URL: http://svn.gnome.org/viewvc/gucharmap?rev=1536&view=rev

Log:
2008-01-25  Christian Persch  <chpe gnome org>

	* configure.in:
	* gucharmap.pc.in: Fix the .pc file after removal of gnome option.

Modified:
   branches/gnome-2-22/ChangeLog
   branches/gnome-2-22/configure.ac
   branches/gnome-2-22/gucharmap.pc.in

Modified: branches/gnome-2-22/configure.ac
==============================================================================
--- branches/gnome-2-22/configure.ac	(original)
+++ branches/gnome-2-22/configure.ac	Fri Jan 25 21:59:14 2008
@@ -99,9 +99,12 @@
 AC_SUBST(GCONF_CFLAGS)
 AC_SUBST(GCONF_LIBS)
 
+GCONFPKGS=
 if test "x$have_gconf" = "xyes" ; then
     AC_DEFINE([HAVE_GCONF], [1], [Define if have gconf])
+    GCONFPKGS="gconf-2.0"
 fi
+AC_SUBST([GCONFPKGS])
 
 GLIB_GENMARSHAL=`$PKG_CONFIG --variable=glib_genmarshal glib-2.0`
 AC_SUBST(GLIB_GENMARSHAL)

Modified: branches/gnome-2-22/gucharmap.pc.in
==============================================================================
--- branches/gnome-2-22/gucharmap.pc.in	(original)
+++ branches/gnome-2-22/gucharmap.pc.in	Fri Jan 25 21:59:14 2008
@@ -6,6 +6,7 @@
 Name: gucharmap
 Description: GTK+ Unicode Character Map
 Version: @VERSION@
-Requires: gtk+-2.0 glib-2.0 @GNOMEPKGS@ @GCONFPKGS@
+Requires: gtk+-2.0 glib-2.0
+Requires.private: @GCONFPKGS@
 Libs: -L${libdir} -lgucharmap
 Cflags: -I${includedir}