[poppler] poppler: ChangeLog, 1.384, 1.385 configure.ac, 1.52, 1.53 poppler-glib.pc.in, 1.7, 1.8

[Kristian Høgsberg]

Update of /cvs/poppler/poppler
In directory kemper:/tmp/cvs-serv21080

Modified Files:
	ChangeLog configure.ac poppler-glib.pc.in 
Log Message:
2006-05-30  Kristian Høgsberg  <krh at redhat.com>

	* poppler-glib.pc.in: 
	* configure.ac: Add poppler as a private requires if pkg-config
	supports it.


Index: ChangeLog
===================================================================
RCS file: /cvs/poppler/poppler/ChangeLog,v
retrieving revision 1.384
retrieving revision 1.385
diff -u -d -r1.384 -r1.385
--- ChangeLog	30 May 2006 21:46:06 -0000	1.384
+++ ChangeLog	31 May 2006 02:02:54 -0000	1.385
@@ -1,5 +1,11 @@
 2006-05-30  Kristian Høgsberg  <krh at redhat.com>
 
+	* poppler-glib.pc.in: 
+	* configure.ac: Add poppler as a private requires if pkg-config
+	supports it.
+
+2006-05-30  Kristian Høgsberg  <krh at redhat.com>
+
 	* test/gtk-cairo-test.cc: Add --page option to gtk-cairo-test.
 
 2006-05-29  Jeff Muizelaar  <jeff at infidigm.net>

Index: configure.ac
===================================================================
RCS file: /cvs/poppler/poppler/configure.ac,v
retrieving revision 1.52
retrieving revision 1.53
diff -u -d -r1.52 -r1.53
--- configure.ac	22 May 2006 20:19:35 -0000	1.52
+++ configure.ac	31 May 2006 02:02:54 -0000	1.53
@@ -304,6 +304,17 @@
 		-fno-common $CXXFLAGS" ;;
 esac
 
+case $($PKG_CONFIG --version) in
+  0.?|0.1[0-7])
+    PC_REQUIRES_PRIVATE="";
+    PC_REQUIRES="poppler = $VERSION";;
+  *)
+    PC_REQUIRES_PRIVATE="Requires.private: poppler = $VERSION";
+    PC_REQUIRES="";;
+esac
+
+AC_SUBST(PC_REQUIRES)
+AC_SUBST(PC_REQUIRES_PRIVATE)
 
 AC_OUTPUT([
 Makefile

Index: poppler-glib.pc.in
===================================================================
RCS file: /cvs/poppler/poppler/poppler-glib.pc.in,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- poppler-glib.pc.in	19 May 2006 22:21:35 -0000	1.7
+++ poppler-glib.pc.in	31 May 2006 02:02:54 -0000	1.8
@@ -6,7 +6,8 @@
 Name: poppler-glib
 Description: GLib wrapper for poppler
 Version: @VERSION@
-Requires: poppler = @VERSION@ gobject-2.0 gdk-2.0 gdk-pixbuf-2.0 @CAIRO_REQ@
+Requires: @PC_REQUIRES@ gobject-2.0 gdk-2.0 gdk-pixbuf-2.0 @CAIRO_REQ@
+ at PC_REQUIRES_PRIVATE@
 
 Libs: -L${libdir} -lpoppler-glib
 Cflags: -I${includedir}/poppler/glib