[poppler] Branch 'qt5' - configure.ac

[Albert Astals Cid]

 configure.ac |    6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

New commits:
commit b1958228d4bc6793a3606b5e31c61a57b9fac9f5
Author: Albert Astals Cid <aacid at kde.org>
Date:   Mon Jun 17 20:21:08 2013 +0200

    No distro ships moc-qt5 but make it work in case someone would

diff --git a/configure.ac b/configure.ac
index a2ec238..e4eb71f 100644
--- a/configure.ac
+++ b/configure.ac
@@ -665,14 +665,16 @@ if test x$enable_poppler_qt5 = xyes; then
   if test x"$mocversiongrep" != x"$mocversion"; then
     AC_MSG_RESULT([no])
     # moc was not the qt5 one, try with moc-qt5
-    AC_CHECK_TOOL(MOCQT5, moc-qt5)
+    AC_CHECK_TOOL(MOCQT52, moc-qt5)
     AC_MSG_CHECKING([for Qt5 moc-qt5])
-    mocversion=`$MOCQT5 -v 2>&1`
+    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"
+    else
+      MOCQT5=$MOCQT52
     fi
   fi
   AC_SUBST(MOCQT5)