acinclude.m4 (GLIBCPP_ENABLE_THREADS): Protect variable from shell expansion (thanks...

	* acinclude.m4 (GLIBCPP_ENABLE_THREADS): Protect variable from shell
	expansion (thanks to Alexandre Oliva).
	* aclocal.m4: Regenerate.
	* configure: Regenerate.

Also, re-add last comment since Benjamin accidentally trashed it with
his last check-in.

From-SVN: r43715

diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog
index 6c582e2959e9d8c65cf2effa736b7c0031ce9f6f..c9b74ce00f171032879734b9aea8200f900ada5e 100644 (file)
--- a/libstdc++-v3/ChangeLog
+++ b/libstdc++-v3/ChangeLog
@@ -1,3 +1,10 @@
+2001-07-02  Loren J. Rittle  <ljrittle@acm.org>
+
+       * acinclude.m4 (GLIBCPP_ENABLE_THREADS): Protect variable from shell
+       expansion (thanks to Alexandre Oliva).
+       * aclocal.m4: Regenerate.
+       * configure: Regenerate.
+
 2001-07-02  Benjamin Kosnik  <bkoz@redhat.com>
        
        * src/locale.cc (locale::locale(const char*)): Make sure global
@@ -10,6 +17,13 @@
        for it here.
        (test02): Add test.
        * libsupc++/eh_alloc.cc: Use climits, not limits.h.
+
+2001-07-02  Loren J. Rittle  <ljrittle@acm.org>
+
+       libstdc++/3284
+       * acinclude.m4 (GLIBCPP_ENABLE_THREADS): Portability enhancement.
+       * aclocal.m4: Regenerate.
+       * configure: Regenerate.
        
 2001-07-02  Loren J. Rittle  <ljrittle@acm.org>
 

diff --git a/libstdc++-v3/acinclude.m4 b/libstdc++-v3/acinclude.m4
index d5c5beec492d00de76e0c15dc0fe48ec2d77b63c..91f011050d032840da00ec9f029b1c5f558b6e5e 100644 (file)
--- a/libstdc++-v3/acinclude.m4
+++ b/libstdc++-v3/acinclude.m4
@@ -1161,13 +1161,13 @@ AC_DEFUN(GLIBCPP_ENABLE_THREADS, [
   fi
   AC_OUTPUT_COMMANDS([d=include/bits; a='[ABCDEFGHIJKLMNOPQRSTUVWXYZ_]'
     rm -f $d/gthr.h $d/gthr-single.h $d/gthr-default.h
-    sed '/^#/s/\('$a$a'*\)/_GLIBCPP_\1/g' <$d/gthr.h-in \
+    sed '/^#/s/\('"$a$a"'*\)/_GLIBCPP_\1/g' <$d/gthr.h-in \
       | sed 's,"gthr-,"bits/gthr-,' >$d/gthr.h
     sed 's/\(UNUSED\)/_GLIBCPP_\1/g' <$d/gthr-single.h-in \
-      | sed 's/\(GCC'$a'*_H\)/_GLIBCPP_\1/g' >$d/gthr-single.h
+      | sed 's/\(GCC'"$a"'*_H\)/_GLIBCPP_\1/g' >$d/gthr-single.h
     sed 's/\(UNUSED\)/_GLIBCPP_\1/g' <$d/gthr-default.h-in \
-      | sed 's/\(GCC'$a'*_H\)/_GLIBCPP_\1/g' \
-      | sed 's/\('$a'*WEAK\)/_GLIBCPP_\1/g' >$d/gthr-default.h])
+      | sed 's/\(GCC'"$a"'*_H\)/_GLIBCPP_\1/g' \
+      | sed 's/\('"$a"'*WEAK\)/_GLIBCPP_\1/g' >$d/gthr-default.h])
 ])
 
 

