Mercurial > octave-nkf

comparison configure.ac @ 20134:d58ba8b9f709

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Remove Qt5 checks in configure.ac until Qt5 is supported. * configure.ac: Remove Qt5 checks in configure.ac until Qt5 is supported.
author Rik <rik@octave.org>
date Sun, 19 Apr 2015 10:33:05 -0700
parents 065f933ef083
children 57b6e06ed811
comparison
equal deleted inserted replaced
20133:21dbaf135667 20134:d58ba8b9f709
2848 build_gui=no 2848 build_gui=no
2849 fi 2849 fi
2850 fi 2850 fi
2851 2851
2852 if test $build_gui = yes; then 2852 if test $build_gui = yes; then
2853 AC_CHECK_TOOLS(MOC, [moc-qt5 moc-qt4 moc]) 2853 AC_CHECK_TOOLS(MOC, [moc-qt4 moc])
2854 AC_CHECK_TOOLS(UIC, [uic-qt5 uic-qt4 uic]) 2854 AC_CHECK_TOOLS(UIC, [uic-qt4 uic])
2855 AC_CHECK_TOOLS(RCC, [rcc-qt5 rcc-qt4 rcc]) 2855 AC_CHECK_TOOLS(RCC, [rcc-qt4 rcc])
2856 AC_CHECK_TOOLS(LRELEASE, [lrelease-qt5 lrelease-qt4 lrelease]) 2856 AC_CHECK_TOOLS(LRELEASE, [lrelease-qt4 lrelease])
2857 if test -n "$MOC" && test -n "$UIC" && test -n "$RCC" && test -n "$LRELEASE"; then 2857 if test -n "$MOC" && test -n "$UIC" && test -n "$RCC" && test -n "$LRELEASE"; then
2858 AC_DEFINE(HAVE_QT, 1, 2858 AC_DEFINE(HAVE_QT, 1,
2859 [Define to 1 if Qt is available (libraries, developer header files, utility programs (moc, uic, rcc, and lrelease))]) 2859 [Define to 1 if Qt is available (libraries, developer header files, utility programs (moc, uic, rcc, and lrelease))])
2860 else 2860 else
2861 warn_gui="Qt utility programs moc, uic, rcc, and lrelease not found -- disabling GUI" 2861 warn_gui="Qt utility programs moc, uic, rcc, and lrelease not found -- disabling GUI"