Only need to check for strerror once :)
This commit is contained in:
Marc G. Fournier
parent
ed7a17dca0
commit
ceac1d5a4e
|
|
@ -3622,68 +3622,16 @@ EOF
|
|||
|
||||
else
|
||||
echo "$ac_t""no" 1>&6
|
||||
STRERROR='strerror.o'
|
||||
fi
|
||||
|
||||
echo $ac_n "checking for strerror""... $ac_c" 1>&6
|
||||
echo "configure:3630: checking for strerror" >&5
|
||||
if eval "test \"`echo '$''{'ac_cv_func_strerror'+set}'`\" = set"; then
|
||||
echo $ac_n "(cached) $ac_c" 1>&6
|
||||
else
|
||||
cat > conftest.$ac_ext <<EOF
|
||||
#line 3635 "configure"
|
||||
#include "confdefs.h"
|
||||
/* System header to define __stub macros and hopefully few prototypes,
|
||||
which can conflict with char strerror(); 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 strerror();
|
||||
|
||||
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_strerror) || defined (__stub___strerror)
|
||||
choke me
|
||||
#else
|
||||
strerror();
|
||||
#endif
|
||||
|
||||
; return 0; }
|
||||
EOF
|
||||
if { (eval echo configure:3658: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
|
||||
rm -rf conftest*
|
||||
eval "ac_cv_func_strerror=yes"
|
||||
else
|
||||
echo "configure: failed program was:" >&5
|
||||
cat conftest.$ac_ext >&5
|
||||
rm -rf conftest*
|
||||
eval "ac_cv_func_strerror=no"
|
||||
fi
|
||||
rm -f conftest*
|
||||
fi
|
||||
|
||||
if eval "test \"`echo '$ac_cv_func_'strerror`\" = yes"; then
|
||||
echo "$ac_t""yes" 1>&6
|
||||
cat >> confdefs.h <<\EOF
|
||||
#define HAVE_STRERROR 1
|
||||
EOF
|
||||
|
||||
else
|
||||
echo "$ac_t""no" 1>&6
|
||||
STRERROR2='../../backend/port/strerror.o'
|
||||
STRERROR='strerror.o' STRERROR2='../../backend/port/strerror.o'
|
||||
fi
|
||||
|
||||
echo $ac_n "checking for strdup""... $ac_c" 1>&6
|
||||
echo "configure:3682: checking for strdup" >&5
|
||||
echo "configure:3630: checking for strdup" >&5
|
||||
if eval "test \"`echo '$''{'ac_cv_func_strdup'+set}'`\" = set"; then
|
||||
echo $ac_n "(cached) $ac_c" 1>&6
|
||||
else
|
||||
cat > conftest.$ac_ext <<EOF
|
||||
#line 3687 "configure"
|
||||
#line 3635 "configure"
|
||||
#include "confdefs.h"
|
||||
/* System header to define __stub macros and hopefully few prototypes,
|
||||
which can conflict with char strdup(); below. */
|
||||
|
|
@ -3706,7 +3654,7 @@ strdup();
|
|||
|
||||
; return 0; }
|
||||
EOF
|
||||
if { (eval echo configure:3710: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
|
||||
if { (eval echo configure:3658: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
|
||||
rm -rf conftest*
|
||||
eval "ac_cv_func_strdup=yes"
|
||||
else
|
||||
|
|
@ -3734,12 +3682,12 @@ fi
|
|||
|
||||
|
||||
echo $ac_n "checking for cbrt""... $ac_c" 1>&6
|
||||
echo "configure:3738: checking for cbrt" >&5
|
||||
echo "configure:3686: 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 3743 "configure"
|
||||
#line 3691 "configure"
|
||||
#include "confdefs.h"
|
||||
/* System header to define __stub macros and hopefully few prototypes,
|
||||
which can conflict with char cbrt(); below. */
|
||||
|
|
@ -3762,7 +3710,7 @@ cbrt();
|
|||
|
||||
; return 0; }
|
||||
EOF
|
||||
if { (eval echo configure:3766: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
|
||||
if { (eval echo configure:3714: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
|
||||
rm -rf conftest*
|
||||
eval "ac_cv_func_cbrt=yes"
|
||||
else
|
||||
|
|
@ -3783,7 +3731,7 @@ EOF
|
|||
else
|
||||
echo "$ac_t""no" 1>&6
|
||||
echo $ac_n "checking for cbrt in -lm""... $ac_c" 1>&6
|
||||
echo "configure:3787: checking for cbrt in -lm" >&5
|
||||
echo "configure:3735: 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
|
||||
|
|
@ -3791,7 +3739,7 @@ else
|
|||
ac_save_LIBS="$LIBS"
|
||||
LIBS="-lm $LIBS"
|
||||
cat > conftest.$ac_ext <<EOF
|
||||
#line 3795 "configure"
|
||||
#line 3743 "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
|
||||
|
|
@ -3802,7 +3750,7 @@ int main() {
|
|||
cbrt()
|
||||
; return 0; }
|
||||
EOF
|
||||
if { (eval echo configure:3806: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
|
||||
if { (eval echo configure:3754: \"$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
|
||||
|
|
@ -3828,12 +3776,12 @@ fi
|
|||
fi
|
||||
|
||||
echo $ac_n "checking for rint""... $ac_c" 1>&6
|
||||
echo "configure:3832: checking for rint" >&5
|
||||
echo "configure:3780: 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 3837 "configure"
|
||||
#line 3785 "configure"
|
||||
#include "confdefs.h"
|
||||
/* System header to define __stub macros and hopefully few prototypes,
|
||||
which can conflict with char rint(); below. */
|
||||
|
|
@ -3856,7 +3804,7 @@ rint();
|
|||
|
||||
; return 0; }
|
||||
EOF
|
||||
if { (eval echo configure:3860: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
|
||||
if { (eval echo configure:3808: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
|
||||
rm -rf conftest*
|
||||
eval "ac_cv_func_rint=yes"
|
||||
else
|
||||
|
|
@ -3877,7 +3825,7 @@ EOF
|
|||
else
|
||||
echo "$ac_t""no" 1>&6
|
||||
echo $ac_n "checking for rint in -lm""... $ac_c" 1>&6
|
||||
echo "configure:3881: checking for rint in -lm" >&5
|
||||
echo "configure:3829: 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
|
||||
|
|
@ -3885,7 +3833,7 @@ else
|
|||
ac_save_LIBS="$LIBS"
|
||||
LIBS="-lm $LIBS"
|
||||
cat > conftest.$ac_ext <<EOF
|
||||
#line 3889 "configure"
|
||||
#line 3837 "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
|
||||
|
|
@ -3896,7 +3844,7 @@ int main() {
|
|||
rint()
|
||||
; return 0; }
|
||||
EOF
|
||||
if { (eval echo configure:3900: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
|
||||
if { (eval echo configure:3848: \"$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
|
||||
|
|
@ -3923,7 +3871,7 @@ fi
|
|||
|
||||
|
||||
echo $ac_n "checking setting USE_LOCALE""... $ac_c" 1>&6
|
||||
echo "configure:3927: checking setting USE_LOCALE" >&5
|
||||
echo "configure:3875: checking setting USE_LOCALE" >&5
|
||||
if test "$USE_LOCALE" = "yes"
|
||||
then
|
||||
echo "$ac_t""enabled" 1>&6
|
||||
|
|
@ -3935,14 +3883,14 @@ else
|
|||
echo "$ac_t""disabled" 1>&6
|
||||
fi
|
||||
echo $ac_n "checking setting DEF_PGPORT""... $ac_c" 1>&6
|
||||
echo "configure:3939: checking setting DEF_PGPORT" >&5
|
||||
echo "configure:3887: 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:3946: checking setting HBA" >&5
|
||||
echo "configure:3894: checking setting HBA" >&5
|
||||
if test "$NOHBA" = "no"
|
||||
then
|
||||
echo "$ac_t""enabled" 1>&6
|
||||
|
|
|
|||
|
|
@ -418,8 +418,7 @@ AC_FUNC_VPRINTF
|
|||
AC_CHECK_FUNCS(isinf tzset getrusage vfork memmove sigsetjmp kill sysconf)
|
||||
AC_CHECK_FUNCS(sigprocmask waitpid setsid random fcvt)
|
||||
AC_CHECK_FUNC(inet_aton, AC_DEFINE(HAVE_INET_ATON), INET_ATON='inet_aton.o')
|
||||
AC_CHECK_FUNC(strerror, AC_DEFINE(HAVE_STRERROR), STRERROR='strerror.o')
|
||||
AC_CHECK_FUNC(strerror, AC_DEFINE(HAVE_STRERROR), STRERROR2='../../backend/port/strerror.o')
|
||||
AC_CHECK_FUNC(strerror, AC_DEFINE(HAVE_STRERROR), [STRERROR='strerror.o' STRERROR2='../../backend/port/strerror.o'])
|
||||
AC_CHECK_FUNC(strdup, AC_DEFINE(HAVE_STRDUP), STRDUP='../../utils/strdup.o')
|
||||
AC_SUBST(STRDUP)
|
||||
AC_SUBST(INET_ATON)
|
||||
|
|
|
|||
Loading…
Reference in New Issue