Mercurial > octave-nkf

changeset 16669:c7d4146c570d

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
check for Qt build tools with $host prefix * configure.ac: Use AC_CHECK_TOOLS instead of AC_CHECK_PROGS to check for moc, uic, rcc, and lrelease.
author John W. Eaton <jwe@octave.org>
date Thu, 16 May 2013 14:32:54 -0400
parents 0c9aaceadc33
children dddbb5dcbf6e
files configure.ac
diffstat 1 files changed, 4 insertions(+), 4 deletions(-) [+]
line wrap: on
line diff
--- a/configure.ac	Thu May 16 13:19:33 2013 -0400
+++ b/configure.ac	Thu May 16 14:32:54 2013 -0400
@@ -2599,10 +2599,10 @@
   fi
 
   if test $build_gui = yes; then
-    AC_CHECK_PROGS(MOC, [moc-qt5 moc-qt4 moc])
-    AC_CHECK_PROGS(UIC, [uic-qt5 uic-qt4 uic])
-    AC_CHECK_PROGS(RCC, [rcc])
-    AC_CHECK_PROGS(LRELEASE, [lrelease-qt5 lrelease-qt4 lrelease])
+    AC_CHECK_TOOLS(MOC, [moc-qt5 moc-qt4 moc])
+    AC_CHECK_TOOLS(UIC, [uic-qt5 uic-qt4 uic])
+    AC_CHECK_TOOLS(RCC, [rcc])
+    AC_CHECK_TOOLS(LRELEASE, [lrelease-qt5 lrelease-qt4 lrelease])
     if test -n "$MOC" && test -n "$UIC" && test -n "$RCC" && test -n "$LRELEASE"; then
       AC_DEFINE(HAVE_QT, 1, 
         [Define to 1 if Qt is available (libraries, developer header files, utility programs (moc, uic, rcc, and lrelease))])