Backport from upstream Libtool:
* libltdl.m4 (_LT_SYS_DYNAMIC_LINKER) (_LT_LINKER_SHLIBS): Add cache variables to tests that require the linker to work. For shlibpath_overrides_runpath, this also changes the semantics to let the result from the C compiler take precedence. boehm-gc/ * configure: Regenerate. fixincludes/ * configure: Regenerate. gcc/ * configure: Regenerate. libffi/ * configure: Regenerate. libgfortran/ * configure: Regenerate. libgomp/ * configure: Regenerate. libjava/classpath/ * configure: Regenerate. libjava/ * configure: Regenerate. libmudflap/ * configure: Regenerate. libobjc/ * configure: Regenerate. libssp/ * configure: Regenerate. libstdc++-v3/ * configure: Regenerate. zlib/ * configure: Regenerate. From-SVN: r142817
This commit is contained in:
committed by
Ralf Wildenhues
parent
a11669269b
commit
baafc53472
@@ -1,3 +1,7 @@
|
||||
2008-12-18 Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
|
||||
|
||||
* configure: Regenerate.
|
||||
|
||||
2008-11-10 Andrew Haley <aph@redhat.com>
|
||||
|
||||
* native/jni/gtk-peer/gnu_java_awt_peer_gtk_CairoGraphics2D.c
|
||||
@@ -11,7 +15,7 @@
|
||||
(performDefaultLayout): Call getKerning with a float[].
|
||||
* native/jni/gtk-peer/gnu_java_awt_peer_gtk_FreetypeGlyphVector.c
|
||||
(getKerning): Return result in a float[], not a Point2D.
|
||||
|
||||
|
||||
2008-11-05 Andrew Haley <aph@redhat.com>
|
||||
|
||||
* tools/Makefile.am (UPDATE_TOOLS_ZIP, CREATE_TOOLS_ZIP): Exclude
|
||||
|
||||
Vendored
+117
-87
@@ -9871,44 +9871,50 @@ x|xyes)
|
||||
# to ld, don't add -lc before -lgcc.
|
||||
echo "$as_me:$LINENO: checking whether -lc should be explicitly linked in" >&5
|
||||
echo $ECHO_N "checking whether -lc should be explicitly linked in... $ECHO_C" >&6
|
||||
$RM conftest*
|
||||
echo "$lt_simple_compile_test_code" > conftest.$ac_ext
|
||||
if test "${lt_cv_archive_cmds_need_lc+set}" = set; then
|
||||
echo $ECHO_N "(cached) $ECHO_C" >&6
|
||||
else
|
||||
$RM conftest*
|
||||
echo "$lt_simple_compile_test_code" > conftest.$ac_ext
|
||||
|
||||
if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
|
||||
if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
|
||||
(eval $ac_compile) 2>&5
|
||||
ac_status=$?
|
||||
echo "$as_me:$LINENO: \$? = $ac_status" >&5
|
||||
(exit $ac_status); } 2>conftest.err; then
|
||||
soname=conftest
|
||||
lib=conftest
|
||||
libobjs=conftest.$ac_objext
|
||||
deplibs=
|
||||
wl=$lt_prog_compiler_wl
|
||||
pic_flag=$lt_prog_compiler_pic
|
||||
compiler_flags=-v
|
||||
linker_flags=-v
|
||||
verstring=
|
||||
output_objdir=.
|
||||
libname=conftest
|
||||
lt_save_allow_undefined_flag=$allow_undefined_flag
|
||||
allow_undefined_flag=
|
||||
if { (eval echo "$as_me:$LINENO: \"$archive_cmds 2\>\&1 \| $GREP \" -lc \" \>/dev/null 2\>\&1\"") >&5
|
||||
soname=conftest
|
||||
lib=conftest
|
||||
libobjs=conftest.$ac_objext
|
||||
deplibs=
|
||||
wl=$lt_prog_compiler_wl
|
||||
pic_flag=$lt_prog_compiler_pic
|
||||
compiler_flags=-v
|
||||
linker_flags=-v
|
||||
verstring=
|
||||
output_objdir=.
|
||||
libname=conftest
|
||||
lt_save_allow_undefined_flag=$allow_undefined_flag
|
||||
allow_undefined_flag=
|
||||
if { (eval echo "$as_me:$LINENO: \"$archive_cmds 2\>\&1 \| $GREP \" -lc \" \>/dev/null 2\>\&1\"") >&5
|
||||
(eval $archive_cmds 2\>\&1 \| $GREP \" -lc \" \>/dev/null 2\>\&1) 2>&5
|
||||
ac_status=$?
|
||||
echo "$as_me:$LINENO: \$? = $ac_status" >&5
|
||||
(exit $ac_status); }
|
||||
then
|
||||
archive_cmds_need_lc=no
|
||||
else
|
||||
archive_cmds_need_lc=yes
|
||||
fi
|
||||
allow_undefined_flag=$lt_save_allow_undefined_flag
|
||||
else
|
||||
cat conftest.err 1>&5
|
||||
fi
|
||||
$RM conftest*
|
||||
echo "$as_me:$LINENO: result: $archive_cmds_need_lc" >&5
|
||||
echo "${ECHO_T}$archive_cmds_need_lc" >&6
|
||||
then
|
||||
lt_cv_archive_cmds_need_lc=no
|
||||
else
|
||||
lt_cv_archive_cmds_need_lc=yes
|
||||
fi
|
||||
allow_undefined_flag=$lt_save_allow_undefined_flag
|
||||
else
|
||||
cat conftest.err 1>&5
|
||||
fi
|
||||
$RM conftest*
|
||||
|
||||
fi
|
||||
echo "$as_me:$LINENO: result: $lt_cv_archive_cmds_need_lc" >&5
|
||||
echo "${ECHO_T}$lt_cv_archive_cmds_need_lc" >&6
|
||||
archive_cmds_need_lc=$lt_cv_archive_cmds_need_lc
|
||||
;;
|
||||
esac
|
||||
fi
|
||||
@@ -10488,12 +10494,17 @@ linux* | k*bsd*-gnu)
|
||||
finish_cmds='PATH="\$PATH:/sbin" ldconfig -n $libdir'
|
||||
shlibpath_var=LD_LIBRARY_PATH
|
||||
shlibpath_overrides_runpath=no
|
||||
|
||||
# Some binutils ld are patched to set DT_RUNPATH
|
||||
save_LDFLAGS=$LDFLAGS
|
||||
save_libdir=$libdir
|
||||
eval "libdir=/foo; wl=\"$lt_prog_compiler_wl\"; \
|
||||
LDFLAGS=\"\$LDFLAGS $hardcode_libdir_flag_spec\""
|
||||
if test x$gcc_no_link = xyes; then
|
||||
if test "${lt_cv_shlibpath_overrides_runpath+set}" = set; then
|
||||
echo $ECHO_N "(cached) $ECHO_C" >&6
|
||||
else
|
||||
lt_cv_shlibpath_overrides_runpath=no
|
||||
save_LDFLAGS=$LDFLAGS
|
||||
save_libdir=$libdir
|
||||
eval "libdir=/foo; wl=\"$lt_prog_compiler_wl\"; \
|
||||
LDFLAGS=\"\$LDFLAGS $hardcode_libdir_flag_spec\""
|
||||
if test x$gcc_no_link = xyes; then
|
||||
{ { echo "$as_me:$LINENO: error: Link tests are not allowed after GCC_NO_EXECUTABLES." >&5
|
||||
echo "$as_me: error: Link tests are not allowed after GCC_NO_EXECUTABLES." >&2;}
|
||||
{ (exit 1); exit 1; }; }
|
||||
@@ -10536,7 +10547,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
|
||||
echo "$as_me:$LINENO: \$? = $ac_status" >&5
|
||||
(exit $ac_status); }; }; then
|
||||
if ($OBJDUMP -p conftest$ac_exeext) 2>/dev/null | grep "RUNPATH.*$libdir" >/dev/null; then
|
||||
shlibpath_overrides_runpath=yes
|
||||
lt_cv_shlibpath_overrides_runpath=yes
|
||||
fi
|
||||
|
||||
else
|
||||
@@ -10546,8 +10557,12 @@ sed 's/^/| /' conftest.$ac_ext >&5
|
||||
fi
|
||||
rm -f conftest.err conftest.$ac_objext \
|
||||
conftest$ac_exeext conftest.$ac_ext
|
||||
LDFLAGS=$save_LDFLAGS
|
||||
libdir=$save_libdir
|
||||
LDFLAGS=$save_LDFLAGS
|
||||
libdir=$save_libdir
|
||||
|
||||
fi
|
||||
|
||||
shlibpath_overrides_runpath=$lt_cv_shlibpath_overrides_runpath
|
||||
|
||||
# This implies no fast_install, which is unacceptable.
|
||||
# Some rework will be needed to allow for fast_install
|
||||
@@ -11542,7 +11557,7 @@ else
|
||||
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
|
||||
lt_status=$lt_dlunknown
|
||||
cat > conftest.$ac_ext <<_LT_EOF
|
||||
#line 11545 "configure"
|
||||
#line 11560 "configure"
|
||||
#include "confdefs.h"
|
||||
|
||||
#if HAVE_DLFCN_H
|
||||
@@ -11638,7 +11653,7 @@ else
|
||||
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
|
||||
lt_status=$lt_dlunknown
|
||||
cat > conftest.$ac_ext <<_LT_EOF
|
||||
#line 11641 "configure"
|
||||
#line 11656 "configure"
|
||||
#include "confdefs.h"
|
||||
|
||||
#if HAVE_DLFCN_H
|
||||
@@ -16069,11 +16084,11 @@ else
|
||||
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
|
||||
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
|
||||
-e 's:$: $lt_compiler_flag:'`
|
||||
(eval echo "\"\$as_me:16072: $lt_compile\"" >&5)
|
||||
(eval echo "\"\$as_me:16087: $lt_compile\"" >&5)
|
||||
(eval "$lt_compile" 2>conftest.err)
|
||||
ac_status=$?
|
||||
cat conftest.err >&5
|
||||
echo "$as_me:16076: \$? = $ac_status" >&5
|
||||
echo "$as_me:16091: \$? = $ac_status" >&5
|
||||
if (exit $ac_status) && test -s "$ac_outfile"; then
|
||||
# The compiler can only warn and ignore the option if not recognized
|
||||
# So say no if there are warnings other than the usual output.
|
||||
@@ -16168,11 +16183,11 @@ else
|
||||
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
|
||||
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
|
||||
-e 's:$: $lt_compiler_flag:'`
|
||||
(eval echo "\"\$as_me:16171: $lt_compile\"" >&5)
|
||||
(eval echo "\"\$as_me:16186: $lt_compile\"" >&5)
|
||||
(eval "$lt_compile" 2>out/conftest.err)
|
||||
ac_status=$?
|
||||
cat out/conftest.err >&5
|
||||
echo "$as_me:16175: \$? = $ac_status" >&5
|
||||
echo "$as_me:16190: \$? = $ac_status" >&5
|
||||
if (exit $ac_status) && test -s out/conftest2.$ac_objext
|
||||
then
|
||||
# The compiler can only warn and ignore the option if not recognized
|
||||
@@ -16220,11 +16235,11 @@ else
|
||||
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
|
||||
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
|
||||
-e 's:$: $lt_compiler_flag:'`
|
||||
(eval echo "\"\$as_me:16223: $lt_compile\"" >&5)
|
||||
(eval echo "\"\$as_me:16238: $lt_compile\"" >&5)
|
||||
(eval "$lt_compile" 2>out/conftest.err)
|
||||
ac_status=$?
|
||||
cat out/conftest.err >&5
|
||||
echo "$as_me:16227: \$? = $ac_status" >&5
|
||||
echo "$as_me:16242: \$? = $ac_status" >&5
|
||||
if (exit $ac_status) && test -s out/conftest2.$ac_objext
|
||||
then
|
||||
# The compiler can only warn and ignore the option if not recognized
|
||||
@@ -16332,44 +16347,50 @@ x|xyes)
|
||||
# to ld, don't add -lc before -lgcc.
|
||||
echo "$as_me:$LINENO: checking whether -lc should be explicitly linked in" >&5
|
||||
echo $ECHO_N "checking whether -lc should be explicitly linked in... $ECHO_C" >&6
|
||||
$RM conftest*
|
||||
echo "$lt_simple_compile_test_code" > conftest.$ac_ext
|
||||
if test "${lt_cv_archive_cmds_need_lc_CXX+set}" = set; then
|
||||
echo $ECHO_N "(cached) $ECHO_C" >&6
|
||||
else
|
||||
$RM conftest*
|
||||
echo "$lt_simple_compile_test_code" > conftest.$ac_ext
|
||||
|
||||
if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
|
||||
if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
|
||||
(eval $ac_compile) 2>&5
|
||||
ac_status=$?
|
||||
echo "$as_me:$LINENO: \$? = $ac_status" >&5
|
||||
(exit $ac_status); } 2>conftest.err; then
|
||||
soname=conftest
|
||||
lib=conftest
|
||||
libobjs=conftest.$ac_objext
|
||||
deplibs=
|
||||
wl=$lt_prog_compiler_wl_CXX
|
||||
pic_flag=$lt_prog_compiler_pic_CXX
|
||||
compiler_flags=-v
|
||||
linker_flags=-v
|
||||
verstring=
|
||||
output_objdir=.
|
||||
libname=conftest
|
||||
lt_save_allow_undefined_flag=$allow_undefined_flag_CXX
|
||||
allow_undefined_flag_CXX=
|
||||
if { (eval echo "$as_me:$LINENO: \"$archive_cmds_CXX 2\>\&1 \| $GREP \" -lc \" \>/dev/null 2\>\&1\"") >&5
|
||||
soname=conftest
|
||||
lib=conftest
|
||||
libobjs=conftest.$ac_objext
|
||||
deplibs=
|
||||
wl=$lt_prog_compiler_wl_CXX
|
||||
pic_flag=$lt_prog_compiler_pic_CXX
|
||||
compiler_flags=-v
|
||||
linker_flags=-v
|
||||
verstring=
|
||||
output_objdir=.
|
||||
libname=conftest
|
||||
lt_save_allow_undefined_flag=$allow_undefined_flag_CXX
|
||||
allow_undefined_flag_CXX=
|
||||
if { (eval echo "$as_me:$LINENO: \"$archive_cmds_CXX 2\>\&1 \| $GREP \" -lc \" \>/dev/null 2\>\&1\"") >&5
|
||||
(eval $archive_cmds_CXX 2\>\&1 \| $GREP \" -lc \" \>/dev/null 2\>\&1) 2>&5
|
||||
ac_status=$?
|
||||
echo "$as_me:$LINENO: \$? = $ac_status" >&5
|
||||
(exit $ac_status); }
|
||||
then
|
||||
archive_cmds_need_lc_CXX=no
|
||||
else
|
||||
archive_cmds_need_lc_CXX=yes
|
||||
fi
|
||||
allow_undefined_flag_CXX=$lt_save_allow_undefined_flag
|
||||
else
|
||||
cat conftest.err 1>&5
|
||||
fi
|
||||
$RM conftest*
|
||||
echo "$as_me:$LINENO: result: $archive_cmds_need_lc_CXX" >&5
|
||||
echo "${ECHO_T}$archive_cmds_need_lc_CXX" >&6
|
||||
then
|
||||
lt_cv_archive_cmds_need_lc_CXX=no
|
||||
else
|
||||
lt_cv_archive_cmds_need_lc_CXX=yes
|
||||
fi
|
||||
allow_undefined_flag_CXX=$lt_save_allow_undefined_flag
|
||||
else
|
||||
cat conftest.err 1>&5
|
||||
fi
|
||||
$RM conftest*
|
||||
|
||||
fi
|
||||
echo "$as_me:$LINENO: result: $lt_cv_archive_cmds_need_lc_CXX" >&5
|
||||
echo "${ECHO_T}$lt_cv_archive_cmds_need_lc_CXX" >&6
|
||||
archive_cmds_need_lc_CXX=$lt_cv_archive_cmds_need_lc_CXX
|
||||
;;
|
||||
esac
|
||||
fi
|
||||
@@ -16804,12 +16825,17 @@ linux* | k*bsd*-gnu)
|
||||
finish_cmds='PATH="\$PATH:/sbin" ldconfig -n $libdir'
|
||||
shlibpath_var=LD_LIBRARY_PATH
|
||||
shlibpath_overrides_runpath=no
|
||||
|
||||
# Some binutils ld are patched to set DT_RUNPATH
|
||||
save_LDFLAGS=$LDFLAGS
|
||||
save_libdir=$libdir
|
||||
eval "libdir=/foo; wl=\"$lt_prog_compiler_wl_CXX\"; \
|
||||
LDFLAGS=\"\$LDFLAGS $hardcode_libdir_flag_spec_CXX\""
|
||||
if test x$gcc_no_link = xyes; then
|
||||
if test "${lt_cv_shlibpath_overrides_runpath+set}" = set; then
|
||||
echo $ECHO_N "(cached) $ECHO_C" >&6
|
||||
else
|
||||
lt_cv_shlibpath_overrides_runpath=no
|
||||
save_LDFLAGS=$LDFLAGS
|
||||
save_libdir=$libdir
|
||||
eval "libdir=/foo; wl=\"$lt_prog_compiler_wl_CXX\"; \
|
||||
LDFLAGS=\"\$LDFLAGS $hardcode_libdir_flag_spec_CXX\""
|
||||
if test x$gcc_no_link = xyes; then
|
||||
{ { echo "$as_me:$LINENO: error: Link tests are not allowed after GCC_NO_EXECUTABLES." >&5
|
||||
echo "$as_me: error: Link tests are not allowed after GCC_NO_EXECUTABLES." >&2;}
|
||||
{ (exit 1); exit 1; }; }
|
||||
@@ -16852,7 +16878,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
|
||||
echo "$as_me:$LINENO: \$? = $ac_status" >&5
|
||||
(exit $ac_status); }; }; then
|
||||
if ($OBJDUMP -p conftest$ac_exeext) 2>/dev/null | grep "RUNPATH.*$libdir" >/dev/null; then
|
||||
shlibpath_overrides_runpath=yes
|
||||
lt_cv_shlibpath_overrides_runpath=yes
|
||||
fi
|
||||
|
||||
else
|
||||
@@ -16862,8 +16888,12 @@ sed 's/^/| /' conftest.$ac_ext >&5
|
||||
fi
|
||||
rm -f conftest.err conftest.$ac_objext \
|
||||
conftest$ac_exeext conftest.$ac_ext
|
||||
LDFLAGS=$save_LDFLAGS
|
||||
libdir=$save_libdir
|
||||
LDFLAGS=$save_LDFLAGS
|
||||
libdir=$save_libdir
|
||||
|
||||
fi
|
||||
|
||||
shlibpath_overrides_runpath=$lt_cv_shlibpath_overrides_runpath
|
||||
|
||||
# This implies no fast_install, which is unacceptable.
|
||||
# Some rework will be needed to allow for fast_install
|
||||
@@ -29142,7 +29172,7 @@ EOF
|
||||
if uudecode$EXEEXT Test.uue; then
|
||||
ac_cv_prog_uudecode_base64=yes
|
||||
else
|
||||
echo "configure: 29145: uudecode had trouble decoding base 64 file 'Test.uue'" >&5
|
||||
echo "configure: 29175: uudecode had trouble decoding base 64 file 'Test.uue'" >&5
|
||||
echo "configure: failed file was:" >&5
|
||||
cat Test.uue >&5
|
||||
ac_cv_prog_uudecode_base64=no
|
||||
@@ -29289,7 +29319,7 @@ else
|
||||
JAVA_TEST=Object.java
|
||||
CLASS_TEST=Object.class
|
||||
cat << \EOF > $JAVA_TEST
|
||||
/* #line 29292 "configure" */
|
||||
/* #line 29322 "configure" */
|
||||
package java.lang;
|
||||
|
||||
public class Object
|
||||
@@ -29338,7 +29368,7 @@ JAVA_TEST=Test.java
|
||||
CLASS_TEST=Test.class
|
||||
TEST=Test
|
||||
cat << \EOF > $JAVA_TEST
|
||||
/* [#]line 29341 "configure" */
|
||||
/* [#]line 29371 "configure" */
|
||||
public class Test {
|
||||
public static void main (String args[]) {
|
||||
System.exit (0);
|
||||
@@ -29658,7 +29688,7 @@ else
|
||||
JAVA_TEST=Object.java
|
||||
CLASS_TEST=Object.class
|
||||
cat << \EOF > $JAVA_TEST
|
||||
/* #line 29661 "configure" */
|
||||
/* #line 29691 "configure" */
|
||||
package java.lang;
|
||||
|
||||
public class Object
|
||||
@@ -29699,7 +29729,7 @@ fi
|
||||
JAVA_TEST=Test.java
|
||||
CLASS_TEST=Test.class
|
||||
cat << \EOF > $JAVA_TEST
|
||||
/* #line 29702 "configure" */
|
||||
/* #line 29732 "configure" */
|
||||
public class Test
|
||||
{
|
||||
public static void main(String args)
|
||||
|
||||
Reference in New Issue
Block a user