Mercurial > octave

comparison m4/acinclude.m4 @ 24823:53f68d0fb122

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
acinclude.m4: Keep macros in alphabetical order. * acinclude.m4 (OCTAVE_HAVE_QGUIAPPLICATION): Place in alphabetical order in list of macros. * acinclude.m4 (OCTAVE_CHECK_FUNC_QOBJECT_FINDCHILDREN_ACCEPTS_FINDCHILDOPTIONS): Renamed from OCTAVE_QOBJECT_FINDCHILDREN_ACCEPTS_FINDCHILDOPTIONS to preserve naming conventions used in Autoconf. Also renamed autoconf cache variable to octave_cv_func_qobject_findchildren_accepts_findchildoptions.
author Rik <rik@octave.org>
date Fri, 02 Mar 2018 08:29:07 -0800
parents 88665923596c
children cce5d2ea39ff
comparison
equal deleted inserted replaced
24822:92b015dca875 24823:53f68d0fb122
411 AC_LANG_POP(C++) 411 AC_LANG_POP(C++)
412 ]) 412 ])
413 if test $octave_cv_func_qsci_findfirstinselection = yes; then 413 if test $octave_cv_func_qsci_findfirstinselection = yes; then
414 AC_DEFINE(HAVE_QSCI_FINDSELECTION, 1, 414 AC_DEFINE(HAVE_QSCI_FINDSELECTION, 1,
415 [Define to 1 if you have the `QsciScintilla::findFirstInSelection' member function.]) 415 [Define to 1 if you have the `QsciScintilla::findFirstInSelection' member function.])
416 fi
417 ])
418 dnl
419 dnl Check whether QObject::findChildren accepts Qt::FindChildOptions
420 dnl argument.
421 dnl
422 dnl FIXME: Delete this entirely when we drop support for Qt 4.
423 dnl
424 AC_DEFUN([OCTAVE_CHECK_FUNC_QOBJECT_FINDCHILDREN_ACCEPTS_FINDCHILDOPTIONS], [
425 AC_CACHE_CHECK([whether QObject::findChildren accepts Qt::FindChildOptions],
426 [octave_cv_func_qobject_findchildren_accepts_findchildoptions],
427 [AC_LANG_PUSH(C++)
428 ac_octave_save_CPPFLAGS="$CPPFLAGS"
429 ac_octave_save_CXXFLAGS="$CXXFLAGS"
430 CPPFLAGS="$QT_CPPFLAGS $CXXPICFLAG $CPPFLAGS"
431 CXXFLAGS="$CXXPICFLAG $CXXFLAGS"
432 AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[
433 #include <QList>
434 #include <QObject>
435 #include <QWidget>
436 ]], [[
437 QObject obj;
438 QList<QWidget *> widgets
439 = obj.findChildren<QWidget *> ("name", Qt::FindDirectChildrenOnly);
440 ]])],
441 octave_cv_func_qobject_findchildren_accepts_findchildoptions=yes,
442 octave_cv_func_qobject_findchildren_accepts_findchildoptions=no)
443 CPPFLAGS="$ac_octave_save_CPPFLAGS"
444 CXXFLAGS="$ac_octave_save_CXXFLAGS"
445 AC_LANG_POP(C++)
446 ])
447 if test $octave_cv_func_findchildren_accepts_findchildoptions = yes; then
448 AC_DEFINE(QOBJECT_FINDCHILDREN_ACCEPTS_QFINDCHILDOPTIONS, 1,
449 [Define to 1 if 'QObject::findChildren' accepts 'Qt::FindChildOptions' argument.])
416 fi 450 fi
417 ]) 451 ])
418 dnl 452 dnl
419 dnl Check whether the Qt class QTabWidget has the setMovable member function. 453 dnl Check whether the Qt class QTabWidget has the setMovable member function.
420 dnl This member function was introduced in Qt 4.5. 454 dnl This member function was introduced in Qt 4.5.
1252 AC_DEFINE(HAVE_QFONT_MONOSPACE, 1, 1286 AC_DEFINE(HAVE_QFONT_MONOSPACE, 1,
1253 [Define to 1 if `Monospace' is a member of `QFont'.]) 1287 [Define to 1 if `Monospace' is a member of `QFont'.])
1254 fi 1288 fi
1255 ]) 1289 ])
1256 dnl 1290 dnl
1257 dnl Check whether the Qt class QGuiApplication exists. This class
1258 dnl was introduced in Qt 5.0.
1259 dnl
1260 dnl FIXME: Delete this entirely when we drop support for Qt 4.
1261 dnl
1262 AC_DEFUN([OCTAVE_HAVE_QGUIAPPLICATION], [
1263 AC_CACHE_CHECK([for QGuiApplication],
1264 [octave_cv_decl_qguiapplication],
1265 [AC_LANG_PUSH(C++)
1266 ac_octave_save_CPPFLAGS="$CPPFLAGS"
1267 ac_octave_save_CXXFLAGS="$CXXFLAGS"
1268 CPPFLAGS="$QT_CPPFLAGS $CXXPICFLAG $CPPFLAGS"
1269 CXXFLAGS="$CXXPICFLAG $CXXFLAGS"
1270 AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[
1271 #include <QGuiApplication>
1272 ]], [[
1273 QScreen *pscreen = QGuiApplication::primaryScreen ();
1274 ]])],
1275 octave_cv_decl_qguiapplication=yes,
1276 octave_cv_decl_qguiapplication=no)
1277 CPPFLAGS="$ac_octave_save_CPPFLAGS"
1278 CXXFLAGS="$ac_octave_save_CXXFLAGS"
1279 AC_LANG_POP(C++)
1280 ])
1281 if test $octave_cv_decl_qguiapplication = yes; then
1282 AC_DEFINE(HAVE_QGUIAPPLICATION, 1,
1283 [Define to 1 if `QGuiApplication' class is available.])
1284 fi
1285 ])
1286 dnl
1287 dnl Check whether QObject::findChildren accepts Qt::FindChildOptions
1288 dnl argument.
1289 dnl
1290 dnl FIXME: Delete this entirely when we drop support for Qt 4.
1291 dnl
1292 AC_DEFUN([OCTAVE_QOBJECT_FINDCHILDREN_ACCEPTS_FINDCHILDOPTIONS], [
1293 AC_CACHE_CHECK([whether QObject::findChildren accepts Qt::FindChildOptions],
1294 [octave_cv_qobject_findchildren_accepts_findchildoptions],
1295 [AC_LANG_PUSH(C++)
1296 ac_octave_save_CPPFLAGS="$CPPFLAGS"
1297 ac_octave_save_CXXFLAGS="$CXXFLAGS"
1298 CPPFLAGS="$QT_CPPFLAGS $CXXPICFLAG $CPPFLAGS"
1299 CXXFLAGS="$CXXPICFLAG $CXXFLAGS"
1300 AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[
1301 #include <QList>
1302 #include <QObject>
1303 #include <QWidget>
1304 ]], [[
1305 QObject obj;
1306 QList<QWidget *> widgets
1307 = obj.findChildren<QWidget *> ("name", Qt::FindDirectChildrenOnly);
1308 ]])],
1309 octave_cv_qobject_findchildren_accepts_findchildoptions=yes,
1310 octave_cv_qobject_findchildren_accepts_findchildoptions=no)
1311 CPPFLAGS="$ac_octave_save_CPPFLAGS"
1312 CXXFLAGS="$ac_octave_save_CXXFLAGS"
1313 AC_LANG_POP(C++)
1314 ])
1315 if test $octave_cv_qobject_findchildren_accepts_findchildoptions = yes; then
1316 AC_DEFINE(QOBJECT_FINDCHILDREN_ACCEPTS_QFINDCHILDOPTIONS, 1,
1317 [Define to 1 if `QObject::findChildren' accepts 'Qt::FindChildOptions' argument.])
1318 fi
1319 ])
1320 dnl
1321 dnl Check for the Qhull version. 1291 dnl Check for the Qhull version.
1322 dnl 1292 dnl
1323 AC_DEFUN([OCTAVE_CHECK_QHULL_VERSION], [ 1293 AC_DEFUN([OCTAVE_CHECK_QHULL_VERSION], [
1324 AC_CACHE_CHECK([for qh_version in $QHULL_LIBS], 1294 AC_CACHE_CHECK([for qh_version in $QHULL_LIBS],
1325 [octave_cv_lib_qhull_version], 1295 [octave_cv_lib_qhull_version],
1837 OCTAVE_CHECK_FUNC_QLINEEDIT_SETPLACEHOLDERTEXT 1807 OCTAVE_CHECK_FUNC_QLINEEDIT_SETPLACEHOLDERTEXT
1838 OCTAVE_CHECK_FUNC_QTABWIDGET_SETMOVABLE 1808 OCTAVE_CHECK_FUNC_QTABWIDGET_SETMOVABLE
1839 OCTAVE_CHECK_MEMBER_QFONT_FORCE_INTEGER_METRICS 1809 OCTAVE_CHECK_MEMBER_QFONT_FORCE_INTEGER_METRICS
1840 OCTAVE_CHECK_MEMBER_QFONT_MONOSPACE 1810 OCTAVE_CHECK_MEMBER_QFONT_MONOSPACE
1841 OCTAVE_HAVE_QGUIAPPLICATION 1811 OCTAVE_HAVE_QGUIAPPLICATION
1842 OCTAVE_QOBJECT_FINDCHILDREN_ACCEPTS_FINDCHILDOPTIONS 1812 OCTAVE_CHECK_FUNC_QOBJECT_FINDCHILDREN_ACCEPTS_FINDCHILDOPTIONS
1843 1813
1844 if test -n "$OPENGL_LIBS"; then 1814 if test -n "$OPENGL_LIBS"; then
1845 OCTAVE_CHECK_QT_OPENGL_OK([build_qt_graphics=yes], 1815 OCTAVE_CHECK_QT_OPENGL_OK([build_qt_graphics=yes],
1846 [warn_qt_opengl="Qt does not work with the OpenGL libs (GL and GLU); disabling OpenGL graphics with Qt GUI"]) 1816 [warn_qt_opengl="Qt does not work with the OpenGL libs (GL and GLU); disabling OpenGL graphics with Qt GUI"])
1847 1817
2268 [$5] 2238 [$5]
2269 fi 2239 fi
2270 else 2240 else
2271 AC_MSG_RESULT([no]) 2241 AC_MSG_RESULT([no])
2272 [$5] 2242 [$5]
2243 fi
2244 ])
2245 dnl
2246 dnl Check whether the Qt class QGuiApplication exists.
2247 dnl This class was introduced in Qt 5.0.
2248 dnl
2249 dnl FIXME: Delete this entirely when we drop support for Qt 4.
2250 dnl
2251 AC_DEFUN([OCTAVE_HAVE_QGUIAPPLICATION], [
2252 AC_CACHE_CHECK([for QGuiApplication],
2253 [octave_cv_decl_qguiapplication],
2254 [AC_LANG_PUSH(C++)
2255 ac_octave_save_CPPFLAGS="$CPPFLAGS"
2256 ac_octave_save_CXXFLAGS="$CXXFLAGS"
2257 CPPFLAGS="$QT_CPPFLAGS $CXXPICFLAG $CPPFLAGS"
2258 CXXFLAGS="$CXXPICFLAG $CXXFLAGS"
2259 AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[
2260 #include <QGuiApplication>
2261 ]], [[
2262 QScreen *pscreen = QGuiApplication::primaryScreen ();
2263 ]])],
2264 octave_cv_decl_qguiapplication=yes,
2265 octave_cv_decl_qguiapplication=no)
2266 CPPFLAGS="$ac_octave_save_CPPFLAGS"
2267 CXXFLAGS="$ac_octave_save_CXXFLAGS"
2268 AC_LANG_POP(C++)
2269 ])
2270 if test $octave_cv_decl_qguiapplication = yes; then
2271 AC_DEFINE(HAVE_QGUIAPPLICATION, 1,
2272 [Define to 1 if `QGuiApplication' class is available.])
2273 fi 2273 fi
2274 ]) 2274 ])
2275 dnl 2275 dnl
2276 dnl Check for IEEE 754 data format. 2276 dnl Check for IEEE 754 data format.
2277 dnl 2277 dnl