diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog
index b1f5e982cbc..0cbbb32f243 100644
--- a/libstdc++-v3/ChangeLog
+++ b/libstdc++-v3/ChangeLog
@@ -1,3 +1,10 @@
+2004-06-25  Benjamin Kosnik  <bkoz@redhat.com>
+
+	PR libstdc++/16182	
+	* linkage.m4 (GLIBCXX_CHECK_BUILTIN_MATH_DEC): Revert to
+	AC_DEFINE_UNQUOTED.
+	* configure: Regenerate.
+
 2004-06-25  Paul Brook  <paul@codesourcery.com>
 
 	* libsupc++/cxxabi.h: Define __ARM_EABI__
diff --git a/libstdc++-v3/configure b/libstdc++-v3/configure
index 9c4d0f9227f..f749f5f62da 100755
--- a/libstdc++-v3/configure
+++ b/libstdc++-v3/configure
@@ -25344,7 +25344,7 @@ echo "${ECHO_T}$glibcxx_cv_func___builtin_abs_link" >&6
     if test x$glibcxx_cv_func___builtin_abs_link = x"yes"; then
       ac_tr_func=HAVE_`echo __builtin_abs | tr 'abcdefghijklmnopqrstuvwxyz' 'ABCDEFGHIJKLMNOPQRSTUVWXYZ'`
 
-cat >>confdefs.h <<\_ACEOF
+cat >>confdefs.h <<_ACEOF
 #define ${ac_tr_func} 1
 _ACEOF
 
@@ -25492,7 +25492,7 @@ echo "${ECHO_T}$glibcxx_cv_func___builtin_fabsf_link" >&6
     if test x$glibcxx_cv_func___builtin_fabsf_link = x"yes"; then
       ac_tr_func=HAVE_`echo __builtin_fabsf | tr 'abcdefghijklmnopqrstuvwxyz' 'ABCDEFGHIJKLMNOPQRSTUVWXYZ'`
 
-cat >>confdefs.h <<\_ACEOF
+cat >>confdefs.h <<_ACEOF
 #define ${ac_tr_func} 1
 _ACEOF
 
@@ -25640,7 +25640,7 @@ echo "${ECHO_T}$glibcxx_cv_func___builtin_fabs_link" >&6
     if test x$glibcxx_cv_func___builtin_fabs_link = x"yes"; then
       ac_tr_func=HAVE_`echo __builtin_fabs | tr 'abcdefghijklmnopqrstuvwxyz' 'ABCDEFGHIJKLMNOPQRSTUVWXYZ'`
 
-cat >>confdefs.h <<\_ACEOF
+cat >>confdefs.h <<_ACEOF
 #define ${ac_tr_func} 1
 _ACEOF
 
@@ -25788,7 +25788,7 @@ echo "${ECHO_T}$glibcxx_cv_func___builtin_fabsl_link" >&6
     if test x$glibcxx_cv_func___builtin_fabsl_link = x"yes"; then
       ac_tr_func=HAVE_`echo __builtin_fabsl | tr 'abcdefghijklmnopqrstuvwxyz' 'ABCDEFGHIJKLMNOPQRSTUVWXYZ'`
 
-cat >>confdefs.h <<\_ACEOF
+cat >>confdefs.h <<_ACEOF
 #define ${ac_tr_func} 1
 _ACEOF
 
@@ -25936,7 +25936,7 @@ echo "${ECHO_T}$glibcxx_cv_func___builtin_labs_link" >&6
     if test x$glibcxx_cv_func___builtin_labs_link = x"yes"; then
       ac_tr_func=HAVE_`echo __builtin_labs | tr 'abcdefghijklmnopqrstuvwxyz' 'ABCDEFGHIJKLMNOPQRSTUVWXYZ'`
 
-cat >>confdefs.h <<\_ACEOF
+cat >>confdefs.h <<_ACEOF
 #define ${ac_tr_func} 1
 _ACEOF
 
@@ -26085,7 +26085,7 @@ echo "${ECHO_T}$glibcxx_cv_func___builtin_sqrtf_link" >&6
     if test x$glibcxx_cv_func___builtin_sqrtf_link = x"yes"; then
       ac_tr_func=HAVE_`echo __builtin_sqrtf | tr 'abcdefghijklmnopqrstuvwxyz' 'ABCDEFGHIJKLMNOPQRSTUVWXYZ'`
 
-cat >>confdefs.h <<\_ACEOF
+cat >>confdefs.h <<_ACEOF
 #define ${ac_tr_func} 1
 _ACEOF
 
