patches/poppler-03-glib-2.diff
author dcarbery
Fri, 24 Nov 2006 16:37:59 +0000
branch217update
changeset 19096 d542fc2c823e
parent 8312 4f5945b7e7ce
permissions -rw-r--r--
Merged trunk changes r9797:9829 into 217update branch.
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
8312
4f5945b7e7ce 2006-10-11 Damien Carbery <[email protected]>
dc144907
parents:
diff changeset
     1
--- poppler-0.5.4/configure.ac.orig	2006-10-11 11:14:46.557197000 +0100
4f5945b7e7ce 2006-10-11 Damien Carbery <[email protected]>
dc144907
parents:
diff changeset
     2
+++ poppler-0.5.4/configure.ac	2006-10-11 11:15:17.271862000 +0100
4f5945b7e7ce 2006-10-11 Damien Carbery <[email protected]>
dc144907
parents:
diff changeset
     3
@@ -184,7 +184,7 @@
4f5945b7e7ce 2006-10-11 Damien Carbery <[email protected]>
dc144907
parents:
diff changeset
     4
               enable_poppler_glib=$enableval,
4f5945b7e7ce 2006-10-11 Damien Carbery <[email protected]>
dc144907
parents:
diff changeset
     5
               enable_poppler_glib="try")
4f5945b7e7ce 2006-10-11 Damien Carbery <[email protected]>
dc144907
parents:
diff changeset
     6
 if test x$enable_poppler_glib = xyes; then
4f5945b7e7ce 2006-10-11 Damien Carbery <[email protected]>
dc144907
parents:
diff changeset
     7
-  PKG_CHECK_MODULES(POPPLER_GLIB, gdk-2.0 >= 2.4.0 glib >= 2.6)
4f5945b7e7ce 2006-10-11 Damien Carbery <[email protected]>
dc144907
parents:
diff changeset
     8
+  PKG_CHECK_MODULES(POPPLER_GLIB, gdk-2.0 >= 2.4.0 glib-2.0 >= 2.6)
4f5945b7e7ce 2006-10-11 Damien Carbery <[email protected]>
dc144907
parents:
diff changeset
     9
 elif test x$enable_poppler_glib = xtry; then
4f5945b7e7ce 2006-10-11 Damien Carbery <[email protected]>
dc144907
parents:
diff changeset
    10
   PKG_CHECK_MODULES(POPPLER_GLIB, gdk-2.0 >= 2.4.0,
4f5945b7e7ce 2006-10-11 Damien Carbery <[email protected]>
dc144907
parents:
diff changeset
    11
                     [enable_poppler_glib="yes"],