diff --git a/libstdc++-v3/aclocal.m4 b/libstdc++-v3/aclocal.m4
index b6d9e75bf946f775cc7ef04876c9e10d19d56c27..74ddf8377efac375dfb268ab80bf60f877ec6a27 100644 (file)
--- a/libstdc++-v3/aclocal.m4
+++ b/libstdc++-v3/aclocal.m4
@@ -1173,13 +1173,13 @@ AC_DEFUN(GLIBCPP_ENABLE_THREADS, [
   fi
   AC_OUTPUT_COMMANDS([d=include/bits; a='[ABCDEFGHIJKLMNOPQRSTUVWXYZ_]'
     rm -f $d/gthr.h $d/gthr-single.h $d/gthr-default.h
-    sed '/^#/s/\('$a$a'*\)/_GLIBCPP_\1/g' <$d/gthr.h-in \
+    sed '/^#/s/\('"$a$a"'*\)/_GLIBCPP_\1/g' <$d/gthr.h-in \
       | sed 's,"gthr-,"bits/gthr-,' >$d/gthr.h
     sed 's/\(UNUSED\)/_GLIBCPP_\1/g' <$d/gthr-single.h-in \
-      | sed 's/\(GCC'$a'*_H\)/_GLIBCPP_\1/g' >$d/gthr-single.h
+      | sed 's/\(GCC'"$a"'*_H\)/_GLIBCPP_\1/g' >$d/gthr-single.h
     sed 's/\(UNUSED\)/_GLIBCPP_\1/g' <$d/gthr-default.h-in \
-      | sed 's/\(GCC'$a'*_H\)/_GLIBCPP_\1/g' \
-      | sed 's/\('$a'*WEAK\)/_GLIBCPP_\1/g' >$d/gthr-default.h])
+      | sed 's/\(GCC'"$a"'*_H\)/_GLIBCPP_\1/g' \
+      | sed 's/\('"$a"'*WEAK\)/_GLIBCPP_\1/g' >$d/gthr-default.h])
 ])
 
 

diff --git a/libstdc++-v3/configure b/libstdc++-v3/configure
index 7244658a7a88f7b082f422d127a2e5ebabcd7f85..dc1baca4795203a27a4091bec4e4e25cb4a2d51c 100755 (executable)
--- a/libstdc++-v3/configure
+++ b/libstdc++-v3/configure
@@ -16871,13 +16871,13 @@ cat >> $CONFIG_STATUS <<\EOF
 test -z "$CONFIG_HEADERS" || echo timestamp > stamp-h
 d=include/bits; a='[ABCDEFGHIJKLMNOPQRSTUVWXYZ_]'
     rm -f $d/gthr.h $d/gthr-single.h $d/gthr-default.h
-    sed '/^#/s/\('$a$a'*\)/_GLIBCPP_\1/g' <$d/gthr.h-in \
+    sed '/^#/s/\('"$a$a"'*\)/_GLIBCPP_\1/g' <$d/gthr.h-in \
       | sed 's,"gthr-,"bits/gthr-,' >$d/gthr.h
     sed 's/\(UNUSED\)/_GLIBCPP_\1/g' <$d/gthr-single.h-in \
-      | sed 's/\(GCC'$a'*_H\)/_GLIBCPP_\1/g' >$d/gthr-single.h
+      | sed 's/\(GCC'"$a"'*_H\)/_GLIBCPP_\1/g' >$d/gthr-single.h
     sed 's/\(UNUSED\)/_GLIBCPP_\1/g' <$d/gthr-default.h-in \
-      | sed 's/\(GCC'$a'*_H\)/_GLIBCPP_\1/g' \
-      | sed 's/\('$a'*WEAK\)/_GLIBCPP_\1/g' >$d/gthr-default.h
+      | sed 's/\(GCC'"$a"'*_H\)/_GLIBCPP_\1/g' \
+      | sed 's/\('"$a"'*WEAK\)/_GLIBCPP_\1/g' >$d/gthr-default.h
 if test -n "$CONFIG_FILES"; then
   ac_file=Makefile . ${glibcpp_basedir}/../config-ml.in
   grep '^MULTISUBDIR =' Makefile >> src/Makefile