Location via proxy:   [ UP ]  
[Report a bug]   [Manage cookies]                
Skip to content

Commit 559cb87

Browse files
committed
Autoconf 2.62 will require cache variables to contain "_cv_". Fix our few
noncomplying cases to be future-proof.
1 parent cc0dd43 commit 559cb87

File tree

2 files changed

+21
-21
lines changed

2 files changed

+21
-21
lines changed

config/c-library.m4

+9-9
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
# Macros that test various C library quirks
2-
# $PostgreSQL: pgsql/config/c-library.m4,v 1.32 2008/02/19 18:02:30 petere Exp $
2+
# $PostgreSQL: pgsql/config/c-library.m4,v 1.33 2008/08/21 13:53:28 petere Exp $
33

44

55
# PGAC_VAR_INT_TIMEZONE
@@ -83,7 +83,7 @@ AH_VERBATIM(GETTIMEOFDAY_1ARG_,
8383
# If so, define GETPWUID_R_5ARG
8484
AC_DEFUN([PGAC_FUNC_GETPWUID_R_5ARG],
8585
[AC_CACHE_CHECK(whether getpwuid_r takes a fifth argument,
86-
pgac_func_getpwuid_r_5arg,
86+
pgac_cv_func_getpwuid_r_5arg,
8787
[AC_TRY_COMPILE([#include <sys/types.h>
8888
#include <pwd.h>],
8989
[uid_t uid;
@@ -92,9 +92,9 @@ char *buf;
9292
size_t bufsize;
9393
struct passwd **result;
9494
getpwuid_r(uid, space, buf, bufsize, result);],
95-
[pgac_func_getpwuid_r_5arg=yes],
96-
[pgac_func_getpwuid_r_5arg=no])])
97-
if test x"$pgac_func_getpwuid_r_5arg" = xyes ; then
95+
[pgac_cv_func_getpwuid_r_5arg=yes],
96+
[pgac_cv_func_getpwuid_r_5arg=no])])
97+
if test x"$pgac_cv_func_getpwuid_r_5arg" = xyes ; then
9898
AC_DEFINE(GETPWUID_R_5ARG,, [Define to 1 if getpwuid_r() takes a 5th argument.])
9999
fi
100100
])# PGAC_FUNC_GETPWUID_R_5ARG
@@ -106,17 +106,17 @@ fi
106106
# If so, define STRERROR_R_INT
107107
AC_DEFUN([PGAC_FUNC_STRERROR_R_INT],
108108
[AC_CACHE_CHECK(whether strerror_r returns int,
109-
pgac_func_strerror_r_int,
109+
pgac_cv_func_strerror_r_int,
110110
[AC_TRY_COMPILE([#include <string.h>],
111111
[#ifndef _AIX
112112
int strerror_r(int, char *, size_t);
113113
#else
114114
/* Older AIX has 'int' for the third argument so we don't test the args. */
115115
int strerror_r();
116116
#endif],
117-
[pgac_func_strerror_r_int=yes],
118-
[pgac_func_strerror_r_int=no])])
119-
if test x"$pgac_func_strerror_r_int" = xyes ; then
117+
[pgac_cv_func_strerror_r_int=yes],
118+
[pgac_cv_func_strerror_r_int=no])])
119+
if test x"$pgac_cv_func_strerror_r_int" = xyes ; then
120120
AC_DEFINE(STRERROR_R_INT,, [Define to 1 if strerror_r() returns a int.])
121121
fi
122122
])# PGAC_FUNC_STRERROR_R_INT

configure

+12-12
Original file line numberDiff line numberDiff line change
@@ -19215,7 +19215,7 @@ done
1921519215
# Do test here with the proper thread flags
1921619216
{ echo "$as_me:$LINENO: checking whether getpwuid_r takes a fifth argument" >&5
1921719217
echo $ECHO_N "checking whether getpwuid_r takes a fifth argument... $ECHO_C" >&6; }
19218-
if test "${pgac_func_getpwuid_r_5arg+set}" = set; then
19218+
if test "${pgac_cv_func_getpwuid_r_5arg+set}" = set; then
1921919219
echo $ECHO_N "(cached) $ECHO_C" >&6
1922019220
else
1922119221
cat >conftest.$ac_ext <<_ACEOF
@@ -19256,19 +19256,19 @@ eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
1925619256
test -z "$ac_c_werror_flag" ||
1925719257
test ! -s conftest.err
1925819258
} && test -s conftest.$ac_objext; then
19259-
pgac_func_getpwuid_r_5arg=yes
19259+
pgac_cv_func_getpwuid_r_5arg=yes
1926019260
else
1926119261
echo "$as_me: failed program was:" >&5
1926219262
sed 's/^/| /' conftest.$ac_ext >&5
1926319263

19264-
pgac_func_getpwuid_r_5arg=no
19264+
pgac_cv_func_getpwuid_r_5arg=no
1926519265
fi
1926619266

1926719267
rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
1926819268
fi
19269-
{ echo "$as_me:$LINENO: result: $pgac_func_getpwuid_r_5arg" >&5
19270-
echo "${ECHO_T}$pgac_func_getpwuid_r_5arg" >&6; }
19271-
if test x"$pgac_func_getpwuid_r_5arg" = xyes ; then
19269+
{ echo "$as_me:$LINENO: result: $pgac_cv_func_getpwuid_r_5arg" >&5
19270+
echo "${ECHO_T}$pgac_cv_func_getpwuid_r_5arg" >&6; }
19271+
if test x"$pgac_cv_func_getpwuid_r_5arg" = xyes ; then
1927219272

1927319273
cat >>confdefs.h <<\_ACEOF
1927419274
#define GETPWUID_R_5ARG
@@ -19278,7 +19278,7 @@ fi
1927819278

1927919279
{ echo "$as_me:$LINENO: checking whether strerror_r returns int" >&5
1928019280
echo $ECHO_N "checking whether strerror_r returns int... $ECHO_C" >&6; }
19281-
if test "${pgac_func_strerror_r_int+set}" = set; then
19281+
if test "${pgac_cv_func_strerror_r_int+set}" = set; then
1928219282
echo $ECHO_N "(cached) $ECHO_C" >&6
1928319283
else
1928419284
cat >conftest.$ac_ext <<_ACEOF
@@ -19318,19 +19318,19 @@ eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
1931819318
test -z "$ac_c_werror_flag" ||
1931919319
test ! -s conftest.err
1932019320
} && test -s conftest.$ac_objext; then
19321-
pgac_func_strerror_r_int=yes
19321+
pgac_cv_func_strerror_r_int=yes
1932219322
else
1932319323
echo "$as_me: failed program was:" >&5
1932419324
sed 's/^/| /' conftest.$ac_ext >&5
1932519325

19326-
pgac_func_strerror_r_int=no
19326+
pgac_cv_func_strerror_r_int=no
1932719327
fi
1932819328

1932919329
rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
1933019330
fi
19331-
{ echo "$as_me:$LINENO: result: $pgac_func_strerror_r_int" >&5
19332-
echo "${ECHO_T}$pgac_func_strerror_r_int" >&6; }
19333-
if test x"$pgac_func_strerror_r_int" = xyes ; then
19331+
{ echo "$as_me:$LINENO: result: $pgac_cv_func_strerror_r_int" >&5
19332+
echo "${ECHO_T}$pgac_cv_func_strerror_r_int" >&6; }
19333+
if test x"$pgac_cv_func_strerror_r_int" = xyes ; then
1933419334

1933519335
cat >>confdefs.h <<\_ACEOF
1933619336
#define STRERROR_R_INT

0 commit comments

Comments
 (0)