summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMark Wielaard <mark@klomp.org>2006-07-23 12:13:14 +0000
committerMark Wielaard <mark@klomp.org>2006-07-23 12:13:14 +0000
commit9a8816634b1c79063581c40b719916d90a90517d (patch)
tree9ba13da487d7f45bcb24f9ce5fbe678205094cc3
parented7efd30e3de0a397e36e35423fd7620895a68f5 (diff)
downloadclasspath-generics-merge-20060723.tar.gz
* configure.ac: Check for moc and moc-qt4.generics-merge-20060723
-rw-r--r--ChangeLog4
-rw-r--r--configure.ac1
2 files changed, 5 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog
index f976613cd..5f63665d7 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2006-07-23 Mark Wielaard <mark@klomp.org>
+
+ * configure.ac: Check for moc and moc-qt4.
+
2006-07-23 David Gilbert <david.gilbert@object-refinery.com>
* java/awt/image/Kernel.java: API doc updates.
diff --git a/configure.ac b/configure.ac
index 23727bf96..14911bad3 100644
--- a/configure.ac
+++ b/configure.ac
@@ -490,6 +490,7 @@ if test "x${COMPILE_JNI}" = xyes; then
QT_CFLAGS="$QT_CFLAGS -I$EXTRA_QT_INCLUDE_DIR",
AC_MSG_WARN([QWidget not found])))
AC_CHECK_PROG(MOC, [moc], [moc])
+ AC_CHECK_PROG(MOC, [moc-qt4], [moc-qt4])
fi
if test "x$HAVE_QT4" = "xno"; then
AC_MSG_NOTICE([Looking for QT_CFLAGS and QT_LIBS without pkg-config])