From b72554f1df2c06c2bd5b9d3d12b28897c91d51b5 Mon Sep 17 00:00:00 2001 From: Alexandre Petit-Bianco Date: Mon, 13 Nov 2000 23:38:41 +0000 Subject: [PATCH] Makefile.am (tmp-libstdsc++.INC:): Do not use -I$(top_builddir). 2000-11-12 Alexandre Petit-Bianco * Makefile.am (tmp-libstdsc++.INC:): Do not use -I$(top_builddir). * Makefile.in: Regenerate. From-SVN: r37442 --- libstdc++-v3/ChangeLog | 5 ++ libstdc++-v3/aclocal.m4 | 6 ++ libstdc++-v3/configure | 162 ++++++++++++++++++++++------------- libstdc++-v3/src/Makefile.am | 4 +- libstdc++-v3/src/Makefile.in | 2 +- 5 files changed, 117 insertions(+), 62 deletions(-) diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog index 035adc0c5a5..e5de41f3d8a 100644 --- a/libstdc++-v3/ChangeLog +++ b/libstdc++-v3/ChangeLog @@ -1,3 +1,8 @@ +2000-11-12 Alexandre Petit-Bianco + + * Makefile.am (tmp-libstdsc++.INC:): Do not use -I$(top_builddir). + * Makefile.in: Regenerate. + 2000-11-12 David Edelsohn * acinclude.m4 (GLIBCPP_CHECK_WCHAR_T_SUPPORT): Add test for diff --git a/libstdc++-v3/aclocal.m4 b/libstdc++-v3/aclocal.m4 index 6fd5169891e..16f00890580 100644 --- a/libstdc++-v3/aclocal.m4 +++ b/libstdc++-v3/aclocal.m4 @@ -1095,6 +1095,12 @@ AC_DEFUN(GLIBCPP_CHECK_WCHAR_T_SUPPORT, [ dnl X/Open Portability Guide, version 2 features (XPG2). AC_CHECK_HEADER(iconv.h, ac_has_iconv_h=yes, ac_has_iconv_h=no) AC_CHECK_HEADER(langinfo.h, ac_has_langinfo_h=yes, ac_has_langinfo_h=no) + + dnl Check for existence of libiconv.a providing XPG2 wchar_t support. + AC_CHECK_LIB(iconv, iconv, libiconv="-liconv") + ac_save_LIBS="$LIBS" + LIBS="$LIBS $libiconv" + AC_CHECK_FUNCS(iconv_open iconv_close iconv nl_langinfo, \ ac_XPG2funcs=yes, ac_XPG2funcs=no) diff --git a/libstdc++-v3/configure b/libstdc++-v3/configure index f3ba593c13c..821066a68dd 100755 --- a/libstdc++-v3/configure +++ b/libstdc++-v3/configure @@ -17664,15 +17664,59 @@ else ac_has_langinfo_h=no fi + + echo $ac_n "checking for iconv in -liconv""... $ac_c" 1>&6 +echo "configure:17670: checking for iconv in -liconv" >&5 +ac_lib_var=`echo iconv'_'iconv | sed 'y%./+-%__p_%'` +if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 +else + ac_save_LIBS="$LIBS" +LIBS="-liconv $LIBS" +cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then + rm -rf conftest* + eval "ac_cv_lib_$ac_lib_var=yes" +else + echo "configure: failed program was:" >&5 + cat conftest.$ac_ext >&5 + rm -rf conftest* + eval "ac_cv_lib_$ac_lib_var=no" +fi +rm -f conftest* +LIBS="$ac_save_LIBS" + +fi +if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then + echo "$ac_t""yes" 1>&6 + libiconv="-liconv" +else + echo "$ac_t""no" 1>&6 +fi + + ac_save_LIBS="$LIBS" + LIBS="$LIBS $libiconv" + for ac_func in iconv_open iconv_close iconv nl_langinfo do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:17671: checking for $ac_func" >&5 +echo "configure:17715: checking for $ac_func" >&5 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:17743: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else @@ -17723,7 +17767,7 @@ done echo $ac_n "checking for XPG2 wchar_t support""... $ac_c" 1>&6 -echo "configure:17727: checking for XPG2 wchar_t support" >&5 +echo "configure:17771: checking for XPG2 wchar_t support" >&5 if test x"$ac_has_iconv_h" = xyes && test x"$ac_has_langinfo_h" = xyes \ && test x"$ac_XPG2funcs" = xyes; then ac_XPG2_wchar_t=yes @@ -17733,7 +17777,7 @@ echo "configure:17727: checking for XPG2 wchar_t support" >&5 echo "$ac_t""$ac_XPG2_wchar_t" 1>&6 echo $ac_n "checking for enabled wchar_t specializations""... $ac_c" 1>&6 -echo "configure:17737: checking for enabled wchar_t specializations" >&5 +echo "configure:17781: checking for enabled wchar_t specializations" >&5 if test x"$ac_isoC9X_wchar_t" = xyes \ && test x"$ac_XPG2_wchar_t" = xyes; then libinst_wstring_la="libinst-wstring.la" @@ -17763,17 +17807,17 @@ EOF ac_safe=`echo "ctype.h" | sed 'y%./+-%__p_%'` echo $ac_n "checking for ctype.h""... $ac_c" 1>&6 -echo "configure:17767: checking for ctype.h" >&5 +echo "configure:17811: checking for ctype.h" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:17777: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:17821: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -17794,9 +17838,9 @@ if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then ctype_default=yes echo $ac_n "checking for GNU/Linux""... $ac_c" 1>&6 -echo "configure:17798: checking for GNU/Linux" >&5 +echo "configure:17842: checking for GNU/Linux" >&5 cat > conftest.$ac_ext < int main() { @@ -17807,7 +17851,7 @@ int + __ctype_tolower[a] + __ctype_toupper[a] + __ctype_b[a];} ; return 0; } EOF -if { (eval echo configure:17811: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:17855: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* \ ctype_linux=yes @@ -17826,9 +17870,9 @@ rm -f conftest* if test $ctype_default = "yes"; then echo $ac_n "checking for FreeBSD 4.0""... $ac_c" 1>&6 -echo "configure:17830: checking for FreeBSD 4.0" >&5 +echo "configure:17874: checking for FreeBSD 4.0" >&5 cat > conftest.$ac_ext < int main() { @@ -17838,7 +17882,7 @@ int + _CTYPE_D + _CTYPE_P + _CTYPE_X + _CTYPE_G ;} ; return 0; } EOF -if { (eval echo configure:17842: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:17886: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* \ ctype_bsd=yes @@ -17858,9 +17902,9 @@ rm -f conftest* if test $ctype_default = "yes"; then echo $ac_n "checking for FreeBSD 3.4""... $ac_c" 1>&6 -echo "configure:17862: checking for FreeBSD 3.4" >&5 +echo "configure:17906: checking for FreeBSD 3.4" >&5 cat > conftest.$ac_ext < int main() { @@ -17870,7 +17914,7 @@ int + _D + _P + _X + _G + __istype (a, 0);} ; return 0; } EOF -if { (eval echo configure:17874: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:17918: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* \ ctype_freebsd34=yes @@ -17890,9 +17934,9 @@ rm -f conftest* if test $ctype_default = "yes"; then echo $ac_n "checking for Solaris 2.6,7,8""... $ac_c" 1>&6 -echo "configure:17894: checking for Solaris 2.6,7,8" >&5 +echo "configure:17938: checking for Solaris 2.6,7,8" >&5 cat > conftest.$ac_ext < int main() { @@ -17903,7 +17947,7 @@ int + __trans_lower[a] + __trans_upper[a] + __ctype_mask[a];} ; return 0; } EOF -if { (eval echo configure:17907: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:17951: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* \ ctype_solaris=yes @@ -17918,7 +17962,7 @@ rm -f conftest* if test $ctype_solaris = "yes"; then echo $ac_n "checking for version""... $ac_c" 1>&6 -echo "configure:17922: checking for version" >&5 +echo "configure:17966: checking for version" >&5 ac_ext=C # CXXFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options. ac_cpp='$CXXCPP $CPPFLAGS' @@ -17927,14 +17971,14 @@ ac_link='${CXX-g++} -o conftest${ac_exeext} $CXXFLAGS $CPPFLAGS $LDFLAGS conftes cross_compiling=$ac_cv_prog_cxx_cross cat > conftest.$ac_ext < int main() { typedef long* __to_type; __to_type const& _M_toupper = __trans_upper; ; return 0; } EOF -if { (eval echo configure:17938: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:17982: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* \ ctype_solaris26=yes @@ -17966,9 +18010,9 @@ cross_compiling=$ac_cv_prog_cc_cross if test $ctype_default = "yes"; then echo $ac_n "checking for Solaris 2.5.1""... $ac_c" 1>&6 -echo "configure:17970: checking for Solaris 2.5.1" >&5 +echo "configure:18014: checking for Solaris 2.5.1" >&5 cat > conftest.$ac_ext < int main() { @@ -17978,7 +18022,7 @@ int + __ctype[a];} ; return 0; } EOF -if { (eval echo configure:17982: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:18026: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* \ ctype_solaris25=yes @@ -17998,9 +18042,9 @@ rm -f conftest* if test $ctype_default = "yes"; then echo $ac_n "checking for AIX""... $ac_c" 1>&6 -echo "configure:18002: checking for AIX" >&5 +echo "configure:18046: checking for AIX" >&5 cat > conftest.$ac_ext < int main() { @@ -18011,7 +18055,7 @@ int + _VALC('a') + _IS('c', 0);} ; return 0; } EOF -if { (eval echo configure:18015: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:18059: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* \ ctype_aix=yes @@ -18031,9 +18075,9 @@ rm -f conftest* if test $ctype_default = "yes"; then echo $ac_n "checking for IRIX""... $ac_c" 1>&6 -echo "configure:18035: checking for IRIX" >&5 +echo "configure:18079: checking for IRIX" >&5 cat > conftest.$ac_ext < int main() { @@ -18043,7 +18087,7 @@ int _A + _PR + _G + _BL;} ; return 0; } EOF -if { (eval echo configure:18047: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:18091: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* \ ctype_irix=yes @@ -18063,9 +18107,9 @@ rm -f conftest* if test $ctype_default = "yes"; then echo $ac_n "checking for newlib""... $ac_c" 1>&6 -echo "configure:18067: checking for newlib" >&5 +echo "configure:18111: checking for newlib" >&5 cat > conftest.$ac_ext < int main() { @@ -18075,7 +18119,7 @@ int + _ctype_[a];} ; return 0; } EOF -if { (eval echo configure:18079: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:18123: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* \ ctype_newlib=yes @@ -18115,12 +18159,12 @@ fi for ac_func in strtof do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:18119: checking for $ac_func" >&5 +echo "configure:18163: checking for $ac_func" >&5 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:18191: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else @@ -18169,7 +18213,7 @@ done echo $ac_n "checking for strtold declaration""... $ac_c" 1>&6 -echo "configure:18173: checking for strtold declaration" >&5 +echo "configure:18217: checking for strtold declaration" >&5 if eval "test \"`echo '$''{'glibcpp_cv_func_strtold_use'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -18183,14 +18227,14 @@ ac_link='${CXX-g++} -o conftest${ac_exeext} $CXXFLAGS $CPPFLAGS $LDFLAGS conftes cross_compiling=$ac_cv_prog_cxx_cross cat > conftest.$ac_ext < int main() { strtold(0, 0); ; return 0; } EOF -if { (eval echo configure:18194: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:18238: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* glibcpp_cv_func_strtold_use=yes else @@ -18215,12 +18259,12 @@ fi for ac_func in strtold do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:18219: checking for $ac_func" >&5 +echo "configure:18263: checking for $ac_func" >&5 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:18291: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else @@ -18277,17 +18321,17 @@ done do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:18281: checking for $ac_hdr" >&5 +echo "configure:18325: checking for $ac_hdr" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:18291: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:18335: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -18316,12 +18360,12 @@ done for ac_func in getpagesize do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:18320: checking for $ac_func" >&5 +echo "configure:18364: checking for $ac_func" >&5 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:18392: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else @@ -18369,7 +18413,7 @@ fi done echo $ac_n "checking for working mmap""... $ac_c" 1>&6 -echo "configure:18373: checking for working mmap" >&5 +echo "configure:18417: checking for working mmap" >&5 if eval "test \"`echo '$''{'ac_cv_func_mmap_fixed_mapped'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -18377,7 +18421,7 @@ else ac_cv_func_mmap_fixed_mapped=no else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:18565: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then ac_cv_func_mmap_fixed_mapped=yes else @@ -18627,19 +18671,19 @@ rm -f confcache if test $ac_cv_header_locale_h = yes; then echo $ac_n "checking for LC_MESSAGES""... $ac_c" 1>&6 -echo "configure:18631: checking for LC_MESSAGES" >&5 +echo "configure:18675: checking for LC_MESSAGES" >&5 if eval "test \"`echo '$''{'ac_cv_val_LC_MESSAGES'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < int main() { return LC_MESSAGES ; return 0; } EOF -if { (eval echo configure:18643: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:18687: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* ac_cv_val_LC_MESSAGES=yes else @@ -18676,14 +18720,14 @@ INTERFACE=v3 # Check for the interface version number for specifying where header # files are installed, if a version number is provided. echo $ac_n "checking for interface version number""... $ac_c" 1>&6 -echo "configure:18680: checking for interface version number" >&5 +echo "configure:18724: checking for interface version number" >&5 libstdcxx_interface=$INTERFACE echo "$ac_t""$libstdcxx_interface" 1>&6 # Process the option --with-gxx-include-dir= echo $ac_n "checking for --with-gxx-include-dir""... $ac_c" 1>&6 -echo "configure:18687: checking for --with-gxx-include-dir" >&5 +echo "configure:18731: checking for --with-gxx-include-dir" >&5 # Check whether --with-gxx-include-dir or --without-gxx-include-dir was given. if test "${with_gxx_include_dir+set}" = set; then withval="$with_gxx_include_dir" @@ -18717,7 +18761,7 @@ fi # Process the option "--enable-version-specific-runtime-libs" echo $ac_n "checking for --enable-version-specific-runtime-libs""... $ac_c" 1>&6 -echo "configure:18721: checking for --enable-version-specific-runtime-libs" >&5 +echo "configure:18765: checking for --enable-version-specific-runtime-libs" >&5 # Check whether --enable-version-specific-runtime-libs or --disable-version-specific-runtime-libs was given. if test "${enable_version_specific_runtime_libs+set}" = set; then enableval="$enable_version_specific_runtime_libs" diff --git a/libstdc++-v3/src/Makefile.am b/libstdc++-v3/src/Makefile.am index eaa88718af3..7e7bb21d4d0 100644 --- a/libstdc++-v3/src/Makefile.am +++ b/libstdc++-v3/src/Makefile.am @@ -21,7 +21,7 @@ ## Software Foundation, 59 Temple Place - Suite 330, Boston, MA 02111-1307, ## USA. -## $Id: Makefile.am,v 1.45 2000/10/29 22:30:27 bkoz Exp $ +## $Id: Makefile.am,v 1.46 2000/11/13 21:04:54 bkoz Exp $ AUTOMAKE_OPTIONS = 1.3 gnits MAINT_CHARSET = latin1 @@ -295,7 +295,7 @@ libstdc++.INC: Makefile mv tmp-$@ $@ tmp-libstdc++.INC: Makefile - echo -I$(top_builddir) $(INCLUDES) > $@ + echo $(INCLUDES) > $@ # AM_CXXFLAGS needs to be in each subdirectory so that it can be diff --git a/libstdc++-v3/src/Makefile.in b/libstdc++-v3/src/Makefile.in index 6fa8cd3dc7e..3e08e1d9e30 100644 --- a/libstdc++-v3/src/Makefile.in +++ b/libstdc++-v3/src/Makefile.in @@ -558,7 +558,7 @@ libstdc++.INC: Makefile mv tmp-$@ $@ tmp-libstdc++.INC: Makefile - echo -I$(top_builddir) $(INCLUDES) > $@ + echo $(INCLUDES) > $@ # Tell versions [3.59,3.63) of GNU make to not export all variables. # Otherwise a system limit (for SysV at least) may be exceeded. -- 2.30.2