[llvm-commits] CVS: llvm-java/configure
Alkis Evlogimenos
alkis at cs.uiuc.edu
Tue Dec 7 22:38:38 PST 2004
Changes in directory llvm-java:
configure updated: 1.8 -> 1.9
---
Log message:
Regenate configure
---
Diffs of the changes: (+65 -17)
Index: llvm-java/configure
diff -u llvm-java/configure:1.8 llvm-java/configure:1.9
--- llvm-java/configure:1.8 Wed Dec 8 00:33:46 2004
+++ llvm-java/configure Wed Dec 8 00:38:19 2004
@@ -274,7 +274,7 @@
PACKAGE_BUGREPORT='llvmbugs at cs.uiuc.edu'
ac_unique_file="Makefile.common.in"
-ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS JAVAC JAVA LLVM_SRC LLVM_OBJ LIBOBJS LTLIBOBJS'
+ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS JAVA JAVAC JAVAH LLVM_SRC LLVM_OBJ LIBOBJS LTLIBOBJS'
ac_subst_files=''
# Initialize some variables set by options.
@@ -715,14 +715,18 @@
ac_env_target_alias_value=$target_alias
ac_cv_env_target_alias_set=${target_alias+set}
ac_cv_env_target_alias_value=$target_alias
-ac_env_JAVAC_set=${JAVAC+set}
-ac_env_JAVAC_value=$JAVAC
-ac_cv_env_JAVAC_set=${JAVAC+set}
-ac_cv_env_JAVAC_value=$JAVAC
ac_env_JAVA_set=${JAVA+set}
ac_env_JAVA_value=$JAVA
ac_cv_env_JAVA_set=${JAVA+set}
ac_cv_env_JAVA_value=$JAVA
+ac_env_JAVAC_set=${JAVAC+set}
+ac_env_JAVAC_value=$JAVAC
+ac_cv_env_JAVAC_set=${JAVAC+set}
+ac_cv_env_JAVAC_value=$JAVAC
+ac_env_JAVAH_set=${JAVAH+set}
+ac_env_JAVAH_value=$JAVAH
+ac_cv_env_JAVAH_set=${JAVAH+set}
+ac_cv_env_JAVAH_value=$JAVAH
#
# Report the --help message.
@@ -799,8 +803,9 @@
--with-llvmobj Location of LLVM Object Code
Some influential environment variables:
- JAVAC The java compiler (used for testing)
JAVA The Java Virtual Machine (used for testing)
+ JAVAC The java compiler (used for testing)
+ JAVAH The java JNI header generator (used for testing)
Use these variables to override the choices made by `configure' or to help
it to find libraries and programs with nonstandard names/locations.
@@ -1325,6 +1330,42 @@
+# Extract the first word of "java", so it can be a program name with args.
+set dummy java; ac_word=$2
+echo "$as_me:$LINENO: checking for $ac_word" >&5
+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
+if test "${ac_cv_prog_JAVA+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+ if test -n "$JAVA"; then
+ ac_cv_prog_JAVA="$JAVA" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+ IFS=$as_save_IFS
+ test -z "$as_dir" && as_dir=.
+ for ac_exec_ext in '' $ac_executable_extensions; do
+ if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+ ac_cv_prog_JAVA="java"
+ echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+ break 2
+ fi
+done
+done
+
+fi
+fi
+JAVA=$ac_cv_prog_JAVA
+if test -n "$JAVA"; then
+ echo "$as_me:$LINENO: result: $JAVA" >&5
+echo "${ECHO_T}$JAVA" >&6
+else
+ echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6
+fi
+
+
# Extract the first word of "javac", so it can be a program name with args.
set dummy javac; ac_word=$2
echo "$as_me:$LINENO: checking for $ac_word" >&5
@@ -1361,15 +1402,15 @@
fi
-# Extract the first word of "java", so it can be a program name with args.
-set dummy java; ac_word=$2
+# Extract the first word of "javah", so it can be a program name with args.
+set dummy javah; ac_word=$2
echo "$as_me:$LINENO: checking for $ac_word" >&5
echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
-if test "${ac_cv_prog_JAVA+set}" = set; then
+if test "${ac_cv_prog_JAVAH+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
- if test -n "$JAVA"; then
- ac_cv_prog_JAVA="$JAVA" # Let the user override the test.
+ if test -n "$JAVAH"; then
+ ac_cv_prog_JAVAH="$JAVAH" # Let the user override the test.
else
as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
for as_dir in $PATH
@@ -1378,7 +1419,7 @@
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
- ac_cv_prog_JAVA="java"
+ ac_cv_prog_JAVAH="javah"
echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
fi
@@ -1387,10 +1428,10 @@
fi
fi
-JAVA=$ac_cv_prog_JAVA
-if test -n "$JAVA"; then
- echo "$as_me:$LINENO: result: $JAVA" >&5
-echo "${ECHO_T}$JAVA" >&6
+JAVAH=$ac_cv_prog_JAVAH
+if test -n "$JAVAH"; then
+ echo "$as_me:$LINENO: result: $JAVAH" >&5
+echo "${ECHO_T}$JAVAH" >&6
else
echo "$as_me:$LINENO: result: no" >&5
echo "${ECHO_T}no" >&6
@@ -1409,6 +1450,12 @@
echo "$as_me: WARNING: A Java compiler is required for the test suite, but it was not found" >&2;}
fi
+if test -z "$JAVAC"
+then
+ { echo "$as_me:$LINENO: WARNING: A Java JNI header generator is required for the test suite, but it was not found" >&5
+echo "$as_me: WARNING: A Java JNI header generator is required for the test suite, but it was not found" >&2;}
+fi
+
@@ -2109,8 +2156,9 @@
s, at ECHO_N@,$ECHO_N,;t t
s, at ECHO_T@,$ECHO_T,;t t
s, at LIBS@,$LIBS,;t t
-s, at JAVAC@,$JAVAC,;t t
s, at JAVA@,$JAVA,;t t
+s, at JAVAC@,$JAVAC,;t t
+s, at JAVAH@,$JAVAH,;t t
s, at LLVM_SRC@,$LLVM_SRC,;t t
s, at LLVM_OBJ@,$LLVM_OBJ,;t t
s, at LIBOBJS@,$LIBOBJS,;t t
More information about the llvm-commits
mailing list