mirror of
https://git.postgresql.org/git/postgresql.git
synced 2024-09-28 00:21:50 +02:00
Make sure configure reflects changes
This commit is contained in:
parent
1d5cd311d1
commit
0356acebd5
90
src/configure
vendored
90
src/configure
vendored
@ -3925,14 +3925,66 @@ else
|
||||
STRDUP='../../utils/strdup.o'
|
||||
fi
|
||||
|
||||
echo $ac_n "checking for strcasecmp""... $ac_c" 1>&6
|
||||
echo "configure:3930: checking for strcasecmp" >&5
|
||||
if eval "test \"`echo '$''{'ac_cv_func_strcasecmp'+set}'`\" = set"; then
|
||||
echo $ac_n "checking for strtol""... $ac_c" 1>&6
|
||||
echo "configure:3930: checking for strtol" >&5
|
||||
if eval "test \"`echo '$''{'ac_cv_func_strtol'+set}'`\" = set"; then
|
||||
echo $ac_n "(cached) $ac_c" 1>&6
|
||||
else
|
||||
cat > conftest.$ac_ext <<EOF
|
||||
#line 3935 "configure"
|
||||
#include "confdefs.h"
|
||||
/* System header to define __stub macros and hopefully few prototypes,
|
||||
which can conflict with char strtol(); below. */
|
||||
#include <assert.h>
|
||||
/* Override any gcc2 internal prototype to avoid an error. */
|
||||
/* We use char because int might match the return type of a gcc2
|
||||
builtin and then its argument prototype would still apply. */
|
||||
char strtol();
|
||||
|
||||
int main() {
|
||||
|
||||
/* The GNU C library defines this for functions which it implements
|
||||
to always fail with ENOSYS. Some functions are actually named
|
||||
something starting with __ and the normal name is an alias. */
|
||||
#if defined (__stub_strtol) || defined (__stub___strtol)
|
||||
choke me
|
||||
#else
|
||||
strtol();
|
||||
#endif
|
||||
|
||||
; return 0; }
|
||||
EOF
|
||||
if { (eval echo configure:3958: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
|
||||
rm -rf conftest*
|
||||
eval "ac_cv_func_strtol=yes"
|
||||
else
|
||||
echo "configure: failed program was:" >&5
|
||||
cat conftest.$ac_ext >&5
|
||||
rm -rf conftest*
|
||||
eval "ac_cv_func_strtol=no"
|
||||
fi
|
||||
rm -f conftest*
|
||||
fi
|
||||
|
||||
if eval "test \"`echo '$ac_cv_func_'strtol`\" = yes"; then
|
||||
echo "$ac_t""yes" 1>&6
|
||||
cat >> confdefs.h <<\EOF
|
||||
#define HAVE_STRTOL 1
|
||||
EOF
|
||||
|
||||
else
|
||||
echo "$ac_t""no" 1>&6
|
||||
STRDUP='strtol.o'
|
||||
fi
|
||||
|
||||
echo $ac_n "checking for strcasecmp""... $ac_c" 1>&6
|
||||
echo "configure:3982: checking for strcasecmp" >&5
|
||||
if eval "test \"`echo '$''{'ac_cv_func_strcasecmp'+set}'`\" = set"; then
|
||||
echo $ac_n "(cached) $ac_c" 1>&6
|
||||
else
|
||||
cat > conftest.$ac_ext <<EOF
|
||||
#line 3987 "configure"
|
||||
#include "confdefs.h"
|
||||
/* System header to define __stub macros and hopefully few prototypes,
|
||||
which can conflict with char strcasecmp(); below. */
|
||||
#include <assert.h>
|
||||
@ -3954,7 +4006,7 @@ strcasecmp();
|
||||
|
||||
; return 0; }
|
||||
EOF
|
||||
if { (eval echo configure:3958: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
|
||||
if { (eval echo configure:4010: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
|
||||
rm -rf conftest*
|
||||
eval "ac_cv_func_strcasecmp=yes"
|
||||
else
|
||||
@ -3987,12 +4039,12 @@ fi
|
||||
|
||||
|
||||
echo $ac_n "checking for cbrt""... $ac_c" 1>&6
|
||||
echo "configure:3991: checking for cbrt" >&5
|
||||
echo "configure:4043: checking for cbrt" >&5
|
||||
if eval "test \"`echo '$''{'ac_cv_func_cbrt'+set}'`\" = set"; then
|
||||
echo $ac_n "(cached) $ac_c" 1>&6
|
||||
else
|
||||
cat > conftest.$ac_ext <<EOF
|
||||
#line 3996 "configure"
|
||||
#line 4048 "configure"
|
||||
#include "confdefs.h"
|
||||
/* System header to define __stub macros and hopefully few prototypes,
|
||||
which can conflict with char cbrt(); below. */
|
||||
@ -4015,7 +4067,7 @@ cbrt();
|
||||
|
||||
; return 0; }
|
||||
EOF
|
||||
if { (eval echo configure:4019: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
|
||||
if { (eval echo configure:4071: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
|
||||
rm -rf conftest*
|
||||
eval "ac_cv_func_cbrt=yes"
|
||||
else
|
||||
@ -4036,7 +4088,7 @@ EOF
|
||||
else
|
||||
echo "$ac_t""no" 1>&6
|
||||
echo $ac_n "checking for cbrt in -lm""... $ac_c" 1>&6
|
||||
echo "configure:4040: checking for cbrt in -lm" >&5
|
||||
echo "configure:4092: checking for cbrt in -lm" >&5
|
||||
ac_lib_var=`echo m'_'cbrt | sed 'y%./+-%__p_%'`
|
||||
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
|
||||
echo $ac_n "(cached) $ac_c" 1>&6
|
||||
@ -4044,7 +4096,7 @@ else
|
||||
ac_save_LIBS="$LIBS"
|
||||
LIBS="-lm $LIBS"
|
||||
cat > conftest.$ac_ext <<EOF
|
||||
#line 4048 "configure"
|
||||
#line 4100 "configure"
|
||||
#include "confdefs.h"
|
||||
/* Override any gcc2 internal prototype to avoid an error. */
|
||||
/* We use char because int might match the return type of a gcc2
|
||||
@ -4055,7 +4107,7 @@ int main() {
|
||||
cbrt()
|
||||
; return 0; }
|
||||
EOF
|
||||
if { (eval echo configure:4059: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
|
||||
if { (eval echo configure:4111: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
|
||||
rm -rf conftest*
|
||||
eval "ac_cv_lib_$ac_lib_var=yes"
|
||||
else
|
||||
@ -4081,12 +4133,12 @@ fi
|
||||
fi
|
||||
|
||||
echo $ac_n "checking for rint""... $ac_c" 1>&6
|
||||
echo "configure:4085: checking for rint" >&5
|
||||
echo "configure:4137: checking for rint" >&5
|
||||
if eval "test \"`echo '$''{'ac_cv_func_rint'+set}'`\" = set"; then
|
||||
echo $ac_n "(cached) $ac_c" 1>&6
|
||||
else
|
||||
cat > conftest.$ac_ext <<EOF
|
||||
#line 4090 "configure"
|
||||
#line 4142 "configure"
|
||||
#include "confdefs.h"
|
||||
/* System header to define __stub macros and hopefully few prototypes,
|
||||
which can conflict with char rint(); below. */
|
||||
@ -4109,7 +4161,7 @@ rint();
|
||||
|
||||
; return 0; }
|
||||
EOF
|
||||
if { (eval echo configure:4113: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
|
||||
if { (eval echo configure:4165: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
|
||||
rm -rf conftest*
|
||||
eval "ac_cv_func_rint=yes"
|
||||
else
|
||||
@ -4130,7 +4182,7 @@ EOF
|
||||
else
|
||||
echo "$ac_t""no" 1>&6
|
||||
echo $ac_n "checking for rint in -lm""... $ac_c" 1>&6
|
||||
echo "configure:4134: checking for rint in -lm" >&5
|
||||
echo "configure:4186: checking for rint in -lm" >&5
|
||||
ac_lib_var=`echo m'_'rint | sed 'y%./+-%__p_%'`
|
||||
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
|
||||
echo $ac_n "(cached) $ac_c" 1>&6
|
||||
@ -4138,7 +4190,7 @@ else
|
||||
ac_save_LIBS="$LIBS"
|
||||
LIBS="-lm $LIBS"
|
||||
cat > conftest.$ac_ext <<EOF
|
||||
#line 4142 "configure"
|
||||
#line 4194 "configure"
|
||||
#include "confdefs.h"
|
||||
/* Override any gcc2 internal prototype to avoid an error. */
|
||||
/* We use char because int might match the return type of a gcc2
|
||||
@ -4149,7 +4201,7 @@ int main() {
|
||||
rint()
|
||||
; return 0; }
|
||||
EOF
|
||||
if { (eval echo configure:4153: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
|
||||
if { (eval echo configure:4205: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
|
||||
rm -rf conftest*
|
||||
eval "ac_cv_lib_$ac_lib_var=yes"
|
||||
else
|
||||
@ -4176,7 +4228,7 @@ fi
|
||||
|
||||
|
||||
echo $ac_n "checking setting USE_LOCALE""... $ac_c" 1>&6
|
||||
echo "configure:4180: checking setting USE_LOCALE" >&5
|
||||
echo "configure:4232: checking setting USE_LOCALE" >&5
|
||||
if test "$USE_LOCALE" = "yes"
|
||||
then
|
||||
echo "$ac_t""enabled" 1>&6
|
||||
@ -4188,14 +4240,14 @@ else
|
||||
echo "$ac_t""disabled" 1>&6
|
||||
fi
|
||||
echo $ac_n "checking setting DEF_PGPORT""... $ac_c" 1>&6
|
||||
echo "configure:4192: checking setting DEF_PGPORT" >&5
|
||||
echo "configure:4244: checking setting DEF_PGPORT" >&5
|
||||
cat >> confdefs.h <<EOF
|
||||
#define DEF_PGPORT "${DEF_PGPORT}"
|
||||
EOF
|
||||
|
||||
echo "$ac_t""$DEF_PGPORT" 1>&6
|
||||
echo $ac_n "checking setting HBA""... $ac_c" 1>&6
|
||||
echo "configure:4199: checking setting HBA" >&5
|
||||
echo "configure:4251: checking setting HBA" >&5
|
||||
if test "$NOHBA" = "no"
|
||||
then
|
||||
echo "$ac_t""enabled" 1>&6
|
||||
|
@ -480,6 +480,9 @@ AC_CHECK_FUNC(strerror,
|
||||
AC_CHECK_FUNC(strdup,
|
||||
AC_DEFINE(HAVE_STRDUP),
|
||||
STRDUP='../../utils/strdup.o')
|
||||
AC_CHECK_FUNC(strtol,
|
||||
AC_DEFINE(HAVE_STRTOL),
|
||||
STRDUP='strtol.o')
|
||||
AC_CHECK_FUNC(strcasecmp,
|
||||
AC_DEFINE(HAVE_STRCASECMP),
|
||||
STRCASECMP='strcasecmp.o')
|
||||
|
@ -116,6 +116,9 @@ extern int inet_aton(const char *cp, struct in_addr * addr);
|
||||
extern int strcasecmp(char *s1, char *s2);
|
||||
#endif
|
||||
|
||||
/* Set to 1 if you have strtol() */
|
||||
#undef HAVE_STRTOL
|
||||
|
||||
/* Set to 1 if you have strdup() */
|
||||
#undef HAVE_STRDUP
|
||||
#ifndef HAVE_STRDUP
|
||||
|
Loading…
Reference in New Issue
Block a user