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

Commit 0356ace

Browse files
committed
Make sure configure reflects changes
1 parent 1d5cd31 commit 0356ace

File tree

3 files changed

+76
-18
lines changed

3 files changed

+76
-18
lines changed

src/configure

+70-18
Original file line numberDiff line numberDiff line change
@@ -3925,13 +3925,65 @@ else
39253925
STRDUP='../../utils/strdup.o'
39263926
fi
39273927

3928+
echo $ac_n "checking for strtol""... $ac_c" 1>&6
3929+
echo "configure:3930: checking for strtol" >&5
3930+
if eval "test \"`echo '$''{'ac_cv_func_strtol'+set}'`\" = set"; then
3931+
echo $ac_n "(cached) $ac_c" 1>&6
3932+
else
3933+
cat > conftest.$ac_ext <<EOF
3934+
#line 3935 "configure"
3935+
#include "confdefs.h"
3936+
/* System header to define __stub macros and hopefully few prototypes,
3937+
which can conflict with char strtol(); below. */
3938+
#include <assert.h>
3939+
/* Override any gcc2 internal prototype to avoid an error. */
3940+
/* We use char because int might match the return type of a gcc2
3941+
builtin and then its argument prototype would still apply. */
3942+
char strtol();
3943+
3944+
int main() {
3945+
3946+
/* The GNU C library defines this for functions which it implements
3947+
to always fail with ENOSYS. Some functions are actually named
3948+
something starting with __ and the normal name is an alias. */
3949+
#if defined (__stub_strtol) || defined (__stub___strtol)
3950+
choke me
3951+
#else
3952+
strtol();
3953+
#endif
3954+
3955+
; return 0; }
3956+
EOF
3957+
if { (eval echo configure:3958: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
3958+
rm -rf conftest*
3959+
eval "ac_cv_func_strtol=yes"
3960+
else
3961+
echo "configure: failed program was:" >&5
3962+
cat conftest.$ac_ext >&5
3963+
rm -rf conftest*
3964+
eval "ac_cv_func_strtol=no"
3965+
fi
3966+
rm -f conftest*
3967+
fi
3968+
3969+
if eval "test \"`echo '$ac_cv_func_'strtol`\" = yes"; then
3970+
echo "$ac_t""yes" 1>&6
3971+
cat >> confdefs.h <<\EOF
3972+
#define HAVE_STRTOL 1
3973+
EOF
3974+
3975+
else
3976+
echo "$ac_t""no" 1>&6
3977+
STRDUP='strtol.o'
3978+
fi
3979+
39283980
echo $ac_n "checking for strcasecmp""... $ac_c" 1>&6
3929-
echo "configure:3930: checking for strcasecmp" >&5
3981+
echo "configure:3982: checking for strcasecmp" >&5
39303982
if eval "test \"`echo '$''{'ac_cv_func_strcasecmp'+set}'`\" = set"; then
39313983
echo $ac_n "(cached) $ac_c" 1>&6
39323984
else
39333985
cat > conftest.$ac_ext <<EOF
3934-
#line 3935 "configure"
3986+
#line 3987 "configure"
39353987
#include "confdefs.h"
39363988
/* System header to define __stub macros and hopefully few prototypes,
39373989
which can conflict with char strcasecmp(); below. */
@@ -3954,7 +4006,7 @@ strcasecmp();
39544006
39554007
; return 0; }
39564008
EOF
3957-
if { (eval echo configure:3958: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
4009+
if { (eval echo configure:4010: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
39584010
rm -rf conftest*
39594011
eval "ac_cv_func_strcasecmp=yes"
39604012
else
@@ -3987,12 +4039,12 @@ fi
39874039

39884040

39894041
echo $ac_n "checking for cbrt""... $ac_c" 1>&6
3990-
echo "configure:3991: checking for cbrt" >&5
4042+
echo "configure:4043: checking for cbrt" >&5
39914043
if eval "test \"`echo '$''{'ac_cv_func_cbrt'+set}'`\" = set"; then
39924044
echo $ac_n "(cached) $ac_c" 1>&6
39934045
else
39944046
cat > conftest.$ac_ext <<EOF
3995-
#line 3996 "configure"
4047+
#line 4048 "configure"
39964048
#include "confdefs.h"
39974049
/* System header to define __stub macros and hopefully few prototypes,
39984050
which can conflict with char cbrt(); below. */
@@ -4015,7 +4067,7 @@ cbrt();
40154067
40164068
; return 0; }
40174069
EOF
4018-
if { (eval echo configure:4019: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
4070+
if { (eval echo configure:4071: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
40194071
rm -rf conftest*
40204072
eval "ac_cv_func_cbrt=yes"
40214073
else
@@ -4036,15 +4088,15 @@ EOF
40364088
else
40374089
echo "$ac_t""no" 1>&6
40384090
echo $ac_n "checking for cbrt in -lm""... $ac_c" 1>&6
4039-
echo "configure:4040: checking for cbrt in -lm" >&5
4091+
echo "configure:4092: checking for cbrt in -lm" >&5
40404092
ac_lib_var=`echo m'_'cbrt | sed 'y%./+-%__p_%'`
40414093
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
40424094
echo $ac_n "(cached) $ac_c" 1>&6
40434095
else
40444096
ac_save_LIBS="$LIBS"
40454097
LIBS="-lm $LIBS"
40464098
cat > conftest.$ac_ext <<EOF
4047-
#line 4048 "configure"
4099+
#line 4100 "configure"
40484100
#include "confdefs.h"
40494101
/* Override any gcc2 internal prototype to avoid an error. */
40504102
/* We use char because int might match the return type of a gcc2
@@ -4055,7 +4107,7 @@ int main() {
40554107
cbrt()
40564108
; return 0; }
40574109
EOF
4058-
if { (eval echo configure:4059: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
4110+
if { (eval echo configure:4111: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
40594111
rm -rf conftest*
40604112
eval "ac_cv_lib_$ac_lib_var=yes"
40614113
else
@@ -4081,12 +4133,12 @@ fi
40814133
fi
40824134

40834135
echo $ac_n "checking for rint""... $ac_c" 1>&6
4084-
echo "configure:4085: checking for rint" >&5
4136+
echo "configure:4137: checking for rint" >&5
40854137
if eval "test \"`echo '$''{'ac_cv_func_rint'+set}'`\" = set"; then
40864138
echo $ac_n "(cached) $ac_c" 1>&6
40874139
else
40884140
cat > conftest.$ac_ext <<EOF
4089-
#line 4090 "configure"
4141+
#line 4142 "configure"
40904142
#include "confdefs.h"
40914143
/* System header to define __stub macros and hopefully few prototypes,
40924144
which can conflict with char rint(); below. */
@@ -4109,7 +4161,7 @@ rint();
41094161
41104162
; return 0; }
41114163
EOF
4112-
if { (eval echo configure:4113: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
4164+
if { (eval echo configure:4165: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
41134165
rm -rf conftest*
41144166
eval "ac_cv_func_rint=yes"
41154167
else
@@ -4130,15 +4182,15 @@ EOF
41304182
else
41314183
echo "$ac_t""no" 1>&6
41324184
echo $ac_n "checking for rint in -lm""... $ac_c" 1>&6
4133-
echo "configure:4134: checking for rint in -lm" >&5
4185+
echo "configure:4186: checking for rint in -lm" >&5
41344186
ac_lib_var=`echo m'_'rint | sed 'y%./+-%__p_%'`
41354187
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
41364188
echo $ac_n "(cached) $ac_c" 1>&6
41374189
else
41384190
ac_save_LIBS="$LIBS"
41394191
LIBS="-lm $LIBS"
41404192
cat > conftest.$ac_ext <<EOF
4141-
#line 4142 "configure"
4193+
#line 4194 "configure"
41424194
#include "confdefs.h"
41434195
/* Override any gcc2 internal prototype to avoid an error. */
41444196
/* We use char because int might match the return type of a gcc2
@@ -4149,7 +4201,7 @@ int main() {
41494201
rint()
41504202
; return 0; }
41514203
EOF
4152-
if { (eval echo configure:4153: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
4204+
if { (eval echo configure:4205: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
41534205
rm -rf conftest*
41544206
eval "ac_cv_lib_$ac_lib_var=yes"
41554207
else
@@ -4176,7 +4228,7 @@ fi
41764228

41774229

41784230
echo $ac_n "checking setting USE_LOCALE""... $ac_c" 1>&6
4179-
echo "configure:4180: checking setting USE_LOCALE" >&5
4231+
echo "configure:4232: checking setting USE_LOCALE" >&5
41804232
if test "$USE_LOCALE" = "yes"
41814233
then
41824234
echo "$ac_t""enabled" 1>&6
@@ -4188,14 +4240,14 @@ else
41884240
echo "$ac_t""disabled" 1>&6
41894241
fi
41904242
echo $ac_n "checking setting DEF_PGPORT""... $ac_c" 1>&6
4191-
echo "configure:4192: checking setting DEF_PGPORT" >&5
4243+
echo "configure:4244: checking setting DEF_PGPORT" >&5
41924244
cat >> confdefs.h <<EOF
41934245
#define DEF_PGPORT "${DEF_PGPORT}"
41944246
EOF
41954247

41964248
echo "$ac_t""$DEF_PGPORT" 1>&6
41974249
echo $ac_n "checking setting HBA""... $ac_c" 1>&6
4198-
echo "configure:4199: checking setting HBA" >&5
4250+
echo "configure:4251: checking setting HBA" >&5
41994251
if test "$NOHBA" = "no"
42004252
then
42014253
echo "$ac_t""enabled" 1>&6

src/configure.in

+3
Original file line numberDiff line numberDiff line change
@@ -480,6 +480,9 @@ AC_CHECK_FUNC(strerror,
480480
AC_CHECK_FUNC(strdup,
481481
AC_DEFINE(HAVE_STRDUP),
482482
STRDUP='../../utils/strdup.o')
483+
AC_CHECK_FUNC(strtol,
484+
AC_DEFINE(HAVE_STRTOL),
485+
STRDUP='strtol.o')
483486
AC_CHECK_FUNC(strcasecmp,
484487
AC_DEFINE(HAVE_STRCASECMP),
485488
STRCASECMP='strcasecmp.o')

src/include/config.h.in

+3
Original file line numberDiff line numberDiff line change
@@ -116,6 +116,9 @@ extern int inet_aton(const char *cp, struct in_addr * addr);
116116
extern int strcasecmp(char *s1, char *s2);
117117
#endif
118118

119+
/* Set to 1 if you have strtol() */
120+
#undef HAVE_STRTOL
121+
119122
/* Set to 1 if you have strdup() */
120123
#undef HAVE_STRDUP
121124
#ifndef HAVE_STRDUP

0 commit comments

Comments
 (0)