]>
Commit | Line | Data |
---|---|---|
bc4f318c JB |
1 | --- poppler-0.24.4/configure.ac.orig 2013-11-27 00:11:26.000000000 +0100 |
2 | +++ poppler-0.24.4/configure.ac 2014-02-25 20:57:38.944540843 +0100 | |
3 | @@ -661,20 +661,20 @@ | |
4 | AC_CHECK_TOOL(MOCQT5, moc) | |
5 | AC_MSG_CHECKING([for Qt5 moc]) | |
6 | mocversion=`$MOCQT5 -v 2>&1` | |
7 | - mocversiongrep=`echo $mocversion | grep "Qt 5"` | |
8 | + mocversiongrep=`echo $mocversion | grep -E "Qt 5| 5\.[[0-9]]"` | |
9 | if test x"$mocversiongrep" != x"$mocversion"; then | |
10 | AC_MSG_RESULT([no]) | |
11 | # moc was not the qt5 one, try with moc-qt5 | |
12 | AC_CHECK_TOOL(MOCQT52, moc-qt5) | |
13 | AC_MSG_CHECKING([for Qt5 moc-qt5]) | |
14 | mocversion=`$MOCQT52 -v 2>&1` | |
15 | - mocversiongrep=`echo $mocversion | grep "Qt 5"` | |
16 | + mocversiongrep=`echo $mocversion | grep -E "Qt 5| 5\.[[0-9]]"` | |
17 | if test x"$mocversiongrep" != x"$mocversion"; then | |
18 | AC_CHECK_TOOL(QTCHOOSER, qtchooser) | |
19 | AC_MSG_CHECKING([for qtchooser]) | |
20 | qt5tooldir=`QT_SELECT=qt5 qtchooser -print-env | grep QTTOOLDIR | cut -d '=' -f 2 | cut -d \" -f 2` | |
21 | mocversion=`$qt5tooldir/moc -v 2>&1` | |
22 | - mocversiongrep=`echo $mocversion | grep "Qt 5"` | |
23 | + mocversiongrep=`echo $mocversion | grep -E "Qt 5| 5\.[[0-9]]"` | |
24 | if test x"$mocversiongrep" != x"$mocversion"; then | |
25 | # no valid moc found | |
26 | enable_poppler_qt5=no; |