Mercurial > octave-nkf

comparison configure.ac @ 18069:76006571e45a

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
maint: Periodic merge of stable to default.
author Rik <rik@octave.org>
date Tue, 03 Dec 2013 16:06:46 -0800
parents 23f680301f65 37a5e93d6cfd
children a1e4282f5254
comparison
equal deleted inserted replaced
18068:23f680301f65 18069:76006571e45a
1242 1242
1243 ## Check for gl2ps which is required for printing with OpenGL graphics 1243 ## Check for gl2ps which is required for printing with OpenGL graphics
1244 if test $native_graphics = yes; then 1244 if test $native_graphics = yes; then
1245 AC_CHECK_HEADERS([gl2ps.h], 1245 AC_CHECK_HEADERS([gl2ps.h],
1246 [GL2PS_LIBS="-lgl2ps"], 1246 [GL2PS_LIBS="-lgl2ps"],
1247 [AC_MSG_WARN([gl2ps library not found. OpenGL printing is disabled.])]) 1247 [warn_gl2ps="gl2ps library not found. OpenGL printing is disabled."
1248 OCTAVE_CONFIGURE_WARNING([warn_gl2ps])])
1248 fi 1249 fi
1249 1250
1250 AC_SUBST(GL2PS_LIBS) 1251 AC_SUBST(GL2PS_LIBS)
1251 1252
1252 ### Start determination of shared vs. static libraries 1253 ### Start determination of shared vs. static libraries
2489 2490
2490 AC_PATH_PROG(JAVAC, javac, [], [$JAVA_PATH]) 2491 AC_PATH_PROG(JAVAC, javac, [], [$JAVA_PATH])
2491 AC_PATH_PROG(JAR, jar, [], [$JAVA_PATH]) 2492 AC_PATH_PROG(JAR, jar, [], [$JAVA_PATH])
2492 2493
2493 if test -z "$JAVAC" || test -z "$JAR"; then 2494 if test -z "$JAVAC" || test -z "$JAR"; then
2494 AC_MSG_WARN([No javac compiler or jar executable found. Octave will not be able to call Java methods.]) 2495 warn_java="No javac compiler or jar executable found. Octave will not be able to call Java methods."
2495 break 2496 break
2496 fi 2497 fi
2497 2498
2498 ## Check Java version is recent enough. 2499 ## Check Java version is recent enough.
2499 AC_MSG_CHECKING([for Java version]) 2500 AC_MSG_CHECKING([for Java version])