Mercurial > octave-nkf

comparison configure.ac @ 15780:f25101b1e37f

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
configure.ac: Use build_java as internal script variable rather than HAVE_JAVA. * configure.ac: Use build_java as internal script variable rather than HAVE_JAVA.
author Rik <rik@octave.org>
date Thu, 13 Dec 2012 10:47:24 -0800
parents 4456ad3d8a56
children f366e9948259
comparison
equal deleted inserted replaced
15779:4456ad3d8a56 15780:f25101b1e37f
2217 AC_ARG_WITH([java-libdir], 2217 AC_ARG_WITH([java-libdir],
2218 [AS_HELP_STRING([--with-java-libdir=DIR], 2218 [AS_HELP_STRING([--with-java-libdir=DIR],
2219 [look for java library libjvm in DIR])], 2219 [look for java library libjvm in DIR])],
2220 [JAVA_LDPATH="$withval"], [JAVA_LDPATH=""]) 2220 [JAVA_LDPATH="$withval"], [JAVA_LDPATH=""])
2221 2221
2222 HAVE_JAVA=no
2223 ## Grab JAVA_HOME from environment variable if it exists 2222 ## Grab JAVA_HOME from environment variable if it exists
2224 AC_ARG_VAR([JAVA_HOME], [path to Java JDK installation]) 2223 AC_ARG_VAR([JAVA_HOME], [path to Java JDK installation])
2225 ## But --with-java-homedir option overrides environment variable 2224 ## But --with-java-homedir option overrides environment variable
2226 if test -n "$JAVA_HOMEDIR"; then 2225 if test -n "$JAVA_HOMEDIR"; then
2227 JAVA_HOME=$JAVA_HOMEDIR 2226 JAVA_HOME=$JAVA_HOMEDIR
2229 JAVA= 2228 JAVA=
2230 JAVAC= 2229 JAVAC=
2231 JAR= 2230 JAR=
2232 JAVA_LIBS= 2231 JAVA_LIBS=
2233 2232
2234 ## Fake loop so that "break" can be used to skip code blocks 2233 ## Fake loop so that "break" can be used to skip code blocks.
2235 while test $build_java = true 2234 while test $build_java = true
2236 do 2235 do
2236 ## Unset build_java. Variable is set only if all configuration tests pass.
2237 build_java=false
2238
2237 ## Warn if JAVA_HOME is unset. It is *strongly* advised to specify JAVA_HOME. 2239 ## Warn if JAVA_HOME is unset. It is *strongly* advised to specify JAVA_HOME.
2238 if test -z "$JAVA_HOME"; then 2240 if test -z "$JAVA_HOME"; then
2239 AC_MSG_WARN([JAVA_HOME environment variable not initialized.]) 2241 AC_MSG_WARN([JAVA_HOME environment variable not initialized.])
2240 AC_MSG_WARN([Auto-detection will proceed but is unreliable.]) 2242 AC_MSG_WARN([Auto-detection will proceed but is unreliable.])
2241 fi 2243 fi
2242 2244
2243 ## Search for a viable Java executable 2245 ## Search for a viable Java executable.
2244 if test -z "$JAVA_HOME"; then 2246 if test -z "$JAVA_HOME"; then
2245 JAVA_PATH=$PATH 2247 JAVA_PATH=$PATH
2246 else 2248 else
2247 JAVA_PATH=${JAVA_HOME}$PATH_SEPARATOR${JAVA_HOME}/jre/bin$PATH_SEPARATOR${JAVA_HOME}/bin$PATH_SEPARATOR${JAVA_HOME}/../bin$PATH_SEPARATOR${PATH} 2249 JAVA_PATH=${JAVA_HOME}$PATH_SEPARATOR${JAVA_HOME}/jre/bin$PATH_SEPARATOR${JAVA_HOME}/bin$PATH_SEPARATOR${JAVA_HOME}/../bin$PATH_SEPARATOR${PATH}
2248 fi 2250 fi
2252 AC_MSG_WARN([No Java executable found. Octave will not be able to call Java methods.]) 2254 AC_MSG_WARN([No Java executable found. Octave will not be able to call Java methods.])
2253 break 2255 break
2254 fi 2256 fi
2255 2257
2256 if test -z "$JAVA_HOME"; then 2258 if test -z "$JAVA_HOME"; then
2257 ## Find JAVA_HOME for JRE by running java and querying properties 2259 ## Find JAVA_HOME for JRE by running java and querying properties.
2258 JAVA_TMP_HOME=`$JAVA -classpath ${srcdir}/build-aux OctJavaQry JAVA_HOME` 2260 JAVA_TMP_HOME=`$JAVA -classpath ${srcdir}/build-aux OctJavaQry JAVA_HOME`
2259 ## Strip directory back to top-level installation dir (JAVA_HOME for JDK) 2261 ## Strip directory back to top-level installation dir (JAVA_HOME for JDK).
2260 JAVA_HOME=`echo $JAVA_TMP_HOME | sed -e 's|/bin/\?$||' | sed -e 's|/jre/\?$||'` 2262 JAVA_HOME=`echo $JAVA_TMP_HOME | sed -e 's|/bin/\?$||' | sed -e 's|/jre/\?$||'`
2261 fi 2263 fi
2262 2264
2263 ## Amend search path for JAVAC and JAR. 2265 ## Amend search path for JAVAC and JAR.
2264 if test -z JAVA_HOME; then 2266 if test -z JAVA_HOME; then
2289 fi 2291 fi
2290 2292
2291 ## At this point Win32 systems have enough configuration data. 2293 ## At this point Win32 systems have enough configuration data.
2292 case $canonical_host_type in 2294 case $canonical_host_type in
2293 *-msdosmsvc*) 2295 *-msdosmsvc*)
2294 HAVE_JAVA=yes 2296 build_java=true
2295 JAVA_LIBS=-ladvapi32 2297 JAVA_LIBS=-ladvapi32
2296 AC_DEFINE(HAVE_JAVA, 1, 2298 AC_DEFINE(HAVE_JAVA, 1,
2297 [Define to 1 if Java is available and is at least version 1.5]) 2299 [Define to 1 if Java is available and is at least version 1.5])
2298 break 2300 break
2299 ;; 2301 ;;
2418 AC_MSG_WARN([Include file <jni.h> not found. Octave will not be able to call Java methods.]) 2420 AC_MSG_WARN([Include file <jni.h> not found. Octave will not be able to call Java methods.])
2419 break 2421 break
2420 fi 2422 fi
2421 2423
2422 ## Passed all configuration tests. A workable Java installation was found. 2424 ## Passed all configuration tests. A workable Java installation was found.
2423 HAVE_JAVA=yes 2425 build_java=true
2424 AC_DEFINE(HAVE_JAVA, 1, 2426 AC_DEFINE(HAVE_JAVA, 1,
2425 [Define to 1 if Java is available and is at least version 1.5]) 2427 [Define to 1 if Java is available and is at least version 1.5])
2426 break 2428 break
2427 done 2429 done
2428 2430
2429 ## For later reporting in configure summary 2431 AM_CONDITIONAL([AMCOND_HAVE_JAVA], [test $build_java = true])
2430 if test $HAVE_JAVA = no; then
2431 build_java=false
2432 fi
2433 AM_CONDITIONAL([AMCOND_HAVE_JAVA], [test $HAVE_JAVA = yes])
2434 AC_SUBST(JAVA) 2432 AC_SUBST(JAVA)
2435 AC_SUBST(JAVAC) 2433 AC_SUBST(JAVAC)
2436 AC_SUBST(JAR) 2434 AC_SUBST(JAR)
2437 AC_SUBST(JAVA_CPPFLAGS) 2435 AC_SUBST(JAVA_CPPFLAGS)
2438 AC_SUBST(JAVA_LIBS) 2436 AC_SUBST(JAVA_LIBS)