# HG changeset patch
# User Rik <rik@octave.org>
# Date 1389722703 28800
# Node ID ec975e8267288372e957d5b81c8185b504492ba3
# Parent  0ab9c475300a0e19b02b4f9871564adf91dc6694
configure.ac: Respect --with-java-includedir argument (bug #41230)

* configure.ac: Respect --with-java-includedir argument (bug #41230)

diff -r 0ab9c475300a -r ec975e826728 configure.ac
--- a/configure.ac	Tue Jan 14 09:52:03 2014 -0800
+++ b/configure.ac	Tue Jan 14 10:05:03 2014 -0800
@@ -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