@@ -1,3 +1,13 @@ +2005-06-02 Kristian Høgsberg <krh@redhat.com> + + Patch from Stanislav Brabec <sbrabec@suse.cz>: + + * configure.ac: + * poppler-cairo.pc.in: + * poppler-glib.pc.in: + * poppler-qt.pc.in: + * poppler-splash.pc.in: Misc fixes to pkg-config files. + 2005-06-01 Jeff Muizelaar <jeff@infidigm.net> * poppler/Error.cc: ChangeLog @@ -175,15 +175,17 @@ if test x$enable_splash_output = xyes; then AC_DEFINE(HAVE_SPLASH) fi +CAIRO_VERSION="0.5" +AC_SUBST(CAIRO_VERSION) AC_ARG_ENABLE(cairo-output, AC_HELP_STRING([--disable-cairo-output], [Don't build the cairo graphics backend.]), enable_cairo_output=$enableval, enable_cairo_output="try") if test x$enable_cairo_output = xyes; then - PKG_CHECK_MODULES(CAIRO, cairo >= 0.5.0 fontconfig) + PKG_CHECK_MODULES(CAIRO, cairo >= $CAIRO_VERSION fontconfig) elif test x$enable_cairo_output = xtry; then - PKG_CHECK_MODULES(CAIRO, cairo >= 0.5.0 fontconfig, + PKG_CHECK_MODULES(CAIRO, cairo >= $CAIRO_VERSION fontconfig, [enable_cairo_output="yes"], [enable_cairo_output="no"]) fi configure.ac @@ -6,5 +6,4 @@ includedir=@includedir@ Name: poppler-cairo Description: Cairo backend for Poppler PDF rendering library Version: @VERSION@ - -Requires: poppler-@VERSION@ cairo >= 0.3 +Requires: poppler = @VERSION@ cairo >= @CAIRO_VERSION@ poppler-cairo.pc.in @@ -3,10 +3,10 @@ exec_prefix=@exec_prefix@ libdir=@libdir@ includedir=@includedir@ -Name: poppler +Name: poppler-glib Description: GLib wrapper for poppler Version: @VERSION@ -Requires: gobject-2.0 gdk-pixbuf-2.0 +Requires: poppler = @VERSION@ gobject-2.0 gdk-pixbuf-2.0 Libs: -L${libdir} -lpoppler-glib Cflags: -I${includedir}/poppler/glib poppler-glib.pc.in @@ -6,6 +6,7 @@ includedir=@includedir@ Name: poppler-qt Description: Qt bindings for poppler Version: @VERSION@ +Requires: poppler = @VERSION@ Libs: -L${libdir} -lpoppler-qt Cflags: -I${includedir}/poppler poppler-qt.pc.in @@ -6,5 +6,4 @@ includedir=@includedir@ Name: poppler-splash Description: Splash backend for Poppler PDF rendering library Version: @VERSION@ - -Requires: poppler-@VERSION@ +Requires: poppler = @VERSION@ poppler-splash.pc.in 9f0da96dd005defd5d82dd05b627ff1925430215 Kristian Høgsberg krh@redhat.com http://github.com/kou/poppler-test/commit/47c3b4ec2c7691e44f5100b1f5956df0005467c8 47c3b4ec2c7691e44f5100b1f5956df0005467c8 2005-06-02T11:49:55-07:00 2005-06-02T11:49:55-07:00 2005-06-02 Kristian Høgsberg <krh@redhat.com> Patch from Stanislav Brabec <sbrabec@suse.cz>: * configure.ac: * poppler-cairo.pc.in: * poppler-glib.pc.in: * poppler-qt.pc.in: * poppler-splash.pc.in: Misc fixes to pkg-config files. eece83c09cf9d1d82afa832e009ab6af5a796d8f Kristian Høgsberg krh@redhat.com