[Lunar-commits] poppler: Fix compilation w/o qt4.

[Jannis Pohlmann]

commit db243963fe5c2a4be11ac3b81a4543e354839abd
Author: Jannis Pohlmann <jannis at xfce.org>
Date:   Mon Dec 3 01:03:58 2007 +0100

    poppler: Fix compilation w/o qt4.
    
    Starting with 0.6.2, poppler seems to expect Qt4 to be installed.
    We have to tell poppler not to use Qt4 explicitely. I decided to
    make qt4 an optional dependency of poppler to let the user decide
    on whether he wants to have qt4 support or not.
---
 libs/poppler/BUILD   |    6 +++---
 libs/poppler/DEPENDS |   13 +++++++++++--
 2 files changed, 14 insertions(+), 5 deletions(-)

diff --git a/libs/poppler/BUILD b/libs/poppler/BUILD
index 57b5dbb..41f897a 100644
--- a/libs/poppler/BUILD
+++ b/libs/poppler/BUILD
@@ -2,9 +2,9 @@
 
   OPTS="$OPTS --disable-gtk-test --enable-xpdf-headers"
 
-  if module_installed qt4; then
-    OPTS="$OPTS --enable-poppler-qt4"
-  fi  &&
+  if in_depends poppler qt4; then
+    . /etc/profile.d/qt4.rc
+  fi
 
   default_build
 
diff --git a/libs/poppler/DEPENDS b/libs/poppler/DEPENDS
index 01b5ea8..411cbeb 100644
--- a/libs/poppler/DEPENDS
+++ b/libs/poppler/DEPENDS
@@ -1,7 +1,16 @@
 depends  cairo
 
-optional_depends  "zlib"          "--enable-zlib"  "--disable-zlib"  \
+optional_depends  "zlib"            \
+                  "--enable-zlib"   \
+                  "--disable-zlib"  \
                   "for zlib compression support"
 
-optional_depends  "poppler-data"  ""               ""                \
+optional_depends  "poppler-data" \
+                  ""             \
+                  ""             \
                   "for support of additional file encodings"
+
+optional_depends  "qt4"                    \
+                   ""                      \
+                   "--disable-poppler-qt4" \
+                   "for Qt4 wrapper support"