Mercurial > octave
diff m4/acinclude.m4 @ 24810:8a92f442c4a2
configure.ac: Overhaul file (bug #53186).
* configure.ac: Disable OSMesa by default, but make --with-osmesa a configure
option (bug #53186). Use "dnl" for comments in configure.ac which do not need
to be passed to the configure shell script. Add more "dnl" and "##" comments
describing the configure process. Re-order the configuration test macros to
make as much sense as is possible. Define values through AC_DEFINE to 1,
rather than just to a defined state. Use the phrase "Define to 1 ..." for
the comment field of any AC_DEFINE statements. Rephrase some warning messages
for clarity and to get rid of the first person syntax. Remove OSMesa from
build summary, change capitalization of OPENGL library to OpenGL in summary,
change position of ENABLE_FLOAT_TRUNCATE in summary.
* acinclude.m4: Define values through AC_DEFINE to 1, rather than just to a
defined state. Use the phrase "Define to 1 ..." for the comment field of any
AC_DEFINE statements.
| author | Rik <rik@octave.org> |
|---|---|
| date | Thu, 01 Mar 2018 11:12:38 -0800 |
| parents | 45470049a43f |
| children | 88665923596c |
line wrap: on
line diff
--- a/m4/acinclude.m4 Wed Feb 28 22:11:38 2018 +0100 +++ b/m4/acinclude.m4 Thu Mar 01 11:12:38 2018 -0800 @@ -1429,10 +1429,10 @@ if test $build_qt_gui = yes; then if test x"$have_qt_version" = x4; then - AC_DEFINE(HAVE_QT4, 1, [Define if you are using Qt version 4.]) + AC_DEFINE(HAVE_QT4, 1, [Define to 1 if using Qt version 4.]) fi if test x"$have_qt_version" = x5; then - AC_DEFINE(HAVE_QT5, 1, [Define if you are using Qt version 5.]) + AC_DEFINE(HAVE_QT5, 1, [Define to 1 if using Qt version 5.]) fi else if test -n "$warn_qt_libraries"; then @@ -1739,7 +1739,7 @@ *) AC_CHECK_HEADERS([pty.h libutil.h util.h]) AC_SEARCH_LIBS([openpty], [util], - [AC_DEFINE(HAVE_OPENPTY, [], [Define whether openpty exists])]) + [AC_DEFINE(HAVE_OPENPTY, 1, [Define to 1 if openpty exists])]) AC_CHECK_FUNCS([chmod chown ftruncate mmap munmap], [], [build_qt_gui=no warn_qt_lib_fcns="At least one of chmod, chown, ftruncate, mmap, and munmap not found; disabling Qt GUI"])