Commit e238c1f8 authored by Albert Astals Cid's avatar Albert Astals Cid
Browse files

Fix qt5 moc detection fix

parent 381ae287
m4_define([poppler_version_major],[0]) m4_define([poppler_version_major],[0])
m4_define([poppler_version_minor],[25]) m4_define([poppler_version_minor],[25])
m4_define([poppler_version_micro],[0]) m4_define([poppler_version_micro],[1])
m4_define([poppler_version],[poppler_version_major.poppler_version_minor.poppler_version_micro]) m4_define([poppler_version],[poppler_version_major.poppler_version_minor.poppler_version_micro])
AC_PREREQ(2.59) AC_PREREQ(2.59)
...@@ -661,20 +661,20 @@ if test x$enable_poppler_qt5 = xyes; then ...@@ -661,20 +661,20 @@ if test x$enable_poppler_qt5 = xyes; then
AC_CHECK_TOOL(MOCQT5, moc) AC_CHECK_TOOL(MOCQT5, moc)
AC_MSG_CHECKING([for Qt5 moc]) AC_MSG_CHECKING([for Qt5 moc])
mocversion=`$MOCQT5 -v 2>&1` mocversion=`$MOCQT5 -v 2>&1`
mocversiongrep=`echo $mocversion | grep "Qt\|moc 5"` mocversiongrep=`echo $mocversion | grep "Qt 5\|moc 5"`
if test x"$mocversiongrep" != x"$mocversion"; then if test x"$mocversiongrep" != x"$mocversion"; then
AC_MSG_RESULT([no]) AC_MSG_RESULT([no])
# moc was not the qt5 one, try with moc-qt5 # moc was not the qt5 one, try with moc-qt5
AC_CHECK_TOOL(MOCQT52, moc-qt5) AC_CHECK_TOOL(MOCQT52, moc-qt5)
AC_MSG_CHECKING([for Qt5 moc-qt5]) AC_MSG_CHECKING([for Qt5 moc-qt5])
mocversion=`$MOCQT52 -v 2>&1` mocversion=`$MOCQT52 -v 2>&1`
mocversiongrep=`echo $mocversion | grep "Qt\|moc 5"` mocversiongrep=`echo $mocversion | grep "Qt 5\|moc 5"`
if test x"$mocversiongrep" != x"$mocversion"; then if test x"$mocversiongrep" != x"$mocversion"; then
AC_CHECK_TOOL(QTCHOOSER, qtchooser) AC_CHECK_TOOL(QTCHOOSER, qtchooser)
AC_MSG_CHECKING([for qtchooser]) AC_MSG_CHECKING([for qtchooser])
qt5tooldir=`QT_SELECT=qt5 qtchooser -print-env | grep QTTOOLDIR | cut -d '=' -f 2 | cut -d \" -f 2` qt5tooldir=`QT_SELECT=qt5 qtchooser -print-env | grep QTTOOLDIR | cut -d '=' -f 2 | cut -d \" -f 2`
mocversion=`$qt5tooldir/moc -v 2>&1` mocversion=`$qt5tooldir/moc -v 2>&1`
mocversiongrep=`echo $mocversion | grep "Qt\|moc 5"` mocversiongrep=`echo $mocversion | grep "Qt 5\|moc 5"`
if test x"$mocversiongrep" != x"$mocversion"; then if test x"$mocversiongrep" != x"$mocversion"; then
# no valid moc found # no valid moc found
enable_poppler_qt5=no; enable_poppler_qt5=no;
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment