Mercurial > hg > octave-nkf
diff configure.ac @ 17819:af924e6572cb
build: Don't search path at compile time for jvm on Win32 platforms.
* configure.ac: Don't search path for jvm on Win32 platforms. It is found
through registry at runtime.
| author | Rik <rik@octave.org> |
|---|---|
| date | Thu, 31 Oct 2013 16:38:32 -0700 |
| parents | e6317049225b |
| children | 3488d987eb50 |
line wrap: on
line diff
--- a/configure.ac +++ b/configure.ac @@ -2458,9 +2458,9 @@ break fi - ## At this point Win32/MSVC systems have enough configuration data. We - ## assume that all appropriate variables (e.g. INCLUDE and LIB) already have - ## the required paths to compile and link against JDK. + ## At this point Win32 systems have enough configuration data. + ## We assume that all appropriate variables (e.g. INCLUDE and LIB) already + ## contain the required paths to compile and link against JDK. case $host_os in msdosmsvc) build_java=yes @@ -2469,14 +2469,20 @@ [Define to 1 if Java is available and is at least version 1.5]) break ;; - mingw*) - if test $have_msvc = yes; then - build_java=yes - JAVA_LIBS=-ladvapi32 - AC_DEFINE(HAVE_JAVA, 1, - [Define to 1 if Java is available and is at least version 1.5]) - break + mingw* | cygwin*) + build_java=yes + 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" + else + JAVA_CPPFLAGS="-I${JAVA_HOME}/include -I${JAVA_HOME}/include/win32" + fi + LDFLAGS="$LDFLAGS -Wl,--export-all-symbols" fi + AC_DEFINE(HAVE_JAVA, 1, + [Define to 1 if Java is available and is at least version 1.5]) + break ;; esac @@ -2485,9 +2491,6 @@ darwin*) jvmlib=libjvm.dylib ;; - mingw* | cygwin*) - jvmlib=jvm.dll - ;; *) jvmlib=libjvm.so ;; @@ -2569,15 +2572,6 @@ fi JAVA_LIBS="-framework JavaVM" ;; - mingw* | cygwin*) - if test -n "$JAVA_CPPFLAGS"; then - JAVA_CPPFLAGS="-I${JAVA_CPPFLAGS}/include -I${JAVA_CPPFLAGS}/include/win32" - else - JAVA_CPPFLAGS="-I${JAVA_HOME}/include -I${JAVA_HOME}/include/win32" - fi - JAVA_LIBS=-ladvapi32 - LDFLAGS="$LDFLAGS -Wl,--export-all-symbols" - ;; *) if test -n "$JAVA_CPPFLAGS"; then JAVA_CPPFLAGS="-I${JAVA_CPPFLAGS}/include -I${JAVA_CPPFLAGS}/include/linux"