Mercurial > octave

comparison configure.ac @ 18276:508f67c72854 stable

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Fix native MinGW builds with spaces in JAVA_HOME (bug #41024). * configure.ac: Use quotes around JAVA_HOME, JAVA_CPPFLAGS variables on Windows platforms.
author Rik <rik@octave.org>
date Tue, 14 Jan 2014 12:38:25 -0800
parents ec975e826728
children 8d98ebeceab4 ee7f66925267
comparison
equal deleted inserted replaced
18274:e243b705a726 18276:508f67c72854
2561 mingw* | cygwin*) 2561 mingw* | cygwin*)
2562 build_java=yes 2562 build_java=yes
2563 JAVA_LIBS=-ladvapi32 2563 JAVA_LIBS=-ladvapi32
2564 if test $have_msvc = no; then 2564 if test $have_msvc = no; then
2565 if test -n "$JAVA_CPPFLAGS"; then 2565 if test -n "$JAVA_CPPFLAGS"; then
2566 JAVA_CPPFLAGS="-I${JAVA_CPPFLAGS} -I${JAVA_CPPFLAGS}/win32" 2566 JAVA_CPPFLAGS="-I\"${JAVA_CPPFLAGS}\" -I\"${JAVA_CPPFLAGS}/win32\""
2567 else 2567 else
2568 JAVA_CPPFLAGS="-I${JAVA_HOME}/include -I${JAVA_HOME}/include/win32" 2568 JAVA_CPPFLAGS="-I\"${JAVA_HOME}/include\" -I\"${JAVA_HOME}/include/win32\""
2569 fi 2569 fi
2570 LDFLAGS="$LDFLAGS -Wl,--export-all-symbols" 2570 LDFLAGS="$LDFLAGS -Wl,--export-all-symbols"
2571 fi 2571 fi
2572 AC_DEFINE(HAVE_JAVA, 1, 2572 AC_DEFINE(HAVE_JAVA, 1,
2573 [Define to 1 if Java is available and is at least version 1.5]) 2573 [Define to 1 if Java is available and is at least version 1.5])