@@ -26233,7 +26233,7 @@ echo "${ECHO_T}$glibcxx_cv_func___builtin_sqrt_link" >&6
     if test x$glibcxx_cv_func___builtin_sqrt_link = x"yes"; then
       ac_tr_func=HAVE_`echo __builtin_sqrt | tr 'abcdefghijklmnopqrstuvwxyz' 'ABCDEFGHIJKLMNOPQRSTUVWXYZ'`
 
-cat >>confdefs.h <<\_ACEOF
+cat >>confdefs.h <<_ACEOF
 #define ${ac_tr_func} 1
 _ACEOF
 
@@ -26381,7 +26381,7 @@ echo "${ECHO_T}$glibcxx_cv_func___builtin_sqrtl_link" >&6
     if test x$glibcxx_cv_func___builtin_sqrtl_link = x"yes"; then
       ac_tr_func=HAVE_`echo __builtin_sqrtl | tr 'abcdefghijklmnopqrstuvwxyz' 'ABCDEFGHIJKLMNOPQRSTUVWXYZ'`
 
-cat >>confdefs.h <<\_ACEOF
+cat >>confdefs.h <<_ACEOF
 #define ${ac_tr_func} 1
 _ACEOF
 
@@ -26530,7 +26530,7 @@ echo "${ECHO_T}$glibcxx_cv_func___builtin_sinf_link" >&6
     if test x$glibcxx_cv_func___builtin_sinf_link = x"yes"; then
       ac_tr_func=HAVE_`echo __builtin_sinf | tr 'abcdefghijklmnopqrstuvwxyz' 'ABCDEFGHIJKLMNOPQRSTUVWXYZ'`
 
-cat >>confdefs.h <<\_ACEOF
+cat >>confdefs.h <<_ACEOF
 #define ${ac_tr_func} 1
 _ACEOF
 
@@ -26678,7 +26678,7 @@ echo "${ECHO_T}$glibcxx_cv_func___builtin_sin_link" >&6
     if test x$glibcxx_cv_func___builtin_sin_link = x"yes"; then
       ac_tr_func=HAVE_`echo __builtin_sin | tr 'abcdefghijklmnopqrstuvwxyz' 'ABCDEFGHIJKLMNOPQRSTUVWXYZ'`
 
-cat >>confdefs.h <<\_ACEOF
+cat >>confdefs.h <<_ACEOF
 #define ${ac_tr_func} 1
 _ACEOF
 
@@ -26826,7 +26826,7 @@ echo "${ECHO_T}$glibcxx_cv_func___builtin_sinl_link" >&6
     if test x$glibcxx_cv_func___builtin_sinl_link = x"yes"; then
       ac_tr_func=HAVE_`echo __builtin_sinl | tr 'abcdefghijklmnopqrstuvwxyz' 'ABCDEFGHIJKLMNOPQRSTUVWXYZ'`
 
-cat >>confdefs.h <<\_ACEOF
+cat >>confdefs.h <<_ACEOF
 #define ${ac_tr_func} 1
 _ACEOF
 
@@ -26975,7 +26975,7 @@ echo "${ECHO_T}$glibcxx_cv_func___builtin_cosf_link" >&6
     if test x$glibcxx_cv_func___builtin_cosf_link = x"yes"; then
       ac_tr_func=HAVE_`echo __builtin_cosf | tr 'abcdefghijklmnopqrstuvwxyz' 'ABCDEFGHIJKLMNOPQRSTUVWXYZ'`
 
-cat >>confdefs.h <<\_ACEOF
+cat >>confdefs.h <<_ACEOF
 #define ${ac_tr_func} 1
 _ACEOF
 
@@ -27123,7 +27123,7 @@ echo "${ECHO_T}$glibcxx_cv_func___builtin_cos_link" >&6
     if test x$glibcxx_cv_func___builtin_cos_link = x"yes"; then
       ac_tr_func=HAVE_`echo __builtin_cos | tr 'abcdefghijklmnopqrstuvwxyz' 'ABCDEFGHIJKLMNOPQRSTUVWXYZ'`
 
-cat >>confdefs.h <<\_ACEOF
+cat >>confdefs.h <<_ACEOF
 #define ${ac_tr_func} 1
 _ACEOF
 
@@ -27271,7 +27271,7 @@ echo "${ECHO_T}$glibcxx_cv_func___builtin_cosl_link" >&6
     if test x$glibcxx_cv_func___builtin_cosl_link = x"yes"; then
       ac_tr_func=HAVE_`echo __builtin_cosl | tr 'abcdefghijklmnopqrstuvwxyz' 'ABCDEFGHIJKLMNOPQRSTUVWXYZ'`
 
-cat >>confdefs.h <<\_ACEOF
+cat >>confdefs.h <<_ACEOF
 #define ${ac_tr_func} 1
 _ACEOF
 
