configure.in: Add support for hpux cross compiles...

2001-12-03  Steve Ellcey  <sje@cup.hp.com>

        * libstdc++-v3/configure.in: Add support for hpux cross compiles,
        combine common linux/hpux/generic cross compile support to reduce
        redundent lines.
        * libstdc++-v3/configure: Regenerate.

From-SVN: r47564

libstdc++-v3/ChangeLog

@@ -1,3 +1,10 @@
+2001-12-03  Steve Ellcey  <sje@cup.hp.com>
+
+        * libstdc++-v3/configure.in: Add support for hpux cross compiles,
+        combine common linux/hpux/generic cross compile support to reduce
+        redundent lines.
+        * libstdc++-v3/configure: Regenerate.
+
 2001-12-03  Loren J. Rittle  <ljrittle@acm.org>
 
 	* docs/html/ext/howto.html: Update commentary.

libstdc++-v3/aclocal.m4

@@ -1,6 +1,6 @@
-dnl aclocal.m4 generated automatically by aclocal 1.4
+dnl aclocal.m4 generated automatically by aclocal 1.4-p5
 
-dnl Copyright (C) 1994, 1995-8, 1999 Free Software Foundation, Inc.
+dnl Copyright (C) 1994, 1995-8, 1999, 2001 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
@@ -1965,12 +1965,30 @@ fi
 
 
 
+#serial 1
+# This test replaces the one in autoconf.
+# Currently this macro should have the same name as the autoconf macro
+# because gettext's gettext.m4 (distributed in the automake package)
+# still uses it.  Otherwise, the use in gettext.m4 makes autoheader
+# give these diagnostics:
+#   configure.in:556: AC_TRY_COMPILE was called before AC_ISC_POSIX
+#   configure.in:556: AC_TRY_RUN was called before AC_ISC_POSIX
+
+undefine([AC_ISC_POSIX])
+
+AC_DEFUN([AC_ISC_POSIX],
+  [
+    dnl This test replaces the obsolescent AC_ISC_POSIX kludge.
+    AC_CHECK_LIB(cposix, strerror, [LIBS="$LIBS -lcposix"])
+  ]
+)
+
 # Add --enable-maintainer-mode option to configure.
 # From Jim Meyering
 
 # serial 1
 
