diff --git a/config/c-library.m4 b/config/c-library.m4
index fd9a137534..74754b20e8 100644
--- a/config/c-library.m4
+++ b/config/c-library.m4
@@ -1,5 +1,5 @@
 # Macros that test various C library quirks
-# $PostgreSQL: pgsql/config/c-library.m4,v 1.32 2008/02/19 18:02:30 petere Exp $
+# $PostgreSQL: pgsql/config/c-library.m4,v 1.33 2008/08/21 13:53:28 petere Exp $
 
 
 # PGAC_VAR_INT_TIMEZONE
@@ -83,7 +83,7 @@ AH_VERBATIM(GETTIMEOFDAY_1ARG_,
 # If so, define GETPWUID_R_5ARG
 AC_DEFUN([PGAC_FUNC_GETPWUID_R_5ARG],
 [AC_CACHE_CHECK(whether getpwuid_r takes a fifth argument,
-pgac_func_getpwuid_r_5arg,
+pgac_cv_func_getpwuid_r_5arg,
 [AC_TRY_COMPILE([#include <sys/types.h>
 #include <pwd.h>],
 [uid_t uid;
@@ -92,9 +92,9 @@ char *buf;
 size_t bufsize;
 struct passwd **result;
 getpwuid_r(uid, space, buf, bufsize, result);],
-[pgac_func_getpwuid_r_5arg=yes],
-[pgac_func_getpwuid_r_5arg=no])])
-if test x"$pgac_func_getpwuid_r_5arg" = xyes ; then
+[pgac_cv_func_getpwuid_r_5arg=yes],
+[pgac_cv_func_getpwuid_r_5arg=no])])
+if test x"$pgac_cv_func_getpwuid_r_5arg" = xyes ; then
   AC_DEFINE(GETPWUID_R_5ARG,, [Define to 1 if getpwuid_r() takes a 5th argument.])
 fi
 ])# PGAC_FUNC_GETPWUID_R_5ARG
@@ -106,7 +106,7 @@ fi
 # If so, define STRERROR_R_INT
 AC_DEFUN([PGAC_FUNC_STRERROR_R_INT],
 [AC_CACHE_CHECK(whether strerror_r returns int,
-pgac_func_strerror_r_int,
+pgac_cv_func_strerror_r_int,
 [AC_TRY_COMPILE([#include <string.h>],
 [#ifndef _AIX
 int strerror_r(int, char *, size_t);
@@ -114,9 +114,9 @@ int strerror_r(int, char *, size_t);
 /* Older AIX has 'int' for the third argument so we don't test the args. */
 int strerror_r();
 #endif],
-[pgac_func_strerror_r_int=yes],
-[pgac_func_strerror_r_int=no])])
-if test x"$pgac_func_strerror_r_int" = xyes ; then
+[pgac_cv_func_strerror_r_int=yes],
+[pgac_cv_func_strerror_r_int=no])])
+if test x"$pgac_cv_func_strerror_r_int" = xyes ; then
   AC_DEFINE(STRERROR_R_INT,, [Define to 1 if strerror_r() returns a int.])
 fi
 ])# PGAC_FUNC_STRERROR_R_INT
diff --git a/configure b/configure
index cde00667b3..042ea1598a 100755
--- a/configure
+++ b/configure
@@ -19215,7 +19215,7 @@ done
 # Do test here with the proper thread flags
 { echo "$as_me:$LINENO: checking whether getpwuid_r takes a fifth argument" >&5
 echo $ECHO_N "checking whether getpwuid_r takes a fifth argument... $ECHO_C" >&6; }
-if test "${pgac_func_getpwuid_r_5arg+set}" = set; then
+if test "${pgac_cv_func_getpwuid_r_5arg+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
@@ -19256,19 +19256,19 @@ eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
 	 test -z "$ac_c_werror_flag" ||
 	 test ! -s conftest.err
        } && test -s conftest.$ac_objext; then
-  pgac_func_getpwuid_r_5arg=yes
+  pgac_cv_func_getpwuid_r_5arg=yes
 else
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
-	pgac_func_getpwuid_r_5arg=no
+	pgac_cv_func_getpwuid_r_5arg=no
 fi
 
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 fi
-{ echo "$as_me:$LINENO: result: $pgac_func_getpwuid_r_5arg" >&5
-echo "${ECHO_T}$pgac_func_getpwuid_r_5arg" >&6; }
-if test x"$pgac_func_getpwuid_r_5arg" = xyes ; then
+{ echo "$as_me:$LINENO: result: $pgac_cv_func_getpwuid_r_5arg" >&5
+echo "${ECHO_T}$pgac_cv_func_getpwuid_r_5arg" >&6; }
+if test x"$pgac_cv_func_getpwuid_r_5arg" = xyes ; then
 
 cat >>confdefs.h <<\_ACEOF
 #define GETPWUID_R_5ARG
@@ -19278,7 +19278,7 @@ fi
 
 { echo "$as_me:$LINENO: checking whether strerror_r returns int" >&5
 echo $ECHO_N "checking whether strerror_r returns int... $ECHO_C" >&6; }
-if test "${pgac_func_strerror_r_int+set}" = set; then
+if test "${pgac_cv_func_strerror_r_int+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
@@ -19318,19 +19318,19 @@ eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
 	 test -z "$ac_c_werror_flag" ||
 	 test ! -s conftest.err
        } && test -s conftest.$ac_objext; then
-  pgac_func_strerror_r_int=yes
+  pgac_cv_func_strerror_r_int=yes
 else
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
-	pgac_func_strerror_r_int=no
+	pgac_cv_func_strerror_r_int=no
 fi
 
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 fi
-{ echo "$as_me:$LINENO: result: $pgac_func_strerror_r_int" >&5
-echo "${ECHO_T}$pgac_func_strerror_r_int" >&6; }
-if test x"$pgac_func_strerror_r_int" = xyes ; then
+{ echo "$as_me:$LINENO: result: $pgac_cv_func_strerror_r_int" >&5
+echo "${ECHO_T}$pgac_cv_func_strerror_r_int" >&6; }
+if test x"$pgac_cv_func_strerror_r_int" = xyes ; then
 
 cat >>confdefs.h <<\_ACEOF
 #define STRERROR_R_INT