@@ -48450,7 +48450,7 @@ echo "${ECHO_T}$glibcxx_cv_func___builtin_abs_link" >&6
     if test x$glibcxx_cv_func___builtin_abs_link = x"yes"; then
       ac_tr_func=HAVE_`echo __builtin_abs | tr 'abcdefghijklmnopqrstuvwxyz' 'ABCDEFGHIJKLMNOPQRSTUVWXYZ'`
 
-cat >>confdefs.h <<\_ACEOF
+cat >>confdefs.h <<_ACEOF
 #define ${ac_tr_func} 1
 _ACEOF
 
@@ -48598,7 +48598,7 @@ echo "${ECHO_T}$glibcxx_cv_func___builtin_fabsf_link" >&6
     if test x$glibcxx_cv_func___builtin_fabsf_link = x"yes"; then
       ac_tr_func=HAVE_`echo __builtin_fabsf | tr 'abcdefghijklmnopqrstuvwxyz' 'ABCDEFGHIJKLMNOPQRSTUVWXYZ'`
 
-cat >>confdefs.h <<\_ACEOF
+cat >>confdefs.h <<_ACEOF
 #define ${ac_tr_func} 1
 _ACEOF
 
@@ -48746,7 +48746,7 @@ echo "${ECHO_T}$glibcxx_cv_func___builtin_fabs_link" >&6
     if test x$glibcxx_cv_func___builtin_fabs_link = x"yes"; then
       ac_tr_func=HAVE_`echo __builtin_fabs | tr 'abcdefghijklmnopqrstuvwxyz' 'ABCDEFGHIJKLMNOPQRSTUVWXYZ'`
 
-cat >>confdefs.h <<\_ACEOF
+cat >>confdefs.h <<_ACEOF
 #define ${ac_tr_func} 1
 _ACEOF
 
@@ -48894,7 +48894,7 @@ echo "${ECHO_T}$glibcxx_cv_func___builtin_fabsl_link" >&6
     if test x$glibcxx_cv_func___builtin_fabsl_link = x"yes"; then
       ac_tr_func=HAVE_`echo __builtin_fabsl | tr 'abcdefghijklmnopqrstuvwxyz' 'ABCDEFGHIJKLMNOPQRSTUVWXYZ'`
 
-cat >>confdefs.h <<\_ACEOF
+cat >>confdefs.h <<_ACEOF
 #define ${ac_tr_func} 1
 _ACEOF
 
@@ -49042,7 +49042,7 @@ echo "${ECHO_T}$glibcxx_cv_func___builtin_labs_link" >&6
     if test x$glibcxx_cv_func___builtin_labs_link = x"yes"; then
       ac_tr_func=HAVE_`echo __builtin_labs | tr 'abcdefghijklmnopqrstuvwxyz' 'ABCDEFGHIJKLMNOPQRSTUVWXYZ'`
 
-cat >>confdefs.h <<\_ACEOF
+cat >>confdefs.h <<_ACEOF
 #define ${ac_tr_func} 1
 _ACEOF
 
@@ -49191,7 +49191,7 @@ echo "${ECHO_T}$glibcxx_cv_func___builtin_sqrtf_link" >&6
     if test x$glibcxx_cv_func___builtin_sqrtf_link = x"yes"; then
       ac_tr_func=HAVE_`echo __builtin_sqrtf | tr 'abcdefghijklmnopqrstuvwxyz' 'ABCDEFGHIJKLMNOPQRSTUVWXYZ'`
 
-cat >>confdefs.h <<\_ACEOF
+cat >>confdefs.h <<_ACEOF
 #define ${ac_tr_func} 1
 _ACEOF
 
@@ -49339,7 +49339,7 @@ echo "${ECHO_T}$glibcxx_cv_func___builtin_sqrt_link" >&6
     if test x$glibcxx_cv_func___builtin_sqrt_link = x"yes"; then
       ac_tr_func=HAVE_`echo __builtin_sqrt | tr 'abcdefghijklmnopqrstuvwxyz' 'ABCDEFGHIJKLMNOPQRSTUVWXYZ'`
 
-cat >>confdefs.h <<\_ACEOF
+cat >>confdefs.h <<_ACEOF
 #define ${ac_tr_func} 1
 _ACEOF
 
@@ -49487,7 +49487,7 @@ echo "${ECHO_T}$glibcxx_cv_func___builtin_sqrtl_link" >&6
     if test x$glibcxx_cv_func___builtin_sqrtl_link = x"yes"; then
       ac_tr_func=HAVE_`echo __builtin_sqrtl | tr 'abcdefghijklmnopqrstuvwxyz' 'ABCDEFGHIJKLMNOPQRSTUVWXYZ'`
 
