mirror of https://github.com/postgres/postgres
Autoconf 2.62 will require cache variables to contain "_cv_". Fix our few
noncomplying cases to be future-proof.
This commit is contained in:
parent
cc0dd43850
commit
559cb873d3
|
@ -1,5 +1,5 @@
|
||||||
# Macros that test various C library quirks
|
# 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
|
# PGAC_VAR_INT_TIMEZONE
|
||||||
|
@ -83,7 +83,7 @@ AH_VERBATIM(GETTIMEOFDAY_1ARG_,
|
||||||
# If so, define GETPWUID_R_5ARG
|
# If so, define GETPWUID_R_5ARG
|
||||||
AC_DEFUN([PGAC_FUNC_GETPWUID_R_5ARG],
|
AC_DEFUN([PGAC_FUNC_GETPWUID_R_5ARG],
|
||||||
[AC_CACHE_CHECK(whether getpwuid_r takes a fifth argument,
|
[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>
|
[AC_TRY_COMPILE([#include <sys/types.h>
|
||||||
#include <pwd.h>],
|
#include <pwd.h>],
|
||||||
[uid_t uid;
|
[uid_t uid;
|
||||||
|
@ -92,9 +92,9 @@ char *buf;
|
||||||
size_t bufsize;
|
size_t bufsize;
|
||||||
struct passwd **result;
|
struct passwd **result;
|
||||||
getpwuid_r(uid, space, buf, bufsize, result);],
|
getpwuid_r(uid, space, buf, bufsize, result);],
|
||||||
[pgac_func_getpwuid_r_5arg=yes],
|
[pgac_cv_func_getpwuid_r_5arg=yes],
|
||||||
[pgac_func_getpwuid_r_5arg=no])])
|
[pgac_cv_func_getpwuid_r_5arg=no])])
|
||||||
if test x"$pgac_func_getpwuid_r_5arg" = xyes ; then
|
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.])
|
AC_DEFINE(GETPWUID_R_5ARG,, [Define to 1 if getpwuid_r() takes a 5th argument.])
|
||||||
fi
|
fi
|
||||||
])# PGAC_FUNC_GETPWUID_R_5ARG
|
])# PGAC_FUNC_GETPWUID_R_5ARG
|
||||||
|
@ -106,7 +106,7 @@ fi
|
||||||
# If so, define STRERROR_R_INT
|
# If so, define STRERROR_R_INT
|
||||||
AC_DEFUN([PGAC_FUNC_STRERROR_R_INT],
|
AC_DEFUN([PGAC_FUNC_STRERROR_R_INT],
|
||||||
[AC_CACHE_CHECK(whether strerror_r returns 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>],
|
[AC_TRY_COMPILE([#include <string.h>],
|
||||||
[#ifndef _AIX
|
[#ifndef _AIX
|
||||||
int strerror_r(int, char *, size_t);
|
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. */
|
/* Older AIX has 'int' for the third argument so we don't test the args. */
|
||||||
int strerror_r();
|
int strerror_r();
|
||||||
#endif],
|
#endif],
|
||||||
[pgac_func_strerror_r_int=yes],
|
[pgac_cv_func_strerror_r_int=yes],
|
||||||
[pgac_func_strerror_r_int=no])])
|
[pgac_cv_func_strerror_r_int=no])])
|
||||||
if test x"$pgac_func_strerror_r_int" = xyes ; then
|
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.])
|
AC_DEFINE(STRERROR_R_INT,, [Define to 1 if strerror_r() returns a int.])
|
||||||
fi
|
fi
|
||||||
])# PGAC_FUNC_STRERROR_R_INT
|
])# PGAC_FUNC_STRERROR_R_INT
|
||||||
|
|
|
@ -19215,7 +19215,7 @@ done
|
||||||
# Do test here with the proper thread flags
|
# Do test here with the proper thread flags
|
||||||
{ echo "$as_me:$LINENO: checking whether getpwuid_r takes a fifth argument" >&5
|
{ 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; }
|
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
|
echo $ECHO_N "(cached) $ECHO_C" >&6
|
||||||
else
|
else
|
||||||
cat >conftest.$ac_ext <<_ACEOF
|
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 -z "$ac_c_werror_flag" ||
|
||||||
test ! -s conftest.err
|
test ! -s conftest.err
|
||||||
} && test -s conftest.$ac_objext; then
|
} && test -s conftest.$ac_objext; then
|
||||||
pgac_func_getpwuid_r_5arg=yes
|
pgac_cv_func_getpwuid_r_5arg=yes
|
||||||
else
|
else
|
||||||
echo "$as_me: failed program was:" >&5
|
echo "$as_me: failed program was:" >&5
|
||||||
sed 's/^/| /' conftest.$ac_ext >&5
|
sed 's/^/| /' conftest.$ac_ext >&5
|
||||||
|
|
||||||
pgac_func_getpwuid_r_5arg=no
|
pgac_cv_func_getpwuid_r_5arg=no
|
||||||
fi
|
fi
|
||||||
|
|
||||||
rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
|
rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
|
||||||
fi
|
fi
|
||||||
{ echo "$as_me:$LINENO: result: $pgac_func_getpwuid_r_5arg" >&5
|
{ echo "$as_me:$LINENO: result: $pgac_cv_func_getpwuid_r_5arg" >&5
|
||||||
echo "${ECHO_T}$pgac_func_getpwuid_r_5arg" >&6; }
|
echo "${ECHO_T}$pgac_cv_func_getpwuid_r_5arg" >&6; }
|
||||||
if test x"$pgac_func_getpwuid_r_5arg" = xyes ; then
|
if test x"$pgac_cv_func_getpwuid_r_5arg" = xyes ; then
|
||||||
|
|
||||||
cat >>confdefs.h <<\_ACEOF
|
cat >>confdefs.h <<\_ACEOF
|
||||||
#define GETPWUID_R_5ARG
|
#define GETPWUID_R_5ARG
|
||||||
|
@ -19278,7 +19278,7 @@ fi
|
||||||
|
|
||||||
{ echo "$as_me:$LINENO: checking whether strerror_r returns int" >&5
|
{ echo "$as_me:$LINENO: checking whether strerror_r returns int" >&5
|
||||||
echo $ECHO_N "checking whether strerror_r returns int... $ECHO_C" >&6; }
|
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
|
echo $ECHO_N "(cached) $ECHO_C" >&6
|
||||||
else
|
else
|
||||||
cat >conftest.$ac_ext <<_ACEOF
|
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 -z "$ac_c_werror_flag" ||
|
||||||
test ! -s conftest.err
|
test ! -s conftest.err
|
||||||
} && test -s conftest.$ac_objext; then
|
} && test -s conftest.$ac_objext; then
|
||||||
pgac_func_strerror_r_int=yes
|
pgac_cv_func_strerror_r_int=yes
|
||||||
else
|
else
|
||||||
echo "$as_me: failed program was:" >&5
|
echo "$as_me: failed program was:" >&5
|
||||||
sed 's/^/| /' conftest.$ac_ext >&5
|
sed 's/^/| /' conftest.$ac_ext >&5
|
||||||
|
|
||||||
pgac_func_strerror_r_int=no
|
pgac_cv_func_strerror_r_int=no
|
||||||
fi
|
fi
|
||||||
|
|
||||||
rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
|
rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
|
||||||
fi
|
fi
|
||||||
{ echo "$as_me:$LINENO: result: $pgac_func_strerror_r_int" >&5
|
{ echo "$as_me:$LINENO: result: $pgac_cv_func_strerror_r_int" >&5
|
||||||
echo "${ECHO_T}$pgac_func_strerror_r_int" >&6; }
|
echo "${ECHO_T}$pgac_cv_func_strerror_r_int" >&6; }
|
||||||
if test x"$pgac_func_strerror_r_int" = xyes ; then
|
if test x"$pgac_cv_func_strerror_r_int" = xyes ; then
|
||||||
|
|
||||||
cat >>confdefs.h <<\_ACEOF
|
cat >>confdefs.h <<\_ACEOF
|
||||||
#define STRERROR_R_INT
|
#define STRERROR_R_INT
|
||||||
|
|
Loading…
Reference in New Issue