Mercurial > octave

comparison configure.ac @ 28356:4e4baa5ac03c

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
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 70908e5d8865
children 75c87b15bcee
comparison
equal deleted inserted replaced
28355:3da71c0527a1 28356:4e4baa5ac03c
1809 [fontconfig.h fontconfig/fontconfig.h], [FcInit], 1809 [fontconfig.h fontconfig/fontconfig.h], [FcInit],
1810 [], [don't use fontconfig library, OpenGL graphics will not be fully functional]) 1810 [], [don't use fontconfig library, OpenGL graphics will not be fully functional])
1811 1811
1812 ## Check for gl2ps which is required for printing with OpenGL graphics. 1812 ## Check for gl2ps which is required for printing with OpenGL graphics.
1813 1813
1814 AC_CHECK_HEADERS([gl2ps.h], 1814 if test $opengl_graphics = yes; then
1815 [GL2PS_LIBS="-lgl2ps"], 1815 AC_CHECK_HEADERS([gl2ps.h],
1816 [warn_gl2ps="gl2ps library not found. Printing of OpenGL graphics will be disabled."]) 1816 [GL2PS_LIBS="-lgl2ps"],
1817 1817 [warn_gl2ps="gl2ps library not found. Printing of OpenGL graphics will be disabled."])
1818 if test -n "$warn_gl2ps"; then 1818
1819 OCTAVE_CONFIGURE_WARNING([warn_gl2ps]) 1819 if test -n "$warn_gl2ps"; then
1820 else 1820 OCTAVE_CONFIGURE_WARNING([warn_gl2ps])
1821 save_LIBS="$LIBS" 1821 else
1822 LIBS="$GL2PS_LIBS $LIBS" 1822 save_LIBS="$LIBS"
1823 AC_CHECK_FUNCS([gl2psLineJoin]) 1823 LIBS="$GL2PS_LIBS $LIBS"
1824 LIBS="$save_LIBS" 1824 AC_CHECK_FUNCS([gl2psLineJoin])
1825 fi 1825 LIBS="$save_LIBS"
1826 1826 fi
1827 AC_SUBST(GL2PS_LIBS) 1827
1828 AC_SUBST(GL2PS_LIBS)
1829 fi
1828 1830
1829 ### GUI/Qt related tests. 1831 ### GUI/Qt related tests.
1830 1832
1831 QT_VERSIONS="5" 1833 QT_VERSIONS="5"
1832 1834
2577 [if test "$enableval" = no; then 2579 [if test "$enableval" = no; then
2578 ENABLE_DOCS=no 2580 ENABLE_DOCS=no
2579 warn_docs="building documentation disabled; make dist will fail." 2581 warn_docs="building documentation disabled; make dist will fail."
2580 OCTAVE_CONFIGURE_WARNING([warn_docs]) 2582 OCTAVE_CONFIGURE_WARNING([warn_docs])
2581 fi], []) 2583 fi], [])
2584
2582 if test $ENABLE_DOCS = yes; then 2585 if test $ENABLE_DOCS = yes; then
2583 if test $opengl_graphics = no || test "$have_qt_opengl_offscreen" = no; then 2586 if test $opengl_graphics = no || test "$have_qt_opengl_offscreen" = no; then
2584 if test -n "$warn_gnuplot"; then 2587 if test -n "$warn_gnuplot"; then
2585 ENABLE_DOCS=no 2588 ENABLE_DOCS=no
2586 warn_docs_graphics="building documentation disabled because no suitable graphics toolkit is available; make dist will fail." 2589 warn_docs_graphics="building documentation disabled because no suitable graphics toolkit is available; make dist will fail."
2595 fi 2598 fi
2596 if test $ENABLE_DOCS = yes; then 2599 if test $ENABLE_DOCS = yes; then
2597 AC_DEFINE(ENABLE_DOCS, 1, 2600 AC_DEFINE(ENABLE_DOCS, 1,
2598 [Define to 1 to build Octave documentation files.]) 2601 [Define to 1 to build Octave documentation files.])
2599 fi 2602 fi
2603
2600 AM_CONDITIONAL([AMCOND_BUILD_DOCS], [test $ENABLE_DOCS = yes]) 2604 AM_CONDITIONAL([AMCOND_BUILD_DOCS], [test $ENABLE_DOCS = yes])
2601 2605
2602 AM_CONDITIONAL([AMCOND_BUILD_QT_DOCS], 2606 AM_CONDITIONAL([AMCOND_BUILD_QT_DOCS],
2603 [test $ENABLE_DOCS = yes && test $build_qt_gui = yes]) 2607 [test $ENABLE_DOCS = yes && test $build_qt_gui = yes])
2604 2608