configure.ac | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-)
New commits: commit 203cbb1dc317a6d7884d2708e938804ceb4617cb Author: Hib Eris <[email protected]> Date: Sun Feb 12 23:16:41 2012 +0100 Improve moc detection when cross compiling (cherry picked from commit 9250449aaa279840d789b3a7cef75d06a0fd88e7) diff --git a/configure.ac b/configure.ac index 23061b1..07d7dcd 100644 --- a/configure.ac +++ b/configure.ac @@ -494,13 +494,15 @@ AC_SUBST(POPPLER_QT4_LIBS) AC_SUBST(POPPLER_QT4_TEST_LIBS) if test x$enable_poppler_qt4 = xyes; then + AC_CHECK_TOOL(MOCQT4, moc) AC_MSG_CHECKING([for Qt4 moc]) - MOCQT4=`which moc` mocversion=`$MOCQT4 -v 2>&1` mocversiongrep=`echo $mocversion | grep "Qt 4"` if test x"$mocversiongrep" != x"$mocversion"; then + AC_MSG_RESULT([no]) # moc was not the qt4 one, try with moc-qt4 - MOCQT4=`which moc-qt4` + AC_CHECK_TOOL(MOCQT4, moc-qt4) + AC_MSG_CHECKING([for Qt4 moc-qt4]) mocversion=`$MOCQT4 -v 2>&1` mocversiongrep=`echo $mocversion | grep "Qt 4"` if test x"$mocversiongrep" != x"$mocversion"; then _______________________________________________ poppler mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/poppler
