[poppler] Branch 'poppler-0.18' - CMakeLists.txt configure.ac poppler-glib.pc.cmake poppler-glib.pc.in poppler-glib-uninstalled.pc.in

[Carlos Garcia Campos]

 CMakeLists.txt                 |    1 -
 configure.ac                   |    2 --
 poppler-glib-uninstalled.pc.in |    2 +-
 poppler-glib.pc.cmake          |    2 +-
 poppler-glib.pc.in             |    2 +-
 5 files changed, 3 insertions(+), 6 deletions(-)

New commits:
commit 185ed4f3c98f162fe3ddb00d4aa0b637988dfad9
Author: Carlos Garcia Campos <carlosgc at gnome.org>
Date:   Sun Oct 16 12:40:27 2011 +0200

    Remove poppler-cairo dependency from poppler-glib pkg-config file
    
    poppler-glib links to poppler-cairo statically, so it doesn'tm depend on
    the dynamic library.

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 552c285..d3bb385 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -93,7 +93,6 @@ if(CAIRO_FOUND)
     # Check for introspection
     macro_optional_find_package(GObjectIntrospection 0.9.12)
     set(HAVE_INTROSPECTION ${INTROSPECTION_FOUND})
-    set(GLIB_REQ "glib-2.0 >= ${GLIB_REQUIRED} gobject-2.0 >= ${GLIB_REQUIRED} cairo >= ${CAIRO_VERSION}")
     set(POPPLER_GLIB_DISABLE_DEPRECATED "${POPPLER_GLIB_DISABLE_DEPRECATED} -DG_DISABLE_DEPRECATED")
     set(POPPLER_GLIB_DISABLE_SINGLE_INCLUDES "${POPPLER_GLIB_DISABLE_SINGLE_INCLUDES} -DG_DISABLE_SINGLE_INCLUDES")
     macro_optional_find_package(GTK)
diff --git a/configure.ac b/configure.ac
index 7293d1f..f64aa49 100644
--- a/configure.ac
+++ b/configure.ac
@@ -425,7 +425,6 @@ if test x$enable_cairo_output = xyes; then
     # Check for introspection
     GOBJECT_INTROSPECTION_CHECK([0.6.7])
 
-    GLIB_REQ="glib-2.0 >= $GLIB_REQUIRED gobject-2.0 >= $GLIB_REQUIRED cairo >= $CAIRO_VERSION"
     AC_PATH_PROG([GLIB_MKENUMS],[glib-mkenums])
     POPPLER_GLIB_DISABLE_DEPRECATED="$POPPLER_GLIB_DISABLE_DEPRECATED -DG_DISABLE_DEPRECATED"
     POPPLER_GLIB_DISABLE_SINGLE_INCLUDES="$POPPLER_GLIB_DISABLE_SINGLE_INCLUDES -DG_DISABLE_SINGLE_INCLUDES"
@@ -435,7 +434,6 @@ else
     AC_MSG_ERROR("Cairo output is required to build glib frontend")
   fi
   enable_poppler_glib="no"
-  GLIB_REQ=""
 fi
 AM_CONDITIONAL(BUILD_POPPLER_GLIB, test x$enable_poppler_glib = xyes)
 AM_CONDITIONAL(HAVE_INTROSPECTION, test "x$found_introspection" = "xyes")
diff --git a/poppler-glib-uninstalled.pc.in b/poppler-glib-uninstalled.pc.in
index d0d63f4..55a2278 100644
--- a/poppler-glib-uninstalled.pc.in
+++ b/poppler-glib-uninstalled.pc.in
@@ -1,7 +1,7 @@
 Name: poppler-glib
 Description: GLib wrapper for poppler - uninstalled
 Version: @VERSION@
-Requires: poppler-cairo = @VERSION@ @GLIB_REQ@
+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
diff --git a/poppler-glib.pc.cmake b/poppler-glib.pc.cmake
index 5e94015..3264ed6 100644
--- a/poppler-glib.pc.cmake
+++ b/poppler-glib.pc.cmake
@@ -6,7 +6,7 @@ includedir=${prefix}/include
 Name: poppler-glib
 Description: GLib wrapper for poppler
 Version: @POPPLER_VERSION@
-Requires: poppler-cairo = @POPPLER_VERSION@ @GLIB_REQ@
+Requires: glib-2.0 >= $GLIB_REQUIRED gobject-2.0 >= $GLIB_REQUIRED cairo >= $CAIRO_VERSION
 @PC_REQUIRES_PRIVATE@
 
 Libs: -L${libdir} -lpoppler-glib
diff --git a/poppler-glib.pc.in b/poppler-glib.pc.in
index 05b9a77..04d9bb9 100644
--- a/poppler-glib.pc.in
+++ b/poppler-glib.pc.in
@@ -6,7 +6,7 @@ includedir=@includedir@
 Name: poppler-glib
 Description: GLib wrapper for poppler
 Version: @VERSION@
-Requires: poppler-cairo = @VERSION@ @GLIB_REQ@
+Requires: glib-2.0 >= $GLIB_REQUIRED gobject-2.0 >= $GLIB_REQUIRED cairo >= $CAIRO_VERSION
 @PC_REQUIRES_PRIVATE@
 
 Libs: -L${libdir} -lpoppler-glib