Commit d7ac744e by Jakub Jelinek Committed by Jakub Jelinek

acinclude.m4 (GLIBCPP_ENABLE_SYMVERS): Check for version script globbing in ld.

	* acinclude.m4 (GLIBCPP_ENABLE_SYMVERS): Check for version
	script globbing in ld.
	* aclocal.m4: Rebuilt.
	* configure: Rebuilt.

From-SVN: r50330
parent e8b3c8ac
2002-03-05 Jakub Jelinek <jakub@redhat.com>
* acinclude.m4 (GLIBCPP_ENABLE_SYMVERS): Check for version
script globbing in ld.
* aclocal.m4: Rebuilt.
* configure: Rebuilt.
2002-03-05 Benjamin Kosnik <bkoz@redhat.com> 2002-03-05 Benjamin Kosnik <bkoz@redhat.com>
* docs/html/17_intro/RELEASE-NOTES: Update. * docs/html/17_intro/RELEASE-NOTES: Update.
......
...@@ -2082,10 +2082,27 @@ glibcpp_min_gnu_ld_version=21200 ...@@ -2082,10 +2082,27 @@ glibcpp_min_gnu_ld_version=21200
# above. # above.
if test $enable_symvers = yes ; then if test $enable_symvers = yes ; then
if test $with_gnu_ld = yes && if test $with_gnu_ld = yes &&
test $glibcpp_gnu_ld_version -ge $glibcpp_min_gnu_ld_version &&
test $glibcpp_shared_libgcc = yes ; test $glibcpp_shared_libgcc = yes ;
then then
enable_symvers=gnu if test $glibcpp_gnu_ld_version -ge $glibcpp_min_gnu_ld_version ; then
enable_symvers=gnu
else
ac_test_CFLAGS="${CFLAGS+set}"
ac_save_CFLAGS="$CFLAGS"
CFLAGS='-shared -Wl,--version-script,conftest.map'
enable_symvers=no
changequote(,)
echo 'FOO { global: f[a-z]o; local: *; };' > conftest.map
changequote([,])
AC_TRY_LINK([int foo;],, enable_symvers=gnu)
if test "$ac_test_CFLAGS" = set; then
CFLAGS="$ac_save_CFLAGS"
else
# this is the suspicious part
CFLAGS=''
fi
rm -f conftest.map
fi
else else
# just fail for now # just fail for now
enable_symvers=no enable_symvers=no
......
...@@ -2094,10 +2094,27 @@ glibcpp_min_gnu_ld_version=21200 ...@@ -2094,10 +2094,27 @@ glibcpp_min_gnu_ld_version=21200
# above. # above.
if test $enable_symvers = yes ; then if test $enable_symvers = yes ; then
if test $with_gnu_ld = yes && if test $with_gnu_ld = yes &&
test $glibcpp_gnu_ld_version -ge $glibcpp_min_gnu_ld_version &&
test $glibcpp_shared_libgcc = yes ; test $glibcpp_shared_libgcc = yes ;
then then
enable_symvers=gnu if test $glibcpp_gnu_ld_version -ge $glibcpp_min_gnu_ld_version ; then
enable_symvers=gnu
else
ac_test_CFLAGS="${CFLAGS+set}"
ac_save_CFLAGS="$CFLAGS"
CFLAGS='-shared -Wl,--version-script,conftest.map'
enable_symvers=no
changequote(,)
echo 'FOO { global: f[a-z]o; local: *; };' > conftest.map
changequote([,])
AC_TRY_LINK([int foo;],, enable_symvers=gnu)
if test "$ac_test_CFLAGS" = set; then
CFLAGS="$ac_save_CFLAGS"
else
# this is the suspicious part
CFLAGS=''
fi
rm -f conftest.map
fi
else else
# just fail for now # just fail for now
enable_symvers=no enable_symvers=no
......
...@@ -19349,10 +19349,42 @@ glibcpp_min_gnu_ld_version=21200 ...@@ -19349,10 +19349,42 @@ glibcpp_min_gnu_ld_version=21200
# above. # above.
if test $enable_symvers = yes ; then if test $enable_symvers = yes ; then
if test $with_gnu_ld = yes && if test $with_gnu_ld = yes &&
test $glibcpp_gnu_ld_version -ge $glibcpp_min_gnu_ld_version &&
test $glibcpp_shared_libgcc = yes ; test $glibcpp_shared_libgcc = yes ;
then then
enable_symvers=gnu if test $glibcpp_gnu_ld_version -ge $glibcpp_min_gnu_ld_version ; then
enable_symvers=gnu
else
ac_test_CFLAGS="${CFLAGS+set}"
ac_save_CFLAGS="$CFLAGS"
CFLAGS='-shared -Wl,--version-script,conftest.map'
enable_symvers=no
echo 'FOO { global: f[a-z]o; local: *; };' > conftest.map
cat > conftest.$ac_ext <<EOF
#line 19344 "configure"
#include "confdefs.h"
int foo;
int main() {
; return 0; }
EOF
if { (eval echo configure:19351: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
enable_symvers=gnu
else
echo "configure: failed program was:" >&5
cat conftest.$ac_ext >&5
fi
rm -f conftest*
if test "$ac_test_CFLAGS" = set; then
CFLAGS="$ac_save_CFLAGS"
else
# this is the suspicious part
CFLAGS=''
fi
rm -f conftest.map
fi
else else
# just fail for now # just fail for now
enable_symvers=no enable_symvers=no
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment