Mercurial > octave
changeset 28356:4e4baa5ac03c
configure.ac: Don't check for gl2ps if opengl_graphics are not used.
* configure.ac: Wrap check for glp2s with test on $opengl_graphics.
| author | Rik <rik@octave.org> |
|---|---|
| date | Sat, 23 May 2020 08:52:51 -0700 |
| parents | 3da71c0527a1 |
| children | 8aef9f5755fe |
| files | configure.ac |
| diffstat | 1 files changed, 17 insertions(+), 13 deletions(-) [+] |
line wrap: on
line diff
--- a/configure.ac Sat May 23 08:22:19 2020 -0700 +++ b/configure.ac Sat May 23 08:52:51 2020 -0700 @@ -1811,21 +1811,23 @@ ## Check for gl2ps which is required for printing with OpenGL graphics. -AC_CHECK_HEADERS([gl2ps.h], - [GL2PS_LIBS="-lgl2ps"], - [warn_gl2ps="gl2ps library not found. Printing of OpenGL graphics will be disabled."]) - -if test -n "$warn_gl2ps"; then - OCTAVE_CONFIGURE_WARNING([warn_gl2ps]) -else - save_LIBS="$LIBS" - LIBS="$GL2PS_LIBS $LIBS" - AC_CHECK_FUNCS([gl2psLineJoin]) - LIBS="$save_LIBS" +if test $opengl_graphics = yes; then + AC_CHECK_HEADERS([gl2ps.h], + [GL2PS_LIBS="-lgl2ps"], + [warn_gl2ps="gl2ps library not found. Printing of OpenGL graphics will be disabled."]) + + if test -n "$warn_gl2ps"; then + OCTAVE_CONFIGURE_WARNING([warn_gl2ps]) + else + save_LIBS="$LIBS" + LIBS="$GL2PS_LIBS $LIBS" + AC_CHECK_FUNCS([gl2psLineJoin]) + LIBS="$save_LIBS" + fi + + AC_SUBST(GL2PS_LIBS) fi -AC_SUBST(GL2PS_LIBS) - ### GUI/Qt related tests. QT_VERSIONS="5" @@ -2579,6 +2581,7 @@ warn_docs="building documentation disabled; make dist will fail." OCTAVE_CONFIGURE_WARNING([warn_docs]) fi], []) + if test $ENABLE_DOCS = yes; then if test $opengl_graphics = no || test "$have_qt_opengl_offscreen" = no; then if test -n "$warn_gnuplot"; then @@ -2597,6 +2600,7 @@ AC_DEFINE(ENABLE_DOCS, 1, [Define to 1 to build Octave documentation files.]) fi + AM_CONDITIONAL([AMCOND_BUILD_DOCS], [test $ENABLE_DOCS = yes]) AM_CONDITIONAL([AMCOND_BUILD_QT_DOCS],