-cat >>confdefs.h <<\_ACEOF
+cat >>confdefs.h <<_ACEOF
 #define ${ac_tr_func} 1
 _ACEOF
 
@@ -49636,7 +49636,7 @@ echo "${ECHO_T}$glibcxx_cv_func___builtin_sinf_link" >&6
     if test x$glibcxx_cv_func___builtin_sinf_link = x"yes"; then
       ac_tr_func=HAVE_`echo __builtin_sinf | tr 'abcdefghijklmnopqrstuvwxyz' 'ABCDEFGHIJKLMNOPQRSTUVWXYZ'`
 
-cat >>confdefs.h <<\_ACEOF
+cat >>confdefs.h <<_ACEOF
 #define ${ac_tr_func} 1
 _ACEOF
 
@@ -49784,7 +49784,7 @@ echo "${ECHO_T}$glibcxx_cv_func___builtin_sin_link" >&6
     if test x$glibcxx_cv_func___builtin_sin_link = x"yes"; then
       ac_tr_func=HAVE_`echo __builtin_sin | tr 'abcdefghijklmnopqrstuvwxyz' 'ABCDEFGHIJKLMNOPQRSTUVWXYZ'`
 
-cat >>confdefs.h <<\_ACEOF
+cat >>confdefs.h <<_ACEOF
 #define ${ac_tr_func} 1
 _ACEOF
 
@@ -49932,7 +49932,7 @@ echo "${ECHO_T}$glibcxx_cv_func___builtin_sinl_link" >&6
     if test x$glibcxx_cv_func___builtin_sinl_link = x"yes"; then
       ac_tr_func=HAVE_`echo __builtin_sinl | tr 'abcdefghijklmnopqrstuvwxyz' 'ABCDEFGHIJKLMNOPQRSTUVWXYZ'`
 
-cat >>confdefs.h <<\_ACEOF
+cat >>confdefs.h <<_ACEOF
 #define ${ac_tr_func} 1
 _ACEOF
 
@@ -50081,7 +50081,7 @@ echo "${ECHO_T}$glibcxx_cv_func___builtin_cosf_link" >&6
     if test x$glibcxx_cv_func___builtin_cosf_link = x"yes"; then
       ac_tr_func=HAVE_`echo __builtin_cosf | tr 'abcdefghijklmnopqrstuvwxyz' 'ABCDEFGHIJKLMNOPQRSTUVWXYZ'`
 
-cat >>confdefs.h <<\_ACEOF
+cat >>confdefs.h <<_ACEOF
 #define ${ac_tr_func} 1
 _ACEOF
 
@@ -50229,7 +50229,7 @@ echo "${ECHO_T}$glibcxx_cv_func___builtin_cos_link" >&6
     if test x$glibcxx_cv_func___builtin_cos_link = x"yes"; then
       ac_tr_func=HAVE_`echo __builtin_cos | tr 'abcdefghijklmnopqrstuvwxyz' 'ABCDEFGHIJKLMNOPQRSTUVWXYZ'`
 
-cat >>confdefs.h <<\_ACEOF
+cat >>confdefs.h <<_ACEOF
 #define ${ac_tr_func} 1
 _ACEOF
 
@@ -50377,7 +50377,7 @@ echo "${ECHO_T}$glibcxx_cv_func___builtin_cosl_link" >&6
     if test x$glibcxx_cv_func___builtin_cosl_link = x"yes"; then
       ac_tr_func=HAVE_`echo __builtin_cosl | tr 'abcdefghijklmnopqrstuvwxyz' 'ABCDEFGHIJKLMNOPQRSTUVWXYZ'`
 
-cat >>confdefs.h <<\_ACEOF
+cat >>confdefs.h <<_ACEOF
 #define ${ac_tr_func} 1
 _ACEOF
 
diff --git a/libstdc++-v3/linkage.m4 b/libstdc++-v3/linkage.m4
index 8bc3cec1fbc..6c8a6a766c0 100644
--- a/libstdc++-v3/linkage.m4
+++ b/libstdc++-v3/linkage.m4
@@ -291,7 +291,7 @@ AC_DEFUN([GLIBCXX_CHECK_BUILTIN_MATH_DECL_AND_LINKAGE_1], [
     AC_MSG_RESULT($glibcxx_cv_func_$1_link)
     if test x$glibcxx_cv_func_$1_link = x"yes"; then
       ac_tr_func=HAVE_`echo $1 | tr 'abcdefghijklmnopqrstuvwxyz' 'ABCDEFGHIJKLMNOPQRSTUVWXYZ'`
-      AC_DEFINE(${ac_tr_func}, 1, [Defined if $1 exists.])
+      AC_DEFINE_UNQUOTED(${ac_tr_func}, 1, [Defined if $1 exists.])
     fi
   fi
 ])