diff options
| author | Albert Astals Cid <aacid@kde.org> | 2008-06-08 23:46:04 +0200 |
|---|---|---|
| committer | Albert Astals Cid <aacid@kde.org> | 2008-06-08 23:46:04 +0200 |
| commit | cb8b94c064102118ea9d6563a906c5852f0e7ff3 (patch) | |
| tree | 1e929881cab102cb4355ccba3991e6b00db277b2 | |
| parent | d5506d233a7780dad6a6703136546118ad45a719 (diff) | |
Make sure we use Qt4 moc to generate moc files of the qt4 frontend
| -rw-r--r-- | configure.ac | 20 | ||||
| -rw-r--r-- | qt4/demos/Makefile.am | 2 | ||||
| -rw-r--r-- | qt4/src/Makefile.am | 2 | ||||
| -rw-r--r-- | qt4/tests/Makefile.am | 2 |
4 files changed, 23 insertions, 3 deletions
diff --git a/configure.ac b/configure.ac index 26ae25ca..a6c18bf0 100644 --- a/configure.ac +++ b/configure.ac @@ -296,6 +296,26 @@ fi AC_SUBST(POPPLER_QT4_CXXFLAGS) AC_SUBST(POPPLER_QT4_LIBS) +if test x$enable_poppler_qt4 = xyes; then + 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 + # moc was not the qt4 one, try with moc-qt4 + MOCQT4=`which moc-qt4` + mocversion=`$MOCQT4 -v 2>&1` + mocversiongrep=`echo $mocversion | grep "Qt 4"` + if test x"$mocversiongrep" != x"$mocversion"; then + # no valid moc found + enable_poppler_qt4=no; + MOCQT4="not found" + fi + fi + AC_SUBST(MOCQT4) + AC_MSG_RESULT([$MOCQT4]) +fi + AM_CONDITIONAL(BUILD_POPPLER_QT4, test "x$enable_poppler_qt4" = "xyes") AC_ARG_ENABLE(gtk-test, diff --git a/qt4/demos/Makefile.am b/qt4/demos/Makefile.am index a1b1ba4b..591bb827 100644 --- a/qt4/demos/Makefile.am +++ b/qt4/demos/Makefile.am @@ -16,7 +16,7 @@ SUFFIXES: .moc # This rule lets GNU make create any *.moc from the equivalent *.h .h.moc: - moc -i $< -o $@ + $(MOCQT4) -i $< -o $@ noinst_PROGRAMS = poppler_qt4viewer diff --git a/qt4/src/Makefile.am b/qt4/src/Makefile.am index c449336c..de73c8a0 100644 --- a/qt4/src/Makefile.am +++ b/qt4/src/Makefile.am @@ -63,7 +63,7 @@ libpoppler_qt4_la_LDFLAGS = -version-info 3:0:0 # This rule lets GNU make create any *.moc from the equivalent *.h .h.moc: - moc -i $< -o $@ + $(MOCQT4) -i $< -o $@ poppler-optcontent.lo: poppler-optcontent.moc diff --git a/qt4/tests/Makefile.am b/qt4/tests/Makefile.am index 3d25a8bc..d3437b36 100644 --- a/qt4/tests/Makefile.am +++ b/qt4/tests/Makefile.am @@ -15,7 +15,7 @@ LDADDS = \ SUFFIXES: .moc .cpp.moc: - moc -i $< -o $@ + $(MOCQT4) -i $< -o $@ noinst_PROGRAMS = test-poppler-qt4 stress-poppler-qt4 \ poppler-fonts test-password-qt4 stress-poppler-dir \ |