Mercurial > hg > octave-nkf
changeset 18298:ec975e826728 stable
configure.ac: Respect --with-java-includedir argument (bug #41230)
* configure.ac: Respect --with-java-includedir argument (bug #41230)
author | Rik <rik@octave.org> |
---|---|
date | Tue, 14 Jan 2014 10:05:03 -0800 |
parents | 0ab9c475300a |
children | e243b705a726 |
files | configure.ac |
diffstat | 1 files changed, 2 insertions(+), 2 deletions(-) [+] |
line wrap: on
line diff
--- a/configure.ac +++ b/configure.ac @@ -2563,7 +2563,7 @@ JAVA_LIBS=-ladvapi32 if test $have_msvc = no; then if test -n "$JAVA_CPPFLAGS"; then - JAVA_CPPFLAGS="-I${JAVA_CPPFLAGS}/include -I${JAVA_CPPFLAGS}/include/win32" + JAVA_CPPFLAGS="-I${JAVA_CPPFLAGS} -I${JAVA_CPPFLAGS}/win32" else JAVA_CPPFLAGS="-I${JAVA_HOME}/include -I${JAVA_HOME}/include/win32" fi @@ -2663,7 +2663,7 @@ ;; *) if test -n "$JAVA_CPPFLAGS"; then - JAVA_CPPFLAGS="-I${JAVA_CPPFLAGS}/include -I${JAVA_CPPFLAGS}/include/linux" + JAVA_CPPFLAGS="-I${JAVA_CPPFLAGS} -I${JAVA_CPPFLAGS}/linux" else JAVA_CPPFLAGS="-I${JAVA_HOME}/include -I${JAVA_HOME}/include/linux" fi