summaryrefslogtreecommitdiff
path: root/configure.ac
diff options
context:
space:
mode:
authorAndrew John Hughes <gnu_andrew@member.fsf.org>2006-07-23 21:28:32 +0000
committerAndrew John Hughes <gnu_andrew@member.fsf.org>2006-07-23 21:28:32 +0000
commitef8f9342adc610b1e8fcfb71c5b2400d29f1c8fa (patch)
treea60d6813f0454b3b28c337e922492b4eec466fb9 /configure.ac
parentee82dd6eae151a860dff851492809c46b3818796 (diff)
downloadclasspath-ef8f9342adc610b1e8fcfb71c5b2400d29f1c8fa.tar.gz
2006-07-23 Andrew John Hughes <gnu_andrew@member.fsf.org>
* Merge of HEAD to generics-branch for 2006-07-16 to 2006-07-23.
Diffstat (limited to 'configure.ac')
-rw-r--r--configure.ac1
1 files changed, 1 insertions, 0 deletions
diff --git a/configure.ac b/configure.ac
index f5a9a1c03..3261a1765 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])