diff --git a/ase/configure b/ase/configure index cecd6ad5..cb96a2e0 100755 --- a/ase/configure +++ b/ase/configure @@ -1,5 +1,5 @@ #! /bin/sh -# From configure.ac Revision: 1.87 . +# From configure.ac Revision: 1.4 . # Guess values for system-dependent variables and create Makefiles. # Generated by GNU Autoconf 2.59 for ase deb-0.1.0. # @@ -25847,11 +25847,42 @@ echo $ECHO_N "checking symlink for $CUR_JAVAC_PATH... $ECHO_C" >&6 echo "${ECHO_T}$CUR_JAVAC_PATH" >&6 done + # check if the javavm wrapper is in use + case "$REAL_JAVAC_PATH" in + */javavm) + JAVA_DIR="$REAL_JAVAC_PATH" + while true + do + JAVA_DIR=`echo "$JAVA_DIR" | sed -e 's/\/\/*/\//g' -e 's/\/^/*$//'` + if test "$JAVA_DIR" = "" + then + break + fi + + echo "$as_me:$LINENO: checking $JAVA_DIR/etc/javavms" >&5 +echo $ECHO_N "checking $JAVA_DIR/etc/javavms... $ECHO_C" >&6 + if test -f "$JAVA_DIR/etc/javavms" + then + echo "$as_me:$LINENO: result: yes" >&5 +echo "${ECHO_T}yes" >&6 + # takes the first jvm configured + CUR_JAVAC_PATH=`cat $JAVA_DIR/etc/javavms | head -1` + echo "$as_me:$LINENO: result: $CUR_JAVAC_PATH" >&5 +echo "${ECHO_T}$CUR_JAVAC_PATH" >&6 + break; + else + echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6 + fi + done + ;; + esac + JAVA_DIR="$CUR_JAVAC_PATH" while true do - JAVA_DIR=`echo "$JAVA_DIR" | sed -e 's://*:/:g' -e 's:/[^/]*$::'` + JAVA_DIR=`echo "$JAVA_DIR" | sed -e 's/\/\/*/\//g' -e 's/\/^/*$//'` if test "$JAVA_DIR" = "" then break @@ -25876,7 +25907,7 @@ echo "${ECHO_T}no" >&6 JNI_MD_H=`find "$i" -name jni_md.h -print` if test "$JNI_MD_H" != "" then - tmp=`echo "$JNI_MD_H" | sed -e 's://*:/:g' -e 's:/[^/]*$::'` + tmp=`echo "$JNI_MD_H" | sed -e 's/\/\/*/\//g' -e 's/\/^/*$//'` JNI_MD_INCLUDE_DIRS="$JNI_MD_INCLUDE_DIRS $tmp" fi done