45 lines
2.0 KiB
Diff
45 lines
2.0 KiB
Diff
|
diff -up poppler-0.24.2/configure.ac.mocversiongrep poppler-0.24.2/configure.ac
|
||
|
|
--- poppler-0.24.2/configure.ac.mocversiongrep 2013-09-27 05:40:27.000000000 -0500
|
||
|
|
+++ poppler-0.24.2/configure.ac 2013-10-18 09:18:29.617963650 -0500
|
||
|
|
@@ -604,14 +604,14 @@ if test x$enable_poppler_qt4 = xyes; the
|
||
|
|
AC_CHECK_TOOL(MOCQT4, moc)
|
||
|
|
AC_MSG_CHECKING([for Qt4 moc])
|
||
|
|
mocversion=`$MOCQT4 -v 2>&1`
|
||
|
|
- mocversiongrep=`echo $mocversion | grep "Qt 4"`
|
||
|
|
+ mocversiongrep=`echo $mocversion 2>1 | grep "Qt 4"`
|
||
|
|
if test x"$mocversiongrep" != x"$mocversion"; then
|
||
|
|
AC_MSG_RESULT([no])
|
||
|
|
# moc was not the qt4 one, try with moc-qt4
|
||
|
|
AC_CHECK_TOOL(MOCQT42, moc-qt4)
|
||
|
|
AC_MSG_CHECKING([for Qt4 moc-qt4])
|
||
|
|
mocversion=`$MOCQT42 -v 2>&1`
|
||
|
|
- mocversiongrep=`echo $mocversion | grep "Qt 4"`
|
||
|
|
+ mocversiongrep=`echo $mocversion 2>1 | grep "Qt 4"`
|
||
|
|
if test x"$mocversiongrep" != x"$mocversion"; then
|
||
|
|
# no valid moc found
|
||
|
|
enable_poppler_qt4=no;
|
||
|
|
@@ -661,20 +661,20 @@ if test x$enable_poppler_qt5 = xyes; the
|
||
|
|
AC_CHECK_TOOL(MOCQT5, moc)
|
||
|
|
AC_MSG_CHECKING([for Qt5 moc])
|
||
|
|
mocversion=`$MOCQT5 -v 2>&1`
|
||
|
|
- mocversiongrep=`echo $mocversion | grep "Qt 5"`
|
||
|
|
+ mocversiongrep=`echo $mocversion 2>1 | grep "5."`
|
||
|
|
if test x"$mocversiongrep" != x"$mocversion"; then
|
||
|
|
AC_MSG_RESULT([no])
|
||
|
|
# moc was not the qt5 one, try with moc-qt5
|
||
|
|
AC_CHECK_TOOL(MOCQT52, moc-qt5)
|
||
|
|
AC_MSG_CHECKING([for Qt5 moc-qt5])
|
||
|
|
mocversion=`$MOCQT52 -v 2>&1`
|
||
|
|
- mocversiongrep=`echo $mocversion | grep "Qt 5"`
|
||
|
|
+ mocversiongrep=`echo $mocversion 2>1 | grep "5."`
|
||
|
|
if test x"$mocversiongrep" != x"$mocversion"; then
|
||
|
|
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"`
|
||
|
|
+ mocversiongrep=`echo $mocversion 2>1 | grep "5."`
|
||
|
|
if test x"$mocversiongrep" != x"$mocversion"; then
|
||
|
|
# no valid moc found
|
||
|
|
enable_poppler_qt5=no;
|