[poppler] Branch 'qt5' - 2 commits - configure.ac

[Albert Astals Cid]

 configure.ac |   16 +++++++++++++---
 1 file changed, 13 insertions(+), 3 deletions(-)

New commits:
commit b44c70f04758000cf0e049b06cc7864287570f7b
Author: Albert Astals Cid <aacid at kde.org>
Date:   Mon Jun 17 22:10:05 2013 +0200

    Bring PIC back to the toplevel, still have linking errors tohugh :-/

diff --git a/configure.ac b/configure.ac
index f30846d..7599434 100644
--- a/configure.ac
+++ b/configure.ac
@@ -824,6 +824,7 @@ case "$enable_compile_warnings" in
 		-Wmissing-format-attribute -fno-exceptions -fno-check-new \
 		-fno-common $CXXFLAGS" ;;
 esac
+CXXFLAGS="-fPIC $CXXFLAGS";
 
 case `$PKG_CONFIG --version` in
   0.?|0.1[0-7])
commit be49073f5ce79f56b38197758a5cf1253b972306
Author: Albert Astals Cid <aacid at kde.org>
Date:   Mon Jun 17 21:50:31 2013 +0200

    Use qtchooser if available

diff --git a/configure.ac b/configure.ac
index e4eb71f..f30846d 100644
--- a/configure.ac
+++ b/configure.ac
@@ -670,9 +670,18 @@ if test x$enable_poppler_qt5 = xyes; then
     mocversion=`$MOCQT52 -v 2>&1`
     mocversiongrep=`echo $mocversion | grep "Qt 5"`
     if test x"$mocversiongrep" != x"$mocversion"; then
-      # no valid moc found
-      enable_poppler_qt5=no;
-      MOCQT5="not found"
+      AC_CHECK_TOOL(QTCHOOSER, qtchooser)
+      AC_MSG_CHECKING([for qtchooser])
+      qt5tooldir=`QT_SELECT=qt5 qtchooser -print-env | grep QTTOOLDIR | cut -d '=' -f 2 | cut -d \" -f 2`
+      mocversion=`$qt5tooldir/moc -v 2>&1`
+      mocversiongrep=`echo $mocversion | grep "Qt 5"`
+      if test x"$mocversiongrep" != x"$mocversion"; then
+        # no valid moc found
+        enable_poppler_qt5=no;
+        MOCQT5="not found"
+      else
+        MOCQT5=$qt5tooldir/moc
+      fi
     else
       MOCQT5=$MOCQT52
     fi