[poppler] 2 commits - configure.ac

[Albert Astals Cid]

 configure.ac |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 74c72223cf609e7c24594f95cab6f9865ad562ac
Merge: f8f7b3a 47a947f
Author: Albert Astals Cid <aacid at kde.org>
Date:   Fri Jul 11 00:23:04 2014 +0200

    Merge remote-tracking branch 'origin/poppler-0.26'

commit 47a947f1dc664793a7037888a46a297a46c79d6c
Author: Hib Eris <hib at hiberis.nl>
Date:   Thu Jun 19 10:11:21 2014 +0200

    Fix moc-qt5 detection
    
    https://bugs.freedesktop.org/show_bug.cgi?id=80250

diff --git a/configure.ac b/configure.ac
index c9dd0bb..9b66986 100644
--- a/configure.ac
+++ b/configure.ac
@@ -656,7 +656,7 @@ if test x$enable_poppler_qt5 = xyes; then
     AC_CHECK_TOOL(MOCQT52, moc-qt5)
     AC_MSG_CHECKING([for Qt5 moc-qt5])
     mocversion=`$MOCQT52 -v 2>&1`
-    mocversiongrep=`echo $mocversion | grep "Qt 5\|moc 5"`
+    mocversiongrep=`echo $mocversion | grep "Qt 5\|moc-qt5 5\|moc 5"`
     if test x"$mocversiongrep" != x"$mocversion"; then
       AC_CHECK_TOOL(QTCHOOSER, qtchooser)
       AC_MSG_CHECKING([for qtchooser])