-AC_DEFUN(AM_MAINTAINER_MODE,
+AC_DEFUN([AM_MAINTAINER_MODE],
 [AC_MSG_CHECKING([whether to enable maintainer-specific portions of Makefiles])
   dnl maintainer-mode is disabled by default
   AC_ARG_ENABLE(maintainer-mode,
@@ -1987,7 +2005,7 @@ AC_DEFUN(AM_MAINTAINER_MODE,
 
 # Define a conditional.
 
-AC_DEFUN(AM_CONDITIONAL,
+AC_DEFUN([AM_CONDITIONAL],
 [AC_SUBST($1_TRUE)
 AC_SUBST($1_FALSE)
 if $2; then
@@ -2001,14 +2019,42 @@ fi])
 # Macro to add for using GNU gettext.
 # Ulrich Drepper <drepper@cygnus.com>, 1995.
 #
-# This file file be copied and used freely without restrictions.  It can
+# This file can be copied and used freely without restrictions.  It can
 # be used in projects which are not available under the GNU Public License
 # but which still want to provide support for the GNU gettext functionality.
 # Please note that the actual code is *not* freely available.
 
-# serial 3
+# serial 9
 
-AC_DEFUN(AM_WITH_NLS,
+dnl Usage: AM_WITH_NLS([TOOLSYMBOL], [NEEDSYMBOL], [LIBDIR]).
+dnl If TOOLSYMBOL is specified and is 'use-libtool', then a libtool library
+dnl    $(top_builddir)/intl/libintl.la will be created (shared and/or static,
+dnl    depending on --{enable,disable}-{shared,static} and on the presence of
+dnl    AM-DISABLE-SHARED). Otherwise, a static library
+dnl    $(top_builddir)/intl/libintl.a will be created.
+dnl If NEEDSYMBOL is specified and is 'need-ngettext', then GNU gettext
+dnl    implementations (in libc or libintl) without the ngettext() function
+dnl    will be ignored.
+dnl LIBDIR is used to find the intl libraries.  If empty,
+dnl    the value `$(top_builddir)/intl/' is used.
+dnl
+dnl The result of the configuration is one of three cases:
+dnl 1) GNU gettext, as included in the intl subdirectory, will be compiled
+dnl    and used.
+dnl    Catalog format: GNU --> install in $(datadir)
+dnl    Catalog extension: .mo after installation, .gmo in source tree
+dnl 2) GNU gettext has been found in the system's C library.
+dnl    Catalog format: GNU --> install in $(datadir)
+dnl    Catalog extension: .mo after installation, .gmo in source tree
+dnl 3) No internationalization, always use English msgid.
+dnl    Catalog format: none
+dnl    Catalog extension: none
+dnl The use of .gmo is historical (it was needed to avoid overwriting the
+dnl GNU format catalogs when building on a platform with an X/Open gettext),
+dnl but we keep it in order not to force irrelevant filename changes on the
+dnl maintainers.
+dnl
+AC_DEFUN([AM_WITH_NLS],
   [AC_MSG_CHECKING([whether NLS is requested])
     dnl Default is enabled NLS
     AC_ARG_ENABLE(nls,
@@ -2017,11 +2063,15 @@ AC_DEFUN(AM_WITH_NLS,
     AC_MSG_RESULT($USE_NLS)
     AC_SUBST(USE_NLS)
 
+    BUILD_INCLUDED_LIBINTL=no
     USE_INCLUDED_LIBINTL=no
+    INTLLIBS=
 
     dnl If we use NLS figure out what method
     if test "$USE_NLS" = "yes"; then
-      AC_DEFINE(ENABLE_NLS)
+      AC_DEFINE(ENABLE_NLS, 1,
+        [Define to 1 if translation of program messages to the user's native language
+   is requested.])
       AC_MSG_CHECKING([whether included gettext is requested])
       AC_ARG_WITH(included-gettext,
         [  --with-included-gettext use the GNU gettext library included here],
@@ -2032,85 +2082,74 @@ AC_DEFUN(AM_WITH_NLS,
       nls_cv_use_gnu_gettext="$nls_cv_force_use_gnu_gettext"
       if test "$nls_cv_force_use_gnu_gettext" != "yes"; then
         dnl User does not insist on using GNU NLS library.  Figure out what
-        dnl to use.  If gettext or catgets are available (in this order) we
+        dnl to use.  If GNU gettext is available we use this.  Else we have
-        dnl use this.  Else we have to fall back to GNU NLS library.
+        dnl to fall back to GNU NLS library.
-	dnl catgets is only used if permitted by option --with-catgets.
-	nls_cv_header_intl=
-	nls_cv_header_libgt=
 	CATOBJEXT=NONE
 
-	AC_CHECK_HEADER(libintl.h,
+        dnl Add a version number to the cache macros.
-	  [AC_CACHE_CHECK([for gettext in libc], gt_cv_func_gettext_libc,
+        define(gt_cv_func_gnugettext_libc, [gt_cv_func_gnugettext]ifelse([$2], need-ngettext, 2, 1)[_libc])
-	    [AC_TRY_LINK([#include <libintl.h>], [return (int) gettext ("")],
+        define(gt_cv_func_gnugettext_libintl, [gt_cv_func_gnugettext]ifelse([$2], need-ngettext, 2, 1)[_libintl])
-	       gt_cv_func_gettext_libc=yes, gt_cv_func_gettext_libc=no)])
 
-	   if test "$gt_cv_func_gettext_libc" != "yes"; then
+	AC_CHECK_HEADER(libintl.h,
-	     AC_CHECK_LIB(intl, bindtextdomain,
+	  [AC_CACHE_CHECK([for GNU gettext in libc], gt_cv_func_gnugettext_libc,
-	       [AC_CACHE_CHECK([for gettext in libintl],
+	    [AC_TRY_LINK([#include <libintl.h>
-		 gt_cv_func_gettext_libintl,
+extern int _nl_msg_cat_cntr;],
-		 [AC_TRY_LINK([], [return (int) gettext ("")],
+	       [bindtextdomain ("", "");
-		 gt_cv_func_gettext_libintl=yes,
+return (int) gettext ("")]ifelse([$2], need-ngettext, [ + (int) ngettext ("", "", 0)], [])[ + _nl_msg_cat_cntr],
-		 gt_cv_func_gettext_libintl=no)])])
+	       gt_cv_func_gnugettext_libc=yes,
+	       gt_cv_func_gnugettext_libc=no)])
+
+	   if test "$gt_cv_func_gnugettext_libc" != "yes"; then
+	     AC_CACHE_CHECK([for GNU gettext in libintl],
+	       gt_cv_func_gnugettext_libintl,
+	       [gt_save_LIBS="$LIBS"
+		LIBS="$LIBS -lintl $LIBICONV"
+		AC_TRY_LINK([#include <libintl.h>
+extern int _nl_msg_cat_cntr;],
+		  [bindtextdomain ("", "");
+return (int) gettext ("")]ifelse([$2], need-ngettext, [ + (int) ngettext ("", "", 0)], [])[ + _nl_msg_cat_cntr],
+		  gt_cv_func_gnugettext_libintl=yes,
+		  gt_cv_func_gnugettext_libintl=no)
+		LIBS="$gt_save_LIBS"])
 	   fi
 
-	   if test "$gt_cv_func_gettext_libc" = "yes" \
+	   dnl If an already present or preinstalled GNU gettext() is found,
-	      || test "$gt_cv_func_gettext_libintl" = "yes"; then
+	   dnl use it.  But if this macro is used in GNU gettext, and GNU
-	      AC_DEFINE(HAVE_GETTEXT)
+	   dnl gettext is already preinstalled in libintl, we update this
-	      AM_PATH_PROG_WITH_TEST(MSGFMT, msgfmt,
+	   dnl libintl.  (Cf. the install rule in intl/Makefile.in.)
-		[test -z "`$ac_dir/$ac_word -h 2>&1 | grep 'dv '`"], no)dnl
+	   if test "$gt_cv_func_gnugettext_libc" = "yes" \
-	      if test "$MSGFMT" != "no"; then
+	      || { test "$gt_cv_func_gnugettext_libintl" = "yes" \
-		AC_CHECK_FUNCS(dcgettext)
+		   && test "$PACKAGE" != gettext; }; then
-		AC_PATH_PROG(GMSGFMT, gmsgfmt, $MSGFMT)
+	     AC_DEFINE(HAVE_GETTEXT, 1,
-		AM_PATH_PROG_WITH_TEST(XGETTEXT, xgettext,
+               [Define if the GNU gettext() function is already present or preinstalled.])
-		  [test -z "`$ac_dir/$ac_word -h 2>&1 | grep '(HELP)'`"], :)
+
-		AC_TRY_LINK(, [extern int _nl_msg_cat_cntr;
+	     if test "$gt_cv_func_gnugettext_libintl" = "yes"; then
-			       return _nl_msg_cat_cntr],
+	       dnl If iconv() is in a separate libiconv library, then anyone
-		  [CATOBJEXT=.gmo
+	       dnl linking with libintl{.a,.so} also needs to link with
-		   DATADIRNAME=share],
+	       dnl libiconv.
-		  [CATOBJEXT=.mo
+	       INTLLIBS="-lintl $LIBICONV"
-		   DATADIRNAME=lib])
+	     fi
-		INSTOBJEXT=.mo
+
-	      fi
+	     gt_save_LIBS="$LIBS"
-	    fi
+	     LIBS="$LIBS $INTLLIBS"
+	     AC_CHECK_FUNCS(dcgettext)
+	     LIBS="$gt_save_LIBS"
+
+	     AM_PATH_PROG_WITH_TEST(MSGFMT, msgfmt,
+	       [test -z "`$ac_dir/$ac_word -h 2>&1 | grep 'dv '`"], no)dnl
+	     if test "$MSGFMT" != "no"; then
+	       AC_PATH_PROG(GMSGFMT, gmsgfmt, $MSGFMT)
+	     fi
+
+	     AM_PATH_PROG_WITH_TEST(XGETTEXT, xgettext,
+	       [test -z "`$ac_dir/$ac_word -h 2>&1 | grep '(HELP)'`"], :)
+
+	     CATOBJEXT=.gmo
+	   fi
 	])
 
         if test "$CATOBJEXT" = "NONE"; then
-	  AC_MSG_CHECKING([whether catgets can be used])
+	  dnl GNU gettext is not found in the C library.
-	  AC_ARG_WITH(catgets,
-	    [  --with-catgets          use catgets functions if available],
-	    nls_cv_use_catgets=$withval, nls_cv_use_catgets=no)
-	  AC_MSG_RESULT($nls_cv_use_catgets)
-
-	  if test "$nls_cv_use_catgets" = "yes"; then
-	    dnl No gettext in C library.  Try catgets next.
-	    AC_CHECK_LIB(i, main)
-	    AC_CHECK_FUNC(catgets,
-	      [AC_DEFINE(HAVE_CATGETS)
-	       INTLOBJS="\$(CATOBJS)"
-	       AC_PATH_PROG(GENCAT, gencat, no)dnl
-	       if test "$GENCAT" != "no"; then
-		 AC_PATH_PROG(GMSGFMT, gmsgfmt, no)
-		 if test "$GMSGFMT" = "no"; then
-		   AM_PATH_PROG_WITH_TEST(GMSGFMT, msgfmt,
-		    [test -z "`$ac_dir/$ac_word -h 2>&1 | grep 'dv '`"], no)
-		 fi
-		 AM_PATH_PROG_WITH_TEST(XGETTEXT, xgettext,
-		   [test -z "`$ac_dir/$ac_word -h 2>&1 | grep '(HELP)'`"], :)
-		 USE_INCLUDED_LIBINTL=yes
-		 CATOBJEXT=.cat
-		 INSTOBJEXT=.cat
-		 DATADIRNAME=lib
-		 INTLDEPS='$(top_builddir)/intl/libintl.a'
-		 INTLLIBS=$INTLDEPS
-		 LIBS=`echo $LIBS | sed -e 's/-lintl//'`
-		 nls_cv_header_intl=intl/libintl.h
-		 nls_cv_header_libgt=intl/libgettext.h
-	       fi])
-	  fi
-        fi
-
-        if test "$CATOBJEXT" = "NONE"; then
-	  dnl Neither gettext nor catgets in included in the C library.
 	  dnl Fall back on GNU gettext library.
 	  nls_cv_use_gnu_gettext=yes
         fi
@@ -2125,15 +2164,11 @@ AC_DEFUN(AM_WITH_NLS,
         AM_PATH_PROG_WITH_TEST(XGETTEXT, xgettext,
 	  [test -z "`$ac_dir/$ac_word -h 2>&1 | grep '(HELP)'`"], :)
         AC_SUBST(MSGFMT)
+	BUILD_INCLUDED_LIBINTL=yes
 	USE_INCLUDED_LIBINTL=yes
         CATOBJEXT=.gmo
-        INSTOBJEXT=.mo
+	INTLLIBS="ifelse([$3],[],\$(top_builddir)/intl,[$3])/libintl.ifelse([$1], use-libtool, [l], [])a $LIBICONV"
-        DATADIRNAME=share
+	LIBS=`echo " $LIBS " | sed -e 's/ -lintl / /' -e 's/^ //' -e 's/ $//'`
-	INTLDEPS='$(top_builddir)/intl/libintl.a'
-	INTLLIBS=$INTLDEPS
-	LIBS=`echo $LIBS | sed -e 's/-lintl//'`
-        nls_cv_header_intl=intl/libintl.h
-        nls_cv_header_libgt=intl/libgettext.h
       fi
 
       dnl Test whether we really found GNU xgettext.
@@ -2144,24 +2179,78 @@ AC_DEFUN(AM_WITH_NLS,
 	  : ;
 	else
 	  AC_MSG_RESULT(
-	    [found xgettext programs is not GNU xgettext; ignore it])
+	    [found xgettext program is not GNU xgettext; ignore it])
 	  XGETTEXT=":"
 	fi
       fi
 
-      # We need to process the po/ directory.
+      dnl We need to process the po/ directory.
       POSUB=po
-    else
+    fi
-      DATADIRNAME=share
+    AC_OUTPUT_COMMANDS(
-      nls_cv_header_intl=intl/libintl.h
+     [for ac_file in $CONFIG_FILES; do
-      nls_cv_header_libgt=intl/libgettext.h
+        # Support "outfile[:infile[:infile...]]"
+        case "$ac_file" in
+          *:*) ac_file=`echo "$ac_file"|sed 's%:.*%%'` ;;
+        esac
+        # PO directories have a Makefile.in generated from Makefile.in.in.
+        case "$ac_file" in */Makefile.in)
+          # Adjust a relative srcdir.
+          ac_dir=`echo "$ac_file"|sed 's%/[^/][^/]*$%%'`
+          ac_dir_suffix="/`echo "$ac_dir"|sed 's%^\./%%'`"
+          ac_dots=`echo "$ac_dir_suffix"|sed 's%/[^/]*%../%g'`
+          case "$ac_given_srcdir" in
+            .)  top_srcdir=`echo $ac_dots|sed 's%/$%%'` ;;
+            /*) top_srcdir="$ac_given_srcdir" ;;
+            *)  top_srcdir="$ac_dots$ac_given_srcdir" ;;
+          esac
+          if test -f "$ac_given_srcdir/$ac_dir/POTFILES.in"; then
+            rm -f "$ac_dir/POTFILES"
+            echo creating "$ac_dir/POTFILES"
+            sed -e "/^#/d" -e "/^[ 	]*\$/d" -e "s,.*,     $top_srcdir/& \\\\," -e "\$s/\(.*\) \\\\/\1/" < "$ac_given_srcdir/$ac_dir/POTFILES.in" > "$ac_dir/POTFILES"
+            echo creating "$ac_dir/Makefile"
+            sed -e "/POTFILES =/r $ac_dir/POTFILES" "$ac_dir/Makefile.in" > "$ac_dir/Makefile"
+          fi
+          ;;
+        esac
+      done])
+
+
+    dnl If this is used in GNU gettext we have to set BUILD_INCLUDED_LIBINTL
+    dnl to 'yes' because some of the testsuite requires it.
+    if test "$PACKAGE" = gettext; then
+      BUILD_INCLUDED_LIBINTL=yes
     fi
 
-    # If this is used in GNU gettext we have to set USE_NLS to `yes'
+    dnl intl/plural.c is generated from intl/plural.y. It requires bison,
-    # because some of the sources are only built for this goal.
+    dnl because plural.y uses bison specific features. It requires at least
-    if test "$PACKAGE" = gettext; then
+    dnl bison-1.26 because earlier versions generate a plural.c that doesn't
-      USE_NLS=yes
+    dnl compile.
-      USE_INCLUDED_LIBINTL=yes
+    dnl bison is only needed for the maintainer (who touches plural.y). But in
+    dnl order to avoid separate Makefiles or --enable-maintainer-mode, we put
+    dnl the rule in general Makefile. Now, some people carelessly touch the
+    dnl files or have a broken "make" program, hence the plural.c rule will
+    dnl sometimes fire. To avoid an error, defines BISON to ":" if it is not
+    dnl present or too old.
+    AC_CHECK_PROGS([INTLBISON], [bison])
+    if test -z "$INTLBISON"; then
+      ac_verc_fail=yes
+    else
+      dnl Found it, now check the version.
+      AC_MSG_CHECKING([version of bison])
+changequote(<<,>>)dnl
+      ac_prog_version=`$INTLBISON --version 2>&1 | sed -n 's/^.*GNU Bison .* \([0-9]*\.[0-9.]*\).*$/\1/p'`
+      case $ac_prog_version in
+        '') ac_prog_version="v. ?.??, bad"; ac_verc_fail=yes;;
+        1.2[6-9]* | 1.[3-9][0-9]* | [2-9].*)
+changequote([,])dnl
+           ac_prog_version="$ac_prog_version, ok"; ac_verc_fail=no;;
+        *) ac_prog_version="$ac_prog_version, bad"; ac_verc_fail=yes;;
+      esac
+      AC_MSG_RESULT([$ac_prog_version])
+    fi
+    if test $ac_verc_fail = yes; then
+      INTLBISON=:
     fi
 
     dnl These rules are solely for the distribution goal.  While doing this
@@ -2173,22 +2262,38 @@ AC_DEFUN(AM_WITH_NLS,
     done
 
     dnl Make all variables we use known to autoconf.
+    AC_SUBST(BUILD_INCLUDED_LIBINTL)
     AC_SUBST(USE_INCLUDED_LIBINTL)
     AC_SUBST(CATALOGS)
     AC_SUBST(CATOBJEXT)
-    AC_SUBST(DATADIRNAME)
     AC_SUBST(GMOFILES)
-    AC_SUBST(INSTOBJEXT)
-    AC_SUBST(INTLDEPS)
     AC_SUBST(INTLLIBS)
     AC_SUBST(INTLOBJS)
     AC_SUBST(POFILES)
     AC_SUBST(POSUB)
+
+    dnl For backward compatibility. Some configure.ins may be using this.
+    nls_cv_header_intl=
+    nls_cv_header_libgt=
+
+    dnl For backward compatibility. Some Makefiles may be using this.
+    DATADIRNAME=share
+    AC_SUBST(DATADIRNAME)
+
+    dnl For backward compatibility. Some Makefiles may be using this.
+    INSTOBJEXT=.mo
+    AC_SUBST(INSTOBJEXT)
+
+    dnl For backward compatibility. Some Makefiles may be using this.
+    GENCAT=gencat
+    AC_SUBST(GENCAT)
   ])
 
-AC_DEFUN(AM_GNU_GETTEXT,
+dnl Usage: Just like AM_WITH_NLS, which see.
+AC_DEFUN([AM_GNU_GETTEXT],
   [AC_REQUIRE([AC_PROG_MAKE_SET])dnl
    AC_REQUIRE([AC_PROG_CC])dnl
+   AC_REQUIRE([AC_CANONICAL_HOST])dnl
    AC_REQUIRE([AC_PROG_RANLIB])dnl
    AC_REQUIRE([AC_ISC_POSIX])dnl
    AC_REQUIRE([AC_HEADER_STDC])dnl
@@ -2198,21 +2303,18 @@ AC_DEFUN(AM_GNU_GETTEXT,
    AC_REQUIRE([AC_TYPE_SIZE_T])dnl
    AC_REQUIRE([AC_FUNC_ALLOCA])dnl
    AC_REQUIRE([AC_FUNC_MMAP])dnl
+   AC_REQUIRE([jm_GLIBC21])dnl
 
-   AC_CHECK_HEADERS([argz.h limits.h locale.h nl_types.h malloc.h string.h \
+   AC_CHECK_HEADERS([argz.h limits.h locale.h nl_types.h malloc.h stddef.h \
-unistd.h values.h sys/param.h])
+stdlib.h string.h unistd.h sys/param.h])
-   AC_CHECK_FUNCS([getcwd munmap putenv setenv setlocale strchr strcasecmp \
+   AC_CHECK_FUNCS([feof_unlocked fgets_unlocked getcwd getegid geteuid \
-__argz_count __argz_stringify __argz_next])
+getgid getuid mempcpy munmap putenv setenv setlocale stpcpy strchr strcasecmp \
-
+strdup strtoul tsearch __argz_count __argz_stringify __argz_next])
-   if test "${ac_cv_func_stpcpy+set}" != "set"; then
-     AC_CHECK_FUNCS(stpcpy)
-   fi
-   if test "${ac_cv_func_stpcpy}" = "yes"; then
-     AC_DEFINE(HAVE_STPCPY)
-   fi
 
+   AM_ICONV
+   AM_LANGINFO_CODESET
    AM_LC_MESSAGES
-   AM_WITH_NLS
+   AM_WITH_NLS([$1],[$2],[$3])
 
    if test "x$CATOBJEXT" != "x"; then
      if test "x$ALL_LINGUAS" = "x"; then
@@ -2220,10 +2322,21 @@ __argz_count __argz_stringify __argz_next])
      else
        AC_MSG_CHECKING(for catalogs to be installed)
        NEW_LINGUAS=
-       for lang in ${LINGUAS=$ALL_LINGUAS}; do
+       for presentlang in $ALL_LINGUAS; do
-         case "$ALL_LINGUAS" in
+         useit=no
-          *$lang*) NEW_LINGUAS="$NEW_LINGUAS $lang" ;;
+         for desiredlang in ${LINGUAS-$ALL_LINGUAS}; do
-         esac
+           # Use the presentlang catalog if desiredlang is
+           #   a. equal to presentlang, or
+           #   b. a variant of presentlang (because in this case,
+           #      presentlang can be used as a fallback for messages
+           #      which are not translated in the desiredlang catalog).
+           case "$desiredlang" in
+             "$presentlang"*) useit=yes;;
+           esac
+         done
+         if test $useit = yes; then
+           NEW_LINGUAS="$NEW_LINGUAS $presentlang"
+         fi
        done
        LINGUAS=$NEW_LINGUAS
        AC_MSG_RESULT($LINGUAS)
@@ -2235,47 +2348,8 @@ __argz_count __argz_stringify __argz_next])
      fi
    fi
 
-   dnl The reference to <locale.h> in the installed <libintl.h> file
-   dnl must be resolved because we cannot expect the users of this
-   dnl to define HAVE_LOCALE_H.
-   if test $ac_cv_header_locale_h = yes; then
-     INCLUDE_LOCALE_H="#include <locale.h>"
-   else
-     INCLUDE_LOCALE_H="\
-/* The system does not provide the header <locale.h>.  Take care yourself.  */"
-   fi
-   AC_SUBST(INCLUDE_LOCALE_H)
-
-   dnl Determine which catalog format we have (if any is needed)
-   dnl For now we know about two different formats:
-   dnl   Linux libc-5 and the normal X/Open format
-   test -d intl || mkdir intl
-   if test "$CATOBJEXT" = ".cat"; then
-     AC_CHECK_HEADER(linux/version.h, msgformat=linux, msgformat=xopen)
-
-     dnl Transform the SED scripts while copying because some dumb SEDs
-     dnl cannot handle comments.
-     sed -e '/^#/d' $srcdir/intl/$msgformat-msg.sed > intl/po2msg.sed
-   fi
-   dnl po2tbl.sed is always needed.
-   sed -e '/^#.*[^\\]$/d' -e '/^#$/d' \
-     $srcdir/intl/po2tbl.sed.in > intl/po2tbl.sed
-
-   dnl In the intl/Makefile.in we have a special dependency which makes
-   dnl only sense for gettext.  We comment this out for non-gettext
-   dnl packages.
-   if test "$PACKAGE" = "gettext"; then
-     GT_NO="#NO#"
-     GT_YES=
-   else
-     GT_NO=
-     GT_YES="#YES#"
-   fi
-   AC_SUBST(GT_NO)
-   AC_SUBST(GT_YES)
-
    dnl If the AC_CONFIG_AUX_DIR macro for autoconf is used we possibly
-   dnl find the mkinstalldirs script in another subdir but ($top_srcdir).
+   dnl find the mkinstalldirs script in another subdir but $(top_srcdir).
    dnl Try to locate is.
    MKINSTALLDIRS=
    if test -n "$ac_aux_dir"; then
@@ -2286,31 +2360,15 @@ __argz_count __argz_stringify __argz_next])
    fi
    AC_SUBST(MKINSTALLDIRS)
 
