re PR libgcj/32929 (Make FAILURE in 4.3.0 - error: `CXX' has changed since the previous run:)
2007-07-29 H.J. Lu <hongjiu.lu@intel.com> PR libgcj/32929 * aclocal.m4: Regenerated. * configure: Likewise. From-SVN: r127038
This commit is contained in:
parent
4cb3c8fcb8
commit
7fd1de41de
3 changed files with 37 additions and 6413 deletions
|
@ -1,3 +1,9 @@
|
|||
2007-07-29 H.J. Lu <hongjiu.lu@intel.com>
|
||||
|
||||
PR libgcj/32929
|
||||
* aclocal.m4: Regenerated.
|
||||
* configure: Likewise.
|
||||
|
||||
2007-07-28 Matthias Klose <doko@ubuntu.com>
|
||||
|
||||
* configure.ac: Encode the libgcj soversion in dbexecdir,
|
||||
|
|
6398
libjava/aclocal.m4
vendored
6398
libjava/aclocal.m4
vendored
File diff suppressed because it is too large
Load diff
46
libjava/configure
vendored
46
libjava/configure
vendored
|
@ -31008,14 +31008,17 @@ if test "$no_create" != yes; then
|
|||
fi
|
||||
|
||||
#
|
||||
# CONFIG_SUBDIRS section.
|
||||
# CONFIG_SUBDIRS section, as fixed in confsubdir.m4.
|
||||
#
|
||||
if test "$no_recursion" != yes; then
|
||||
|
||||
# Remove --cache-file and --srcdir arguments so they do not pile up.
|
||||
ac_sub_configure_args=
|
||||
ac_prev=
|
||||
for ac_arg in $ac_configure_args; do
|
||||
eval "set x $ac_configure_args"
|
||||
shift
|
||||
for ac_arg
|
||||
do
|
||||
if test -n "$ac_prev"; then
|
||||
ac_prev=
|
||||
continue
|
||||
|
@ -31038,20 +31041,28 @@ if test "$no_recursion" != yes; then
|
|||
ac_prev=prefix ;;
|
||||
-prefix=* | --prefix=* | --prefi=* | --pref=* | --pre=* | --pr=* | --p=*)
|
||||
;;
|
||||
*) ac_sub_configure_args="$ac_sub_configure_args $ac_arg" ;;
|
||||
*)
|
||||
case $ac_arg in
|
||||
*\'*) ac_arg=`echo "$ac_arg" | sed "s/'/'\\\\\\\\''/g"` ;;
|
||||
esac
|
||||
ac_sub_configure_args="$ac_sub_configure_args '$ac_arg'" ;;
|
||||
esac
|
||||
done
|
||||
|
||||
# Always prepend --prefix to ensure using the same prefix
|
||||
# in subdir configurations.
|
||||
ac_sub_configure_args="--prefix=$prefix $ac_sub_configure_args"
|
||||
ac_arg="--prefix=$prefix"
|
||||
case $ac_arg in
|
||||
*\'*) ac_arg=`echo "$ac_arg" | sed "s/'/'\\\\\\\\''/g"` ;;
|
||||
esac
|
||||
ac_sub_configure_args="$ac_arg $ac_sub_configure_args"
|
||||
|
||||
ac_popdir=`pwd`
|
||||
for ac_dir in : $subdirs; do test "x$ac_dir" = x: && continue
|
||||
|
||||
# Do not complain, so a configure script can configure whichever
|
||||
# parts of a large source tree are present.
|
||||
test -d $srcdir/$ac_dir || continue
|
||||
test -d "$srcdir/$ac_dir" || continue
|
||||
|
||||
{ echo "$as_me:$LINENO: configuring in $ac_dir" >&5
|
||||
echo "$as_me: configuring in $ac_dir" >&6;}
|
||||
|
@ -31146,15 +31157,16 @@ case $ac_abs_builddir in
|
|||
esac
|
||||
|
||||
|
||||
cd $ac_dir
|
||||
cd "$ac_dir"
|
||||
|
||||
# Check for guested configure; otherwise get Cygnus style configure.
|
||||
if test -f $ac_srcdir/configure.gnu; then
|
||||
ac_sub_configure="$SHELL '$ac_srcdir/configure.gnu'"
|
||||
elif test -f $ac_srcdir/configure; then
|
||||
ac_sub_configure="$SHELL '$ac_srcdir/configure'"
|
||||
elif test -f $ac_srcdir/configure.in; then
|
||||
ac_sub_configure=$ac_configure
|
||||
if test -f "$ac_srcdir/configure.gnu"; then
|
||||
ac_sub_configure=$ac_srcdir/configure.gnu
|
||||
elif test -f "$ac_srcdir/configure"; then
|
||||
ac_sub_configure=$ac_srcdir/configure
|
||||
elif test -f "$ac_srcdir/configure.in"; then
|
||||
# This should be Cygnus configure.
|
||||
ac_sub_configure=$ac_aux_dir/configure
|
||||
else
|
||||
{ echo "$as_me:$LINENO: WARNING: no configuration information is in $ac_dir" >&5
|
||||
echo "$as_me: WARNING: no configuration information is in $ac_dir" >&2;}
|
||||
|
@ -31170,17 +31182,17 @@ echo "$as_me: WARNING: no configuration information is in $ac_dir" >&2;}
|
|||
ac_sub_cache_file=$ac_top_builddir$cache_file ;;
|
||||
esac
|
||||
|
||||
{ echo "$as_me:$LINENO: running $ac_sub_configure $ac_sub_configure_args --cache-file=$ac_sub_cache_file --srcdir=$ac_srcdir" >&5
|
||||
echo "$as_me: running $ac_sub_configure $ac_sub_configure_args --cache-file=$ac_sub_cache_file --srcdir=$ac_srcdir" >&6;}
|
||||
{ echo "$as_me:$LINENO: running $SHELL $ac_sub_configure $ac_sub_configure_args --cache-file=$ac_sub_cache_file --srcdir=$ac_srcdir" >&5
|
||||
echo "$as_me: running $SHELL $ac_sub_configure $ac_sub_configure_args --cache-file=$ac_sub_cache_file --srcdir=$ac_srcdir" >&6;}
|
||||
# The eval makes quoting arguments work.
|
||||
eval $ac_sub_configure $ac_sub_configure_args \
|
||||
--cache-file=$ac_sub_cache_file --srcdir=$ac_srcdir ||
|
||||
eval "\$SHELL \"\$ac_sub_configure\" $ac_sub_configure_args \
|
||||
--cache-file=\"\$ac_sub_cache_file\" --srcdir=\"\$ac_srcdir\"" ||
|
||||
{ { echo "$as_me:$LINENO: error: $ac_sub_configure failed for $ac_dir" >&5
|
||||
echo "$as_me: error: $ac_sub_configure failed for $ac_dir" >&2;}
|
||||
{ (exit 1); exit 1; }; }
|
||||
fi
|
||||
|
||||
cd $ac_popdir
|
||||
cd "$ac_popdir"
|
||||
done
|
||||
fi
|
||||
|
||||
|
|
Loading…
Add table
Reference in a new issue