From e95706d5d249c0e3fd67d316e370262f58037c1c Mon Sep 17 00:00:00 2001
From: Benjamin Kosnik <bkoz@gcc.gnu.org>
Date: Wed, 14 Jun 2000 00:01:08 +0000
Subject: [PATCH] acinclude.m4 (enable_cshadow_headers): Change CSHADOWFLAGS to
 _GNU_SOURCE instead of _ISOC9X_SOURCE...

2000-06-13  Benjamin Kosnik  <bkoz@redhat.com>

       	* acinclude.m4 (enable_cshadow_headers): Change CSHADOWFLAGS to
	_GNU_SOURCE instead of _ISOC9X_SOURCE, as _GNU_SOURCE is the
	superset, and already defined at top level.
        * aclocal.m4: Regenerate.
        * configure: Regenerate.

From-SVN: r34537
---
 libstdc++-v3/acinclude.m4 |  2 +-
 libstdc++-v3/aclocal.m4   |  2 +-
 libstdc++-v3/configure    | 23 ++++++-----------------
 3 files changed, 8 insertions(+), 19 deletions(-)

diff --git a/libstdc++-v3/acinclude.m4 b/libstdc++-v3/acinclude.m4
index 0a4243ce9d3..8982d46c586 100644
--- a/libstdc++-v3/acinclude.m4
+++ b/libstdc++-v3/acinclude.m4
@@ -1573,7 +1573,7 @@ AC_MSG_RESULT($enable_cshadow_headers)
 dnl Option parsed, now set things appropriately
 case "$enable_cshadow_headers" in
     yes) 
-	CSHADOWFLAGS="-D_ISOC9X_SOURCE"
+	CSHADOWFLAGS="-D_GNU_SOURCE"
 	CSHADOW_INCLUDES=" -I$srcdir/shadow -I$blddir/cshadow"
 	;;
     no)   
diff --git a/libstdc++-v3/aclocal.m4 b/libstdc++-v3/aclocal.m4
index 90643d4578d..a3a64da57b2 100644
--- a/libstdc++-v3/aclocal.m4
+++ b/libstdc++-v3/aclocal.m4
@@ -1585,7 +1585,7 @@ AC_MSG_RESULT($enable_cshadow_headers)
 dnl Option parsed, now set things appropriately
 case "$enable_cshadow_headers" in
     yes) 
-	CSHADOWFLAGS="-D_ISOC9X_SOURCE"
+	CSHADOWFLAGS="-D_GNU_SOURCE"
 	CSHADOW_INCLUDES=" -I$srcdir/shadow -I$blddir/cshadow"
 	;;
     no)   
diff --git a/libstdc++-v3/configure b/libstdc++-v3/configure
index a2cc2c3658b..c7fd7fa5940 100755
--- a/libstdc++-v3/configure
+++ b/libstdc++-v3/configure
@@ -64,7 +64,6 @@ program_suffix=NONE
 program_transform_name=s,x,x,
 silent=
 site=
-sitefile=
 srcdir=
 target=NONE
 verbose=
@@ -179,7 +178,6 @@ Configuration:
   --help                  print this message
   --no-create             do not create output files
   --quiet, --silent       do not print \`checking...' messages
-  --site-file=FILE        use FILE as the site file
   --version               print the version of autoconf that created configure
 Directory and file names:
   --prefix=PREFIX         install architecture-independent files in PREFIX
@@ -350,11 +348,6 @@ EOF
   -site=* | --site=* | --sit=*)
     site="$ac_optarg" ;;
 
-  -site-file | --site-file | --site-fil | --site-fi | --site-f)
-    ac_prev=sitefile ;;
-  -site-file=* | --site-file=* | --site-fil=* | --site-fi=* | --site-f=*)
-    sitefile="$ac_optarg" ;;
-
   -srcdir | --srcdir | --srcdi | --srcd | --src | --sr)
     ac_prev=srcdir ;;
   -srcdir=* | --srcdir=* | --srcdi=* | --srcd=* | --src=* | --sr=*)
@@ -520,16 +513,12 @@ fi
 srcdir=`echo "${srcdir}" | sed 's%\([^/]\)/*$%\1%'`
 
 # Prefer explicitly selected file to automatically selected ones.
-if test -z "$sitefile"; then
-  if test -z "$CONFIG_SITE"; then
-    if test "x$prefix" != xNONE; then
-      CONFIG_SITE="$prefix/share/config.site $prefix/etc/config.site"
-    else
-      CONFIG_SITE="$ac_default_prefix/share/config.site $ac_default_prefix/etc/config.site"
-    fi
+if test -z "$CONFIG_SITE"; then
+  if test "x$prefix" != xNONE; then
+    CONFIG_SITE="$prefix/share/config.site $prefix/etc/config.site"
+  else
+    CONFIG_SITE="$ac_default_prefix/share/config.site $ac_default_prefix/etc/config.site"
   fi
-else
-  CONFIG_SITE="$sitefile"
 fi
 for ac_site_file in $CONFIG_SITE; do
   if test -r "$ac_site_file"; then
@@ -2590,7 +2579,7 @@ fi
 echo "$ac_t""$enable_cshadow_headers" 1>&6
 case "$enable_cshadow_headers" in
     yes) 
-	CSHADOWFLAGS="-D_ISOC9X_SOURCE"
+	CSHADOWFLAGS="-D_GNU_SOURCE"
 	CSHADOW_INCLUDES=" -I$srcdir/shadow -I$blddir/cshadow"
 	;;
     no)