-   dnl *** For now the libtool support in intl/Makefile is not for real.
+   dnl Enable libtool support if the surrounding package wishes it.
-   l=
+   INTL_LIBTOOL_SUFFIX_PREFIX=ifelse([$1], use-libtool, [l], [])
-   AC_SUBST(l)
+   AC_SUBST(INTL_LIBTOOL_SUFFIX_PREFIX)
-
-   dnl Generate list of files to be processed by xgettext which will
-   dnl be included in po/Makefile.
-   test -d po || mkdir po
-   if test "x$srcdir" != "x."; then
-     if test "x`echo $srcdir | sed 's@/.*@@'`" = "x"; then
-       posrcprefix="$srcdir/"
-     else
-       posrcprefix="../$srcdir/"
-     fi
-   else
-     posrcprefix="../"
-   fi
-   rm -f po/POTFILES
-   sed -e "/^#/d" -e "/^\$/d" -e "s,.*,	$posrcprefix& \\\\," -e "\$s/\(.*\) \\\\/\1/" \
-	< $srcdir/po/POTFILES.in > po/POTFILES
   ])
 
 # Search path for a program which passes the given test.
 # Ulrich Drepper <drepper@cygnus.com>, 1996.
 #
-# This file file be copied and used freely without restrictions.  It can
+# This file can be copied and used freely without restrictions.  It can
 # be used in projects which are not available under the GNU Public License
 # but which still want to provide support for the GNU gettext functionality.
 # Please note that the actual code is *not* freely available.
