=== modified file 'configure.ac' --- configure.ac 2010-10-03 18:45:55 +0000 +++ configure.ac 2010-10-05 15:31:58 +0000 @@ -105,6 +105,15 @@ [PKG_CHECK_MODULES(QTCORE, QtCore, ac_have_qt4=1, ac_have_qt4=0) AC_SUBST(QTCORE_CFLAGS) AC_SUBST(QTCORE_LIBS)]) +if test $ac_have_qt4 = 1; then + MOC=`$PKG_CONFIG --variable=moc_location QtCore` + AC_PATH_PROGS([MOC], [moc-qt4,moc]) +fi +AC_SUBST(MOC) +if test "x$MOC" = "x"; then + AC_MSG_WARN([Could not find the moc command, required for Qt4 support.]) + ac_have_qt4=0 +fi AM_CONDITIONAL(HAVE_QT4, test $ac_have_qt4 = 1)
PKG_CHECK_MODULES(LIBNL, libnl-1, ac_have_libnl=1,ac_have_libnl=0)
=== modified file 'qt4/Makefile.am' --- qt4/Makefile.am 2010-08-10 20:58:16 +0000 +++ qt4/Makefile.am 2010-10-05 15:33:16 +0000 @@ -75,7 +75,7 @@
# This rule lets GNU make create any moc_*.cpp from the equivalent *.h moc_QNtrack.cpp: QNtrack.h - moc-qt4 $? -o $@ + $(MOC) $? -o $@
CLEANFILES = moc_QNtrack.cpp
=== modified file 'configure.ac'
[PKG_ CHECK_MODULES( QTCORE, QtCore, ac_have_qt4=1, ac_have_qt4=0)
AC_SUBST( QTCORE_ CFLAGS)
AC_SUBST( QTCORE_ LIBS)]) moc_location QtCore` PROGS([ MOC], [moc-qt4,moc]) (HAVE_QT4, test $ac_have_qt4 = 1)
--- configure.ac 2010-10-03 18:45:55 +0000
+++ configure.ac 2010-10-05 15:31:58 +0000
@@ -105,6 +105,15 @@
+if test $ac_have_qt4 = 1; then
+ MOC=`$PKG_CONFIG --variable=
+ AC_PATH_
+fi
+AC_SUBST(MOC)
+if test "x$MOC" = "x"; then
+ AC_MSG_WARN([Could not find the moc command, required for Qt4 support.])
+ ac_have_qt4=0
+fi
AM_CONDITIONAL
PKG_CHECK_ MODULES( LIBNL, libnl-1, ac_have_ libnl=1, ac_have_ libnl=0)
=== modified file 'qt4/Makefile.am'
--- qt4/Makefile.am 2010-08-10 20:58:16 +0000
+++ qt4/Makefile.am 2010-10-05 15:33:16 +0000
@@ -75,7 +75,7 @@
# This rule lets GNU make create any moc_*.cpp from the equivalent *.h
moc_QNtrack.cpp: QNtrack.h
- moc-qt4 $? -o $@
+ $(MOC) $? -o $@
CLEANFILES = moc_QNtrack.cpp