summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog6
-rw-r--r--configure.ac11
-rw-r--r--poppler-glib.pc.in3
3 files changed, 19 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index a52d9cfa..de5b22da 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,11 @@
2006-05-30 Kristian Høgsberg <krh@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@redhat.com>
+
* test/gtk-cairo-test.cc: Add --page option to gtk-cairo-test.
2006-05-29 Jeff Muizelaar <jeff@infidigm.net>
diff --git a/configure.ac b/configure.ac
index 8520dd97..3b935f44 100644
--- a/configure.ac
+++ b/configure.ac
@@ -304,6 +304,17 @@ case "$enable_compile_warnings" in
-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
diff --git a/poppler-glib.pc.in b/poppler-glib.pc.in
index 9f44ecd3..2b79945d 100644
--- a/poppler-glib.pc.in
+++ b/poppler-glib.pc.in
@@ -6,7 +6,8 @@ includedir=@includedir@
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@
+@PC_REQUIRES_PRIVATE@
Libs: -L${libdir} -lpoppler-glib
Cflags: -I${includedir}/poppler/glib