@@ -2319,7 +2377,7 @@ __argz_count __argz_stringify __argz_next])
 
 dnl AM_PATH_PROG_WITH_TEST(VARIABLE, PROG-TO-CHECK-FOR,
 dnl   TEST-PERFORMED-ON-FOUND_PROGRAM [, VALUE-IF-NOT-FOUND [, PATH]])
-AC_DEFUN(AM_PATH_PROG_WITH_TEST,
+AC_DEFUN([AM_PATH_PROG_WITH_TEST],
 [# Extract the first word of "$2", so it can be a program name with args.
 set dummy $2; ac_word=[$]2
 AC_MSG_CHECKING([for $ac_word])
@@ -2355,24 +2413,139 @@ fi
 AC_SUBST($1)dnl
 ])
 
+#serial 2
+
+# Test for the GNU C Library, version 2.1 or newer.
+# From Bruno Haible.
+
+AC_DEFUN([jm_GLIBC21],
+  [
+    AC_CACHE_CHECK(whether we are using the GNU C Library 2.1 or newer,
+      ac_cv_gnu_library_2_1,
+      [AC_EGREP_CPP([Lucky GNU user],
+	[
+#include <features.h>
+#ifdef __GNU_LIBRARY__
+ #if (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 1) || (__GLIBC__ > 2)
+  Lucky GNU user
+ #endif
+#endif
+	],
+	ac_cv_gnu_library_2_1=yes,
+	ac_cv_gnu_library_2_1=no)
+      ]
+    )
+    AC_SUBST(GLIBC21)
+    GLIBC21="$ac_cv_gnu_library_2_1"
+  ]
+)
+
+#serial AM2
+
+dnl From Bruno Haible.
+
+AC_DEFUN([AM_ICONV],
+[
+  dnl Some systems have iconv in libc, some have it in libiconv (OSF/1 and
+  dnl those with the standalone portable GNU libiconv installed).
+
+  AC_ARG_WITH([libiconv-prefix],
+[  --with-libiconv-prefix=DIR  search for libiconv in DIR/include and DIR/lib], [
+    for dir in `echo "$withval" | tr : ' '`; do
+      if test -d $dir/include; then CPPFLAGS="$CPPFLAGS -I$dir/include"; fi
+      if test -d $dir/lib; then LDFLAGS="$LDFLAGS -L$dir/lib"; fi
+    done
+   ])
+
+  AC_CACHE_CHECK(for iconv, am_cv_func_iconv, [
+    am_cv_func_iconv="no, consider installing GNU libiconv"
+    am_cv_lib_iconv=no
+    AC_TRY_LINK([#include <stdlib.h>
+#include <iconv.h>],
+      [iconv_t cd = iconv_open("","");
+       iconv(cd,NULL,NULL,NULL,NULL);
+       iconv_close(cd);],
+      am_cv_func_iconv=yes)
+    if test "$am_cv_func_iconv" != yes; then
+      am_save_LIBS="$LIBS"
+      LIBS="$LIBS -liconv"
+      AC_TRY_LINK([#include <stdlib.h>
+#include <iconv.h>],
+        [iconv_t cd = iconv_open("","");
+         iconv(cd,NULL,NULL,NULL,NULL);
+         iconv_close(cd);],
+        am_cv_lib_iconv=yes
+        am_cv_func_iconv=yes)
+      LIBS="$am_save_LIBS"
+    fi
+  ])
+  if test "$am_cv_func_iconv" = yes; then
+    AC_DEFINE(HAVE_ICONV, 1, [Define if you have the iconv() function.])
+    AC_MSG_CHECKING([for iconv declaration])
+    AC_CACHE_VAL(am_cv_proto_iconv, [
+      AC_TRY_COMPILE([
+#include <stdlib.h>
+#include <iconv.h>
+extern
+#ifdef __cplusplus
+"C"
+#endif
+#if defined(__STDC__) || defined(__cplusplus)
+size_t iconv (iconv_t cd, char * *inbuf, size_t *inbytesleft, char * *outbuf, size_t *outbytesleft);
+#else
+size_t iconv();
+#endif
+], [], am_cv_proto_iconv_arg1="", am_cv_proto_iconv_arg1="const")
+      am_cv_proto_iconv="extern size_t iconv (iconv_t cd, $am_cv_proto_iconv_arg1 char * *inbuf, size_t *inbytesleft, char * *outbuf, size_t *outbytesleft);"])
+    am_cv_proto_iconv=`echo "[$]am_cv_proto_iconv" | tr -s ' ' | sed -e 's/( /(/'`
+    AC_MSG_RESULT([$]{ac_t:-
+         }[$]am_cv_proto_iconv)
+    AC_DEFINE_UNQUOTED(ICONV_CONST, $am_cv_proto_iconv_arg1,
+      [Define as const if the declaration of iconv() needs const.])
+  fi
+  LIBICONV=
+  if test "$am_cv_lib_iconv" = yes; then
+    LIBICONV="-liconv"
+  fi
+  AC_SUBST(LIBICONV)
+])
+
+#serial AM1
+
+dnl From Bruno Haible.
+
+AC_DEFUN([AM_LANGINFO_CODESET],
+[
+  AC_CACHE_CHECK([for nl_langinfo and CODESET], am_cv_langinfo_codeset,
+    [AC_TRY_LINK([#include <langinfo.h>],
+      [char* cs = nl_langinfo(CODESET);],
+      am_cv_langinfo_codeset=yes,
+      am_cv_langinfo_codeset=no)
+    ])
+  if test $am_cv_langinfo_codeset = yes; then
+    AC_DEFINE(HAVE_LANGINFO_CODESET, 1,
+      [Define if you have <langinfo.h> and nl_langinfo(CODESET).])
+  fi
+])
+
 # Check whether LC_MESSAGES is available in <locale.h>.
 # Ulrich Drepper <drepper@cygnus.com>, 1995.
 #
-# This file file be copied and used freely without restrictions.  It can
+# This file can be copied and used freely without restrictions.  It can
 # be used in projects which are not available under the GNU Public License
 # but which still want to provide support for the GNU gettext functionality.
 # Please note that the actual code is *not* freely available.
 
-# serial 1
+# serial 2
 
-AC_DEFUN(AM_LC_MESSAGES,
+AC_DEFUN([AM_LC_MESSAGES],
   [if test $ac_cv_header_locale_h = yes; then
     AC_CACHE_CHECK([for LC_MESSAGES], am_cv_val_LC_MESSAGES,
       [AC_TRY_LINK([#include <locale.h>], [return LC_MESSAGES],
        am_cv_val_LC_MESSAGES=yes, am_cv_val_LC_MESSAGES=no)])
     if test $am_cv_val_LC_MESSAGES = yes; then
       AC_DEFINE(HAVE_LC_MESSAGES, 1,
-		[Define if your locale.h file contains LC_MESSAGES.])
+        [Define if your <locale.h> file defines LC_MESSAGES.])
     fi
   fi])
 
@@ -2385,7 +2558,7 @@ AC_DEFUN(AM_LC_MESSAGES,
 dnl Usage:
 dnl AM_INIT_AUTOMAKE(package,version, [no-define])
 
-AC_DEFUN(AM_INIT_AUTOMAKE,
+AC_DEFUN([AM_INIT_AUTOMAKE],
 [AC_REQUIRE([AC_PROG_INSTALL])
 PACKAGE=[$1]
 AC_SUBST(PACKAGE)
@@ -2413,7 +2586,7 @@ AC_REQUIRE([AC_PROG_MAKE_SET])])
 # Check to make sure that the build environment is sane.
 #
 
-AC_DEFUN(AM_SANITY_CHECK,
+AC_DEFUN([AM_SANITY_CHECK],
 [AC_MSG_CHECKING([whether build environment is sane])
 # Just in case
 sleep 1
@@ -2454,7 +2627,7 @@ AC_MSG_RESULT(yes)])
 
 dnl AM_MISSING_PROG(NAME, PROGRAM, DIRECTORY)
 dnl The program must properly implement --version.
-AC_DEFUN(AM_MISSING_PROG,
+AC_DEFUN([AM_MISSING_PROG],
 [AC_MSG_CHECKING(for working $2)
 # Run test in a subshell; some versions of sh will print an error if
 # an executable is not found, even if stderr is redirected.
@@ -2470,7 +2643,7 @@ AC_SUBST($1)])
 
 # Like AC_CONFIG_HEADER, but automatically create stamp file.
 
-AC_DEFUN(AM_CONFIG_HEADER,
+AC_DEFUN([AM_CONFIG_HEADER],
 [AC_PREREQ([2.12])
 AC_CONFIG_HEADER([$1])
 dnl When config.status generates a header, we must update the stamp-h file.

libstdc++-v3/config.h.in

@@ -3,9 +3,6 @@
 /* Define if you have a working `mmap' system call.  */
 #undef HAVE_MMAP
 
-/* Define if you need to in order for stat and other things to work.  */
-#undef _POSIX_SOURCE
-
 // Define if GCC supports weak symbols.
 #undef _GLIBCPP_SUPPORTS_WEAK
 
@@ -696,6 +693,9 @@
 /* Define if you have the <nan.h> header file.  */
 #undef HAVE_NAN_H
 
+/* Define if you have the <stdlib.h> header file.  */
+#undef HAVE_STDLIB_H
+
 /* Define if you have the <sys/isa_defs.h> header file.  */
 #undef HAVE_SYS_ISA_DEFS_H
 
@@ -705,6 +705,9 @@
 /* Define if you have the <sys/resource.h> header file.  */
 #undef HAVE_SYS_RESOURCE_H
 
+/* Define if you have the <sys/stat.h> header file.  */
+#undef HAVE_SYS_STAT_H
+
 /* Define if you have the <sys/types.h> header file.  */
 #undef HAVE_SYS_TYPES_H
 

libstdc++-v3/configure.in

@@ -77,133 +77,128 @@ if test -n "$with_cross_host" || test x"$build" != x"$host"; then
     CANADIAN=no
   fi
 
+  # Construct crosses by hand, eliminating bits that need ld...
+  # GLIBCPP_CHECK_COMPILER_FEATURES
+  # GLIBCPP_CHECK_BUILTIN_MATH_SUPPORT
+  # GLIBCPP_CHECK_MATH_SUPPORT
+
   case "$target_alias" in
     *-linux*)
-	# Construct linux crosses by hand, eliminating bits that need ld...
+      # Check for available headers.
-        # Check for available headers.
+      AC_CHECK_HEADERS([nan.h ieeefp.h endian.h sys/isa_defs.h \
-        AC_CHECK_HEADERS([nan.h ieeefp.h endian.h sys/isa_defs.h \
 	machine/endian.h machine/param.h sys/machine.h sys/types.h \
 	fp.h locale.h float.h inttypes.h])
-
+      SECTION_FLAGS='-ffunction-sections -fdata-sections'
-	# GLIBCPP_CHECK_COMPILER_FEATURES
+      AC_SUBST(SECTION_FLAGS)
-	SECTION_FLAGS='-ffunction-sections -fdata-sections'
+      GLIBCPP_CHECK_LINKER_FEATURES
-	AC_SUBST(SECTION_FLAGS)
+      GLIBCPP_CHECK_COMPLEX_MATH_SUPPORT
-	GLIBCPP_CHECK_LINKER_FEATURES
+      GLIBCPP_CHECK_WCHAR_T_SUPPORT
-	# GLIBCPP_CHECK_BUILTIN_MATH_SUPPORT
+      os_include_dir="config/os/gnu-linux"
-	# GLIBCPP_CHECK_MATH_SUPPORT
+      AC_DEFINE(HAVE_COPYSIGN)
-	AC_DEFINE(HAVE_ACOSF)
+      AC_DEFINE(HAVE_COPYSIGNF)
-	AC_DEFINE(HAVE_ASINF)
+      AC_DEFINE(HAVE_FINITEF)
-	AC_DEFINE(HAVE_ATAN2F)
+      AC_DEFINE(HAVE_FREXPF)
-	AC_DEFINE(HAVE_ATANF)
+      AC_DEFINE(HAVE_HYPOTF)
-	AC_DEFINE(HAVE_CEILF)
+      AC_DEFINE(HAVE_SINCOS)
-	AC_DEFINE(HAVE_COPYSIGN)
+      AC_DEFINE(HAVE_SINCOSF)
-	AC_DEFINE(HAVE_COPYSIGNF)
+      if test x"long_double_math_on_this_cpu" = x"yes"; then
-	AC_DEFINE(HAVE_COSF)
+	AC_DEFINE(HAVE_HYPOTL)
-	AC_DEFINE(HAVE_COSHF)
+      fi
-	AC_DEFINE(HAVE_EXPF)
+      ;;
-	AC_DEFINE(HAVE_FABSF)
+    *-hpux*)
-	AC_DEFINE(HAVE_FINITE)
+      # Check for available headers.
-	AC_DEFINE(HAVE_FINITEF)
+      AC_CHECK_HEADERS([nan.h ieeefp.h endian.h sys/isa_defs.h \
-	AC_DEFINE(HAVE_FLOORF)
+	machine/endian.h machine/param.h sys/machine.h sys/types.h \
-	AC_DEFINE(HAVE_FMODF)
+	fp.h locale.h float.h inttypes.h])
-	AC_DEFINE(HAVE_FREXPF)
+      SECTION_FLAGS='-ffunction-sections -fdata-sections'
-	AC_DEFINE(HAVE_HYPOTF)
+      AC_SUBST(SECTION_FLAGS)
-	AC_DEFINE(HAVE_ISINF)
+      GLIBCPP_CHECK_LINKER_FEATURES
-	AC_DEFINE(HAVE_ISINFF)
+      GLIBCPP_CHECK_COMPLEX_MATH_SUPPORT
-	AC_DEFINE(HAVE_ISNAN)
+      GLIBCPP_CHECK_WCHAR_T_SUPPORT
-	AC_DEFINE(HAVE_ISNANF)
+      os_include_dir="config/os/hpux"
-	AC_DEFINE(HAVE_LDEXPF)
+      AC_DEFINE(HAVE_COPYSIGN)
-	AC_DEFINE(HAVE_LOG10F)
+      AC_DEFINE(HAVE_COPYSIGNF)
-	AC_DEFINE(HAVE_LOGF)
+      AC_DEFINE(HAVE_FINITEF)
-	AC_DEFINE(HAVE_MODFF)
+      AC_DEFINE(HAVE_FREXPF)
-	AC_DEFINE(HAVE_POWF)
+      AC_DEFINE(HAVE_HYPOT)
-	AC_DEFINE(HAVE_SINCOS)
+      AC_DEFINE(HAVE_SINCOS)
-	AC_DEFINE(HAVE_SINCOSF)
+      AC_DEFINE(HAVE_SINCOSF)
-	AC_DEFINE(HAVE_SINF)
+      ;;
-	AC_DEFINE(HAVE_SINHF)
-	AC_DEFINE(HAVE_SQRTF)
-	AC_DEFINE(HAVE_TANF)
-	AC_DEFINE(HAVE_TANHF)
-
-	# At some point, we should differentiate between architectures
-	# like x86, which have long double versions, and alpha/powerpc/etc.,
-	# which don't. For the time being, punt.
-	if test x"long_double_math_on_this_cpu" = x"yes"; then
-	  AC_DEFINE(HAVE_ACOSL)
-	  AC_DEFINE(HAVE_ASINL)
-	  AC_DEFINE(HAVE_ATAN2L)
-	  AC_DEFINE(HAVE_ATANL)
-	  AC_DEFINE(HAVE_CEILL)
-	  AC_DEFINE(HAVE_COPYSIGNL)
-	  AC_DEFINE(HAVE_COSL)
-	  AC_DEFINE(HAVE_COSHL)
-	  AC_DEFINE(HAVE_EXPL)
-	  AC_DEFINE(HAVE_FABSL)
-	  AC_DEFINE(HAVE_FINITEL)
-	  AC_DEFINE(HAVE_FLOORL)
-	  AC_DEFINE(HAVE_FMODL)
-	  AC_DEFINE(HAVE_FREXPL)
-	  AC_DEFINE(HAVE_HYPOTL)
-	  AC_DEFINE(HAVE_ISINFL)
-	  AC_DEFINE(HAVE_ISNANL)
-	  AC_DEFINE(HAVE_LDEXPL)
-	  AC_DEFINE(HAVE_LOG10L)
-	  AC_DEFINE(HAVE_LOGL)
-	  AC_DEFINE(HAVE_MODFL)
-	  AC_DEFINE(HAVE_POWL)
-	  AC_DEFINE(HAVE_SINCOSL)
-	  AC_DEFINE(HAVE_SINL)
-	  AC_DEFINE(HAVE_SINHL)
-	  AC_DEFINE(HAVE_SQRTL)
-	  AC_DEFINE(HAVE_TANL)
-	  AC_DEFINE(HAVE_TANHL)
-	fi
-	GLIBCPP_CHECK_COMPLEX_MATH_SUPPORT
-	GLIBCPP_CHECK_WCHAR_T_SUPPORT
-	os_include_dir="config/os/gnu-linux"
-	# GLIBCPP_CHECK_STDLIB_SUPPORT
-	AC_DEFINE(HAVE_STRTOF)        
-	AC_DEFINE(HAVE_STRTOLD)        
-	# AC_FUNC_MMAP
-	AC_DEFINE(HAVE_MMAP)
-	;;
     *)
-	# We assume newlib. 
+      os_include_dir="config/os/newlib"
-	# GLIBCPP_CHECK_BUILTIN_MATH_SUPPORT
+      AC_DEFINE(HAVE_HYPOT)
-	# GLIBCPP_CHECK_MATH_SUPPORT
+      ;;
-	AC_DEFINE(HAVE_FINITE)
-	AC_DEFINE(HAVE_HYPOT)
-	AC_DEFINE(HAVE_ISNAN)
-	AC_DEFINE(HAVE_ISINF)
-
-	AC_DEFINE(HAVE_ACOSF)
-	AC_DEFINE(HAVE_ASINF)
-	AC_DEFINE(HAVE_ATAN2F)
-	AC_DEFINE(HAVE_ATANF)
-	AC_DEFINE(HAVE_CEILF)
-	AC_DEFINE(HAVE_COSF)
-	AC_DEFINE(HAVE_COSHF)
-	AC_DEFINE(HAVE_EXPF)
-	AC_DEFINE(HAVE_FABSF)
-	AC_DEFINE(HAVE_FLOORF)
-	AC_DEFINE(HAVE_FMODF)
-	AC_DEFINE(HAVE_HYPOTF)
-	AC_DEFINE(HAVE_ISNANF)
-	AC_DEFINE(HAVE_ISINFF)
-	AC_DEFINE(HAVE_LDEXPF)
-	AC_DEFINE(HAVE_LOG10F)
-	AC_DEFINE(HAVE_LOGF)
-	AC_DEFINE(HAVE_MODFF)
-	AC_DEFINE(HAVE_POWF)
-	AC_DEFINE(HAVE_SINF)
-	AC_DEFINE(HAVE_SINHF)
-	AC_DEFINE(HAVE_SQRTF)
-	AC_DEFINE(HAVE_TANF)
-	AC_DEFINE(HAVE_TANHF)
-
-	os_include_dir="config/os/newlib"
-	;;
   esac
+
+  # GLIBCPP_CHECK_STDLIB_SUPPORT
+  AC_DEFINE(HAVE_STRTOF)        
+  AC_DEFINE(HAVE_STRTOLD)        
+  # AC_FUNC_MMAP
+  AC_DEFINE(HAVE_MMAP)
+
+  AC_DEFINE(HAVE_ACOSF)
+  AC_DEFINE(HAVE_ASINF)
+  AC_DEFINE(HAVE_ATAN2F)
+  AC_DEFINE(HAVE_ATANF)
+  AC_DEFINE(HAVE_CEILF)
+  AC_DEFINE(HAVE_COPYSIGN)
+  AC_DEFINE(HAVE_COPYSIGNF)
+  AC_DEFINE(HAVE_COSF)
+  AC_DEFINE(HAVE_COSHF)
+  AC_DEFINE(HAVE_EXPF)
+  AC_DEFINE(HAVE_FABSF)
+  AC_DEFINE(HAVE_FINITE)
+  AC_DEFINE(HAVE_FINITEF)
+  AC_DEFINE(HAVE_FLOORF)
+  AC_DEFINE(HAVE_FMODF)
+  AC_DEFINE(HAVE_FREXPF)
+  AC_DEFINE(HAVE_ISINF)
+  AC_DEFINE(HAVE_ISINFF)
+  AC_DEFINE(HAVE_ISNAN)
+  AC_DEFINE(HAVE_ISNANF)
+  AC_DEFINE(HAVE_LDEXPF)
+  AC_DEFINE(HAVE_LOG10F)
+  AC_DEFINE(HAVE_LOGF)
+  AC_DEFINE(HAVE_MODFF)
+  AC_DEFINE(HAVE_POWF)
+  AC_DEFINE(HAVE_SINF)
+  AC_DEFINE(HAVE_SINHF)
+  AC_DEFINE(HAVE_SQRTF)
+  AC_DEFINE(HAVE_TANF)
+  AC_DEFINE(HAVE_TANHF)
+
+  # At some point, we should differentiate between architectures
+  # like x86, which have long double versions, and alpha/powerpc/etc.,
+  # which don't. For the time being, punt.
+  if test x"long_double_math_on_this_cpu" = x"yes"; then
+    AC_DEFINE(HAVE_ACOSL)
+    AC_DEFINE(HAVE_ASINL)
+    AC_DEFINE(HAVE_ATAN2L)
+    AC_DEFINE(HAVE_ATANL)
+    AC_DEFINE(HAVE_CEILL)
+    AC_DEFINE(HAVE_COPYSIGNL)
+    AC_DEFINE(HAVE_COSL)
+    AC_DEFINE(HAVE_COSHL)
+    AC_DEFINE(HAVE_EXPL)
+    AC_DEFINE(HAVE_FABSL)
+    AC_DEFINE(HAVE_FINITEL)
+    AC_DEFINE(HAVE_FLOORL)
+    AC_DEFINE(HAVE_FMODL)
+    AC_DEFINE(HAVE_FREXPL)
+    AC_DEFINE(HAVE_ISINFL)
+    AC_DEFINE(HAVE_ISNANL)
+    AC_DEFINE(HAVE_LDEXPL)
+    AC_DEFINE(HAVE_LOG10L)
+    AC_DEFINE(HAVE_LOGL)
+    AC_DEFINE(HAVE_MODFL)
+    AC_DEFINE(HAVE_POWL)
+    AC_DEFINE(HAVE_SINCOSL)
+    AC_DEFINE(HAVE_SINL)
+    AC_DEFINE(HAVE_SINHL)
+    AC_DEFINE(HAVE_SQRTL)
+    AC_DEFINE(HAVE_TANL)
+    AC_DEFINE(HAVE_TANHL)
+  fi
 else
 
   # We are being configured natively. We can do more elaborate tests

libstdc++-v3/src/Makefile.in

@@ -66,6 +66,7 @@ AR = @AR@
 AS = @AS@
 ATOMICITY_INC_SRCDIR = @ATOMICITY_INC_SRCDIR@
 BASIC_FILE_H = @BASIC_FILE_H@
+BUILD_INCLUDED_LIBINTL = @BUILD_INCLUDED_LIBINTL@
 CATALOGS = @CATALOGS@
 CATOBJEXT = @CATOBJEXT@
 CC = @CC@
@@ -87,16 +88,16 @@ EXTRA_CXX_FLAGS = @EXTRA_CXX_FLAGS@
 GCJ = @GCJ@
 GCJFLAGS = @GCJFLAGS@
 GENCAT = @GENCAT@
+GLIBC21 = @GLIBC21@
 GLIBCPP_IS_CROSS_COMPILING = @GLIBCPP_IS_CROSS_COMPILING@
 GMOFILES = @GMOFILES@
 GMSGFMT = @GMSGFMT@
-GT_NO = @GT_NO@
-GT_YES = @GT_YES@
-INCLUDE_LOCALE_H = @INCLUDE_LOCALE_H@
 INSTOBJEXT = @INSTOBJEXT@
-INTLDEPS = @INTLDEPS@
+INTLBISON = @INTLBISON@
 INTLLIBS = @INTLLIBS@
 INTLOBJS = @INTLOBJS@
+INTL_LIBTOOL_SUFFIX_PREFIX = @INTL_LIBTOOL_SUFFIX_PREFIX@
+LIBICONV = @LIBICONV@
 LIBMATHOBJS = @LIBMATHOBJS@
 LIBSUPCXX_PICFLAGS = @LIBSUPCXX_PICFLAGS@
 LIBTOOL = @LIBTOOL@
@@ -137,7 +138,6 @@ glibcpp_toolexecdir = @glibcpp_toolexecdir@
 glibcpp_toolexeclibdir = @glibcpp_toolexeclibdir@
 gxx_include_dir = @gxx_include_dir@
 ifGNUmake = @ifGNUmake@
-l = @l@
 libio_la = @libio_la@
 libtool_VERSION = @libtool_VERSION@
 release_VERSION = @release_VERSION@