Mercurial > octave-nkf
comparison configure.ac @ 17111:bb713af2e1d9
build: detect Qt functions required for building the gui
* m4/acinclude.m4 (OCTAVE_CHECK_FUNC_QABSTRACTITEMMODEL_BEGINRESETMODEL):
New macro to detect Qt functions QAbstractItemModel::beginResetModel and
QAbstractItemModel::endResetModel.
* configure.ac: Call it and disable the gui if the functions are not found.
author | Mike Miller <mtmiller@ieee.org> |
---|---|
date | Tue, 30 Jul 2013 00:49:37 -0400 |
parents | 054905bfc306 |
children | 36fd98b9ce48 |
comparison
equal
deleted
inserted
replaced
17110:95055b814d35 | 17111:bb713af2e1d9 |
---|---|
2612 if test -n "$MOC" && test -n "$UIC" && test -n "$RCC" && test -n "$LRELEASE"; then | 2612 if test -n "$MOC" && test -n "$UIC" && test -n "$RCC" && test -n "$LRELEASE"; then |
2613 AC_DEFINE(HAVE_QT, 1, | 2613 AC_DEFINE(HAVE_QT, 1, |
2614 [Define to 1 if Qt is available (libraries, developer header files, utility programs (moc, uic, rcc, and lrelease))]) | 2614 [Define to 1 if Qt is available (libraries, developer header files, utility programs (moc, uic, rcc, and lrelease))]) |
2615 else | 2615 else |
2616 AC_MSG_WARN([Qt utility programs moc, uic, rcc, and lrelease not found -- disabling GUI]) | 2616 AC_MSG_WARN([Qt utility programs moc, uic, rcc, and lrelease not found -- disabling GUI]) |
2617 build_gui=no | |
2618 fi | |
2619 fi | |
2620 | |
2621 if test $build_gui = yes; then | |
2622 OCTAVE_CHECK_FUNC_QABSTRACTITEMMODEL_BEGINRESETMODEL | |
2623 if test $octave_cv_func_qabstractitemmodel_beginresetmodel = no; then | |
2624 AC_MSG_WARN([QAbstractItemModel::beginResetModel() not found -- disabling GUI]) | |
2617 build_gui=no | 2625 build_gui=no |
2618 fi | 2626 fi |
2619 fi | 2627 fi |
2620 | 2628 |
2621 if test $build_gui = yes; then | 2629 if test $build_gui = yes; then |