Mercurial > octave

comparison configure.ac @ 28359:75c87b15bcee

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
configure.ac: Move check for gl2ps to after Qt and OpenGL detection. * configure.ac: The check for glp2s is conditional on $opengl_graphics which is set during the checks for Qt presence and capabilities. Move the check for gl2ps to after Qt and OpenGL detection.
author Markus Mützel <markus.muetzel@gmx.de>
date Sun, 24 May 2020 10:41:11 +0200
parents 4e4baa5ac03c
children d5311ca8f945
comparison
equal deleted inserted replaced
28358:3c5304bbb71e 28359:75c87b15bcee
1807 OCTAVE_CHECK_LIB(fontconfig, fontconfig, 1807 OCTAVE_CHECK_LIB(fontconfig, fontconfig,
1808 [Fontconfig library not found. OpenGL graphics will not be fully functional.], 1808 [Fontconfig library not found. OpenGL graphics will not be fully functional.],
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.
1813
1814 if test $opengl_graphics = yes; then
1815 AC_CHECK_HEADERS([gl2ps.h],
1816 [GL2PS_LIBS="-lgl2ps"],
1817 [warn_gl2ps="gl2ps library not found. Printing of OpenGL graphics will be disabled."])
1818
1819 if test -n "$warn_gl2ps"; then
1820 OCTAVE_CONFIGURE_WARNING([warn_gl2ps])
1821 else
1822 save_LIBS="$LIBS"
1823 LIBS="$GL2PS_LIBS $LIBS"
1824 AC_CHECK_FUNCS([gl2psLineJoin])
1825 LIBS="$save_LIBS"
1826 fi
1827
1828 AC_SUBST(GL2PS_LIBS)
1829 fi
1830
1831 ### GUI/Qt related tests. 1812 ### GUI/Qt related tests.
1832 1813
1833 QT_VERSIONS="5" 1814 QT_VERSIONS="5"
1834 1815
1835 AC_ARG_WITH([qt], 1816 AC_ARG_WITH([qt],
1988 ### Final determination of whether OpenGL graphics can be built 1969 ### Final determination of whether OpenGL graphics can be built
1989 if test $build_qt_graphics = no && test $build_fltk_graphics = no; then 1970 if test $build_qt_graphics = no && test $build_fltk_graphics = no; then
1990 opengl_graphics=no 1971 opengl_graphics=no
1991 else 1972 else
1992 opengl_graphics=yes 1973 opengl_graphics=yes
1974 fi
1975
1976 ## Check for gl2ps which is required for printing with OpenGL graphics.
1977
1978 if test $opengl_graphics = yes; then
1979 AC_CHECK_HEADERS([gl2ps.h],
1980 [GL2PS_LIBS="-lgl2ps"],
1981 [warn_gl2ps="gl2ps library not found. Printing of OpenGL graphics will be disabled."])
1982
1983 if test -n "$warn_gl2ps"; then
1984 OCTAVE_CONFIGURE_WARNING([warn_gl2ps])
1985 else
1986 save_LIBS="$LIBS"
1987 LIBS="$GL2PS_LIBS $LIBS"
1988 AC_CHECK_FUNCS([gl2psLineJoin])
1989 LIBS="$save_LIBS"
1990 fi
1991
1992 AC_SUBST(GL2PS_LIBS)
1993 fi 1993 fi
1994 1994
1995 ### Check for the qrupdate library 1995 ### Check for the qrupdate library
1996 1996
1997 dnl No need to adjust FFLAGS because only link is attempted. 1997 dnl No need to adjust FFLAGS because only link is attempted.