[Lunar-commits] <moonbase-other> poppler: Adjusting the BUILD to accomodate qt4 and qt5.

[Dennis Veatch]

commit d19eba70a0bf0722759f06d6319896609241a1e7
Author: Dennis Veatch <dennisveatch at bellsouth.net>
Date: Mon, 10 Nov 2014 12:02:11 -0500
URL: https://github.com/lunar-linux/moonbase-other/commit/d19eba70a0bf0722759f06d6319896609241a1e7

poppler: Adjusting the BUILD to accomodate qt4 and qt5.
---
  libs/poppler/BUILD | +12/-7    
  1 file changed, 12 insertions(+), 7 deletions(-)

--- a/libs/poppler/BUILD
+++ b/libs/poppler/BUILD
@@ -1,20 +1,25 @@
-(
+
   sedit "s:priv->quality, true: priv->quality, TRUE:" goo/JpegWriter.cc &&
 
   OPTS+=" --disable-static --disable-gtk-test --enable-xpdf-headers --enable-poppler-glib" &&
 
-  if in_depends poppler qt4; then
-    . /etc/profile.d/qt4.rc
+  if in_depends poppler qt5; then
+    OPTS+=" --disable-poppler-qt5"
   fi &&
 
-  if in_depends poppler qt5; then
-    . /etc/profile.d/qt5.rc
+  if in_depends poppler qt4; then
+    . /etc/profile.d/qt4.rc
   fi &&
 
   if [ "`get_module_config DOCS`" = "n" ] ; then
     sedit "s/SUBDIRS = . reference demo/SUBDIRS = . demo/g" glib/Makefile.in
   fi  &&
 
-  default_build
+  default_build &&
 
-) > $C_FIFO 2>&1
+# If in depends we will now build qt5 libs
+  if in_depends poppler qt5; then
+    . /etc/profile.d/qt5.rc &&
+    OPTS+=" --enable-poppler-qt5" &&
+    default_build
+  fi