diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog
index b9c35879dcaf3511e35c8baa1c88b55f6c734bd7..16a1336ee45c23595656f5c75a51615cf9d3424b 100644
--- a/libstdc++-v3/ChangeLog
+++ b/libstdc++-v3/ChangeLog
@@ -1,3 +1,8 @@
+2007-04-14  Steve Ellcey  <sje@cup.hp.com>
+
+	* configure.ac: Change how LIBSUPCXX_PICFLAGS is set.
+	* configure: Regenerate.
+
 2007-04-14  Paolo Carlini  <pcarlini@suse.de>
 
 	* config/locale/generic/c_locale.cc: Include <limits>.
diff --git a/libstdc++-v3/configure b/libstdc++-v3/configure
index 55069241e7848e611d2d06636c474c8ecf11fae3..22f3e1a7d59f8a1219d8fa614c8c29b7c128e7f9 100755
--- a/libstdc++-v3/configure
+++ b/libstdc++-v3/configure
@@ -85067,10 +85067,8 @@ echo "${ECHO_T}$gxx_include_dir" >&6
 
 
 
-if ${CONFIG_SHELL-/bin/sh} ./libtool --tag CXX --features |
-   grep "enable shared" > /dev/null;
-then
-  LIBSUPCXX_PICFLAGS=-prefer-pic
+if test "$enable_shared" = yes; then
+  LIBSUPCXX_PICFLAGS="-prefer-pic"
 else
   LIBSUPCXX_PICFLAGS=
 fi
diff --git a/libstdc++-v3/configure.ac b/libstdc++-v3/configure.ac
index 7bebae9229da6e073f3a4a3272c106e73b681b2e..e549e8a10f5094b7486cbaa269e6f83674ed62bf 100644
--- a/libstdc++-v3/configure.ac
+++ b/libstdc++-v3/configure.ac
@@ -355,10 +355,8 @@ GLIBCXX_EXPORT_INSTALL_INFO
 GLIBCXX_EXPORT_INCLUDES
 GLIBCXX_EXPORT_FLAGS
 
-if ${CONFIG_SHELL-/bin/sh} ./libtool --tag CXX --features |
-   grep "enable shared" > /dev/null;
-then
-  LIBSUPCXX_PICFLAGS=-prefer-pic
+if test "$enable_shared" = yes; then
+  LIBSUPCXX_PICFLAGS="-prefer-pic"
 else
   LIBSUPCXX_PICFLAGS=
 fi