48 lines
2.5 KiB
Diff
48 lines
2.5 KiB
Diff
diff -up poppler-0.18.1/configure.ac.pkgconfig_GLIB_REQUIRED poppler-0.18.1/configure.ac
|
|
--- poppler-0.18.1/configure.ac.pkgconfig_GLIB_REQUIRED 2011-10-26 07:34:22.000000000 -0500
|
|
+++ poppler-0.18.1/configure.ac 2011-10-28 16:46:07.357243072 -0500
|
|
@@ -409,6 +409,7 @@ if test x$enable_cairo_output = xyes; th
|
|
POPPLER_GLIB_DISABLE_SINGLE_INCLUDES=""
|
|
|
|
GLIB_REQUIRED=2.18
|
|
+ AC_SUBST(GLIB_REQUIRED)
|
|
AC_ARG_ENABLE(poppler-glib,
|
|
AC_HELP_STRING([--disable-poppler-glib],
|
|
[Don't compile poppler glib wrapper.]),
|
|
diff -up poppler-0.18.1/poppler-glib.pc.cmake.pkgconfig_GLIB_REQUIRED poppler-0.18.1/poppler-glib.pc.cmake
|
|
--- poppler-0.18.1/poppler-glib.pc.cmake.pkgconfig_GLIB_REQUIRED 2011-10-17 06:42:29.000000000 -0500
|
|
+++ poppler-0.18.1/poppler-glib.pc.cmake 2011-10-28 16:43:22.997297849 -0500
|
|
@@ -6,7 +6,7 @@ includedir=${prefix}/include
|
|
Name: poppler-glib
|
|
Description: GLib wrapper for poppler
|
|
Version: @POPPLER_VERSION@
|
|
-Requires: glib-2.0 >= $GLIB_REQUIRED gobject-2.0 >= $GLIB_REQUIRED cairo >= $CAIRO_VERSION
|
|
+Requires: glib-2.0 >= @GLIB_REQUIRED@ gobject-2.0 >= @GLIB_REQUIRED@ cairo >= @CAIRO_VERSION@
|
|
@PC_REQUIRES_PRIVATE@
|
|
|
|
Libs: -L${libdir} -lpoppler-glib
|
|
diff -up poppler-0.18.1/poppler-glib.pc.in.pkgconfig_GLIB_REQUIRED poppler-0.18.1/poppler-glib.pc.in
|
|
--- poppler-0.18.1/poppler-glib.pc.in.pkgconfig_GLIB_REQUIRED 2011-10-17 06:42:29.000000000 -0500
|
|
+++ poppler-0.18.1/poppler-glib.pc.in 2011-10-28 16:43:22.998297837 -0500
|
|
@@ -6,7 +6,7 @@ includedir=@includedir@
|
|
Name: poppler-glib
|
|
Description: GLib wrapper for poppler
|
|
Version: @VERSION@
|
|
-Requires: glib-2.0 >= $GLIB_REQUIRED gobject-2.0 >= $GLIB_REQUIRED cairo >= $CAIRO_VERSION
|
|
+Requires: glib-2.0 >= @GLIB_REQUIRED@ gobject-2.0 >= @GLIB_REQUIRED@ cairo >= @CAIRO_VERSION@
|
|
@PC_REQUIRES_PRIVATE@
|
|
|
|
Libs: -L${libdir} -lpoppler-glib
|
|
diff -up poppler-0.18.1/poppler-glib-uninstalled.pc.in.pkgconfig_GLIB_REQUIRED poppler-0.18.1/poppler-glib-uninstalled.pc.in
|
|
--- poppler-0.18.1/poppler-glib-uninstalled.pc.in.pkgconfig_GLIB_REQUIRED 2011-10-17 06:42:29.000000000 -0500
|
|
+++ poppler-0.18.1/poppler-glib-uninstalled.pc.in 2011-10-28 16:43:22.998297837 -0500
|
|
@@ -1,7 +1,7 @@
|
|
Name: poppler-glib
|
|
Description: GLib wrapper for poppler - uninstalled
|
|
Version: @VERSION@
|
|
-Requires: glib-2.0 >= $GLIB_REQUIRED gobject-2.0 >= $GLIB_REQUIRED cairo >= $CAIRO_VERSION
|
|
+Requires: glib-2.0 >= @GLIB_REQUIRED@ gobject-2.0 >= @GLIB_REQUIRED@ cairo >= @CAIRO_VERSION@
|
|
|
|
Libs: ${pc_top_builddir}/${pcfiledir}/glib/libpoppler-glib.la
|
|
Cflags: -I${pc_top_builddir}/${pcfiledir}/glib
|