changeset in /hg/icedtea: 2008-03-31 Lillian Angel <langel at red...
Lillian Angel
langel at redhat.com
Thu May 29 14:12:46 PDT 2008
changeset 40005c2a6281 in /hg/icedtea
details: http://icedtea.classpath.org/hg/icedtea?cmd=changeset;node=40005c2a6281
description:
2008-03-31 Lillian Angel <langel at redhat.com>
* configure.ac: Added checks for file and cpio.
* configure: Likewise.
diffstat:
3 files changed, 230 insertions(+), 1 deletion(-)
ChangeLog | 5 +
configure | 224 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++-
configure.ac | 2
diffs (279 lines):
diff -r 9bf416fd51f8 -r 40005c2a6281 ChangeLog
--- a/ChangeLog Fri Mar 28 10:05:26 2008 -0400
+++ b/ChangeLog Mon Mar 31 09:48:41 2008 -0400
@@ -1,3 +1,8 @@ 2008-03-28 Gary Benson <gbenson at redhat
+2008-03-31 Lillian Angel <langel at redhat.com>
+
+ * configure.ac: Added checks for file and cpio.
+ * configure: Likewise.
+
2008-03-28 Gary Benson <gbenson at redhat.com>
* configure.ac: Check for libffi for zero builds only.
diff -r 9bf416fd51f8 -r 40005c2a6281 configure
--- a/configure Fri Mar 28 10:05:26 2008 -0400
+++ b/configure Mon Mar 31 09:48:41 2008 -0400
@@ -712,6 +712,8 @@ WGET
WGET
ZIP
UNZIP
+CPIO
+FILE
FASTJAR
ac_ct_FASTJAR
GAWK
@@ -5015,6 +5017,224 @@ echo "$as_me: error: unzip program not f
if test -n "$ac_tool_prefix"; then
+ # Extract the first word of "${ac_tool_prefix}cpio", so it can be a program name with args.
+set dummy ${ac_tool_prefix}cpio; 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_path_CPIO+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+ case $CPIO in
+ [\\/]* | ?:[\\/]*)
+ ac_cv_path_CPIO="$CPIO" # Let the user override the test with a path.
+ ;;
+ *)
+ 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 { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+ ac_cv_path_CPIO="$as_dir/$ac_word$ac_exec_ext"
+ echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+ break 2
+ fi
+done
+done
+IFS=$as_save_IFS
+
+ ;;
+esac
+fi
+CPIO=$ac_cv_path_CPIO
+if test -n "$CPIO"; then
+ { echo "$as_me:$LINENO: result: $CPIO" >&5
+echo "${ECHO_T}$CPIO" >&6; }
+else
+ { echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6; }
+fi
+
+
+fi
+if test -z "$ac_cv_path_CPIO"; then
+ ac_pt_CPIO=$CPIO
+ # Extract the first word of "cpio", so it can be a program name with args.
+set dummy cpio; 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_path_ac_pt_CPIO+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+ case $ac_pt_CPIO in
+ [\\/]* | ?:[\\/]*)
+ ac_cv_path_ac_pt_CPIO="$ac_pt_CPIO" # Let the user override the test with a path.
+ ;;
+ *)
+ 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 { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+ ac_cv_path_ac_pt_CPIO="$as_dir/$ac_word$ac_exec_ext"
+ echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+ break 2
+ fi
+done
+done
+IFS=$as_save_IFS
+
+ ;;
+esac
+fi
+ac_pt_CPIO=$ac_cv_path_ac_pt_CPIO
+if test -n "$ac_pt_CPIO"; then
+ { echo "$as_me:$LINENO: result: $ac_pt_CPIO" >&5
+echo "${ECHO_T}$ac_pt_CPIO" >&6; }
+else
+ { echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6; }
+fi
+
+ if test "x$ac_pt_CPIO" = x; then
+ CPIO=""
+ else
+ case $cross_compiling:$ac_tool_warned in
+yes:)
+{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools
+whose name does not start with the host triplet. If you think this
+configuration is useful to you, please write to autoconf at gnu.org." >&5
+echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools
+whose name does not start with the host triplet. If you think this
+configuration is useful to you, please write to autoconf at gnu.org." >&2;}
+ac_tool_warned=yes ;;
+esac
+ CPIO=$ac_pt_CPIO
+ fi
+else
+ CPIO="$ac_cv_path_CPIO"
+fi
+
+ if test x"$CPIO" = x ; then
+ { { echo "$as_me:$LINENO: error: cpio program not found in PATH" >&5
+echo "$as_me: error: cpio program not found in PATH" >&2;}
+ { (exit 1); exit 1; }; }
+ fi
+
+
+if test -n "$ac_tool_prefix"; then
+ # Extract the first word of "${ac_tool_prefix}file", so it can be a program name with args.
+set dummy ${ac_tool_prefix}file; 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_path_FILE+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+ case $FILE in
+ [\\/]* | ?:[\\/]*)
+ ac_cv_path_FILE="$FILE" # Let the user override the test with a path.
+ ;;
+ *)
+ 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 { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+ ac_cv_path_FILE="$as_dir/$ac_word$ac_exec_ext"
+ echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+ break 2
+ fi
+done
+done
+IFS=$as_save_IFS
+
+ ;;
+esac
+fi
+FILE=$ac_cv_path_FILE
+if test -n "$FILE"; then
+ { echo "$as_me:$LINENO: result: $FILE" >&5
+echo "${ECHO_T}$FILE" >&6; }
+else
+ { echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6; }
+fi
+
+
+fi
+if test -z "$ac_cv_path_FILE"; then
+ ac_pt_FILE=$FILE
+ # Extract the first word of "file", so it can be a program name with args.
+set dummy file; 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_path_ac_pt_FILE+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+ case $ac_pt_FILE in
+ [\\/]* | ?:[\\/]*)
+ ac_cv_path_ac_pt_FILE="$ac_pt_FILE" # Let the user override the test with a path.
+ ;;
+ *)
+ 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 { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+ ac_cv_path_ac_pt_FILE="$as_dir/$ac_word$ac_exec_ext"
+ echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+ break 2
+ fi
+done
+done
+IFS=$as_save_IFS
+
+ ;;
+esac
+fi
+ac_pt_FILE=$ac_cv_path_ac_pt_FILE
+if test -n "$ac_pt_FILE"; then
+ { echo "$as_me:$LINENO: result: $ac_pt_FILE" >&5
+echo "${ECHO_T}$ac_pt_FILE" >&6; }
+else
+ { echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6; }
+fi
+
+ if test "x$ac_pt_FILE" = x; then
+ FILE=""
+ else
+ case $cross_compiling:$ac_tool_warned in
+yes:)
+{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools
+whose name does not start with the host triplet. If you think this
+configuration is useful to you, please write to autoconf at gnu.org." >&5
+echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools
+whose name does not start with the host triplet. If you think this
+configuration is useful to you, please write to autoconf at gnu.org." >&2;}
+ac_tool_warned=yes ;;
+esac
+ FILE=$ac_pt_FILE
+ fi
+else
+ FILE="$ac_cv_path_FILE"
+fi
+
+ if test x"$FILE" = x ; then
+ { { echo "$as_me:$LINENO: error: file program not found in PATH" >&5
+echo "$as_me: error: file program not found in PATH" >&2;}
+ { (exit 1); exit 1; }; }
+ fi
+
+
+if test -n "$ac_tool_prefix"; then
for ac_prog in fastjar jar
do
# Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.
@@ -12327,6 +12547,8 @@ ac_delim='%!_!# '
ac_delim='%!_!# '
for ac_last_try in false false false false false :; do
cat >conf$$subs.sed <<_ACEOF
+CPIO!$CPIO$ac_delim
+FILE!$FILE$ac_delim
FASTJAR!$FASTJAR$ac_delim
ac_ct_FASTJAR!$ac_ct_FASTJAR$ac_delim
GAWK!$GAWK$ac_delim
@@ -12410,7 +12632,7 @@ LTLIBOBJS!$LTLIBOBJS$ac_delim
LTLIBOBJS!$LTLIBOBJS$ac_delim
_ACEOF
- if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 81; then
+ if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 83; then
break
elif $ac_last_try; then
{ { echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5
diff -r 9bf416fd51f8 -r 40005c2a6281 configure.ac
--- a/configure.ac Fri Mar 28 10:05:26 2008 -0400
+++ b/configure.ac Mon Mar 31 09:48:41 2008 -0400
@@ -17,6 +17,8 @@ FIND_TOOL([WGET], [wget])
FIND_TOOL([WGET], [wget])
FIND_TOOL([ZIP], [zip])
FIND_TOOL([UNZIP], [unzip])
+FIND_TOOL([CPIO], [cpio])
+FIND_TOOL([FILE], [file])
AC_CHECK_TOOLS([FASTJAR], [fastjar jar])
if test "x$FASTJAR" = x; then
AC_MSG_ERROR([Can't find fastjar or jar])
More information about the distro-pkg-dev
mailing list