diff --git a/config/c-compiler.m4 b/config/c-compiler.m4
index b366e40cff0df236af9d2ff2077b8dadbd4ba7f2..7275ea69fef7c4c2f0e92de45ed73280c33af5cd 100644
--- a/config/c-compiler.m4
+++ b/config/c-compiler.m4
@@ -199,7 +199,7 @@ if test "$pgac_cv_c_typeof" != no; then
   AC_DEFINE(HAVE_TYPEOF, 1,
             [Define to 1 if your compiler understands `typeof' or something similar.])
   if test "$pgac_cv_c_typeof" != typeof; then
-    AC_DEFINE(typeof, $pgac_cv_c_typeof, [Define to how the compiler spells `typeof'.])
+    AC_DEFINE_UNQUOTED(typeof, $pgac_cv_c_typeof, [Define to how the compiler spells `typeof'.])
   fi
 fi])# PGAC_C_TYPEOF
 
diff --git a/configure b/configure
index 3c92cabb924de355566a8605f12e02f3d5605008..56e3f8f242539afc2e684b6c52abb02d11a408c8 100755
--- a/configure
+++ b/configure
@@ -11704,7 +11704,9 @@ $as_echo "#define HAVE_TYPEOF 1" >>confdefs.h
 
   if test "$pgac_cv_c_typeof" != typeof; then
 
-$as_echo "#define typeof \$pgac_cv_c_typeof" >>confdefs.h
+cat >>confdefs.h <<_ACEOF
+#define typeof $pgac_cv_c_typeof
+_ACEOF
 
   fi
 fi