From be95b3555aa82872565a1e1ea85ff826a20c8e2e Mon Sep 17 00:00:00 2001
From: Bernd Schmidt <bernd.schmidt@analog.com>
Date: Thu, 15 May 2008 22:54:29 +0000
Subject: [PATCH] configure.ac: Don't check AC_LIBTOOL_DLOPEN if using newlib.
* configure.ac: Don't check AC_LIBTOOL_DLOPEN if using newlib.
* configure: Regenerate.
From-SVN: r135400
---
libstdc++-v3/ChangeLog | 5 ++++
libstdc++-v3/configure | 50 ++++++++++++++++++++-------------------
libstdc++-v3/configure.ac | 4 +++-
3 files changed, 34 insertions(+), 25 deletions(-)
diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog
index c17263b8d7b7..88a038d1b163 100644
--- a/libstdc++-v3/ChangeLog
+++ b/libstdc++-v3/ChangeLog
@@ -1,3 +1,8 @@
+2008-05-15 Bernd Schmidt <bernd.schmidt@analog.com>
+
+ * configure.ac: Don't check AC_LIBTOOL_DLOPEN if using newlib.
+ * configure: Regenerate.
+
2008-05-15 Johannes Singler <singler@ira.uka.de>
* xml/manual/parallel_mode.xml:
diff --git a/libstdc++-v3/configure b/libstdc++-v3/configure
index 5aedae16c7df..5d8b3b00bfb4 100755
--- a/libstdc++-v3/configure
+++ b/libstdc++-v3/configure
@@ -4146,10 +4146,12 @@ echo "$as_me: OS config directory is $os_include_dir" >&6;}
-enable_dlopen=yes
+if test "x${with_newlib}" != "xyes"; then
+ enable_dlopen=yes
+fi
macro_version='2.1a'
@@ -4666,13 +4668,13 @@ if test "${lt_cv_nm_interface+set}" = set; then
else
lt_cv_nm_interface="BSD nm"
echo "int some_variable = 0;" > conftest.$ac_ext
- (eval echo "\"\$as_me:4669: $ac_compile\"" >&5)
+ (eval echo "\"\$as_me:4671: $ac_compile\"" >&5)
(eval "$ac_compile" 2>conftest.err)
cat conftest.err >&5
- (eval echo "\"\$as_me:4672: $NM \\\"conftest.$ac_objext\\\"\"" >&5)
+ (eval echo "\"\$as_me:4674: $NM \\\"conftest.$ac_objext\\\"\"" >&5)
(eval "$NM \"conftest.$ac_objext\"" 2>conftest.err > conftest.out)
cat conftest.err >&5
- (eval echo "\"\$as_me:4675: output\"" >&5)
+ (eval echo "\"\$as_me:4677: output\"" >&5)
cat conftest.out >&5
if $GREP 'External.*some_variable' conftest.out > /dev/null; then
lt_cv_nm_interface="MS dumpbin"
@@ -5716,7 +5718,7 @@ ia64-*-hpux*)
;;
*-*-irix6*)
# Find out which ABI we are using.
- echo '#line 5719 "configure"' > conftest.$ac_ext
+ echo '#line 5721 "configure"' > conftest.$ac_ext
if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
(eval $ac_compile) 2>&5
ac_status=$?
@@ -7178,11 +7180,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:7181: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:7183: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
- echo "$as_me:7185: \$? = $ac_status" >&5
+ echo "$as_me:7187: \$? = $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.
@@ -7500,11 +7502,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:7503: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:7505: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
- echo "$as_me:7507: \$? = $ac_status" >&5
+ echo "$as_me:7509: \$? = $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.
@@ -7605,11 +7607,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:7608: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:7610: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&5
- echo "$as_me:7612: \$? = $ac_status" >&5
+ echo "$as_me:7614: \$? = $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
@@ -7660,11 +7662,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:7663: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:7665: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&5
- echo "$as_me:7667: \$? = $ac_status" >&5
+ echo "$as_me:7669: \$? = $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
@@ -10512,7 +10514,7 @@ else
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<_LT_EOF
-#line 10515 "configure"
+#line 10517 "configure"
#include "confdefs.h"
#if HAVE_DLFCN_H
@@ -10612,7 +10614,7 @@ else
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<_LT_EOF
-#line 10615 "configure"
+#line 10617 "configure"
#include "confdefs.h"
#if HAVE_DLFCN_H
@@ -12650,11 +12652,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:12653: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:12655: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
- echo "$as_me:12657: \$? = $ac_status" >&5
+ echo "$as_me:12659: \$? = $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.
@@ -12749,11 +12751,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:12752: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:12754: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&5
- echo "$as_me:12756: \$? = $ac_status" >&5
+ echo "$as_me:12758: \$? = $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
@@ -12801,11 +12803,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:12804: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:12806: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&5
- echo "$as_me:12808: \$? = $ac_status" >&5
+ echo "$as_me:12810: \$? = $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
@@ -13850,7 +13852,7 @@ fi;
#
# Fake what AC_TRY_COMPILE does. XXX Look at redoing this new-style.
cat > conftest.$ac_ext << EOF
-#line 13853 "configure"
+#line 13855 "configure"
struct S { ~S(); };
void bar();
void foo()
@@ -13996,7 +13998,7 @@ ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
# unnecessary for a builtins test.
cat > conftest.$ac_ext << EOF
-#line 13999 "configure"
+#line 14001 "configure"
int main()
{
// NB: _Atomic_word not necessarily int.
@@ -14036,7 +14038,7 @@ echo "${ECHO_T}$enable_atomic_builtinsi" >&6
rm -f conftest*
cat > conftest.$ac_ext << EOF
-#line 14039 "configure"
+#line 14041 "configure"
int main()
{
typedef bool atomic_type;
diff --git a/libstdc++-v3/configure.ac b/libstdc++-v3/configure.ac
index 7279b118923a..50da5245baae 100644
--- a/libstdc++-v3/configure.ac
+++ b/libstdc++-v3/configure.ac
@@ -82,7 +82,9 @@ AH_TEMPLATE(VERSION, [Version number of package])
# up critical shell variables.
GLIBCXX_CONFIGURE
-AC_LIBTOOL_DLOPEN
+if test "x${with_newlib}" != "xyes"; then
+ AC_LIBTOOL_DLOPEN
+fi
AM_PROG_LIBTOOL
AC_SUBST(enable_shared)
AC_SUBST(enable_static)
--
GitLab