Fix, I think, the stdup.o problem reported on those systems without
it.
This commit is contained in:
parent
00bcb8a0ed
commit
bb21784caa
29
src/configure
vendored
29
src/configure
vendored
@ -3103,23 +3103,24 @@ fi
|
|||||||
|
|
||||||
if eval "test \"`echo '$ac_cv_func_'strdup`\" = yes"; then
|
if eval "test \"`echo '$ac_cv_func_'strdup`\" = yes"; then
|
||||||
echo "$ac_t""yes" 1>&6
|
echo "$ac_t""yes" 1>&6
|
||||||
STRDUP='../../utils/strdup.o' cat >> confdefs.h <<\EOF
|
cat >> confdefs.h <<\EOF
|
||||||
#define HAVE_STRDUP 1
|
#define HAVE_STRDUP 1
|
||||||
EOF
|
EOF
|
||||||
|
|
||||||
else
|
else
|
||||||
echo "$ac_t""no" 1>&6
|
echo "$ac_t""no" 1>&6
|
||||||
|
STRDUP='../../utils/strdup.o'
|
||||||
fi
|
fi
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
echo $ac_n "checking for cbrt""... $ac_c" 1>&6
|
echo $ac_n "checking for cbrt""... $ac_c" 1>&6
|
||||||
echo "configure:3118: checking for cbrt" >&5
|
echo "configure:3119: checking for cbrt" >&5
|
||||||
if eval "test \"`echo '$''{'ac_cv_func_cbrt'+set}'`\" = set"; then
|
if eval "test \"`echo '$''{'ac_cv_func_cbrt'+set}'`\" = set"; then
|
||||||
echo $ac_n "(cached) $ac_c" 1>&6
|
echo $ac_n "(cached) $ac_c" 1>&6
|
||||||
else
|
else
|
||||||
cat > conftest.$ac_ext <<EOF
|
cat > conftest.$ac_ext <<EOF
|
||||||
#line 3123 "configure"
|
#line 3124 "configure"
|
||||||
#include "confdefs.h"
|
#include "confdefs.h"
|
||||||
/* System header to define __stub macros and hopefully few prototypes,
|
/* System header to define __stub macros and hopefully few prototypes,
|
||||||
which can conflict with char cbrt(); below. */
|
which can conflict with char cbrt(); below. */
|
||||||
@ -3142,7 +3143,7 @@ cbrt();
|
|||||||
|
|
||||||
; return 0; }
|
; return 0; }
|
||||||
EOF
|
EOF
|
||||||
if { (eval echo configure:3146: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
|
if { (eval echo configure:3147: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
|
||||||
rm -rf conftest*
|
rm -rf conftest*
|
||||||
eval "ac_cv_func_cbrt=yes"
|
eval "ac_cv_func_cbrt=yes"
|
||||||
else
|
else
|
||||||
@ -3163,7 +3164,7 @@ EOF
|
|||||||
else
|
else
|
||||||
echo "$ac_t""no" 1>&6
|
echo "$ac_t""no" 1>&6
|
||||||
echo $ac_n "checking for cbrt in -lm""... $ac_c" 1>&6
|
echo $ac_n "checking for cbrt in -lm""... $ac_c" 1>&6
|
||||||
echo "configure:3167: checking for cbrt in -lm" >&5
|
echo "configure:3168: checking for cbrt in -lm" >&5
|
||||||
ac_lib_var=`echo m'_'cbrt | sed 'y%./+-%__p_%'`
|
ac_lib_var=`echo m'_'cbrt | sed 'y%./+-%__p_%'`
|
||||||
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
|
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
|
||||||
echo $ac_n "(cached) $ac_c" 1>&6
|
echo $ac_n "(cached) $ac_c" 1>&6
|
||||||
@ -3171,7 +3172,7 @@ else
|
|||||||
ac_save_LIBS="$LIBS"
|
ac_save_LIBS="$LIBS"
|
||||||
LIBS="-lm $LIBS"
|
LIBS="-lm $LIBS"
|
||||||
cat > conftest.$ac_ext <<EOF
|
cat > conftest.$ac_ext <<EOF
|
||||||
#line 3175 "configure"
|
#line 3176 "configure"
|
||||||
#include "confdefs.h"
|
#include "confdefs.h"
|
||||||
/* Override any gcc2 internal prototype to avoid an error. */
|
/* Override any gcc2 internal prototype to avoid an error. */
|
||||||
/* We use char because int might match the return type of a gcc2
|
/* We use char because int might match the return type of a gcc2
|
||||||
@ -3182,7 +3183,7 @@ int main() {
|
|||||||
cbrt()
|
cbrt()
|
||||||
; return 0; }
|
; return 0; }
|
||||||
EOF
|
EOF
|
||||||
if { (eval echo configure:3186: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
|
if { (eval echo configure:3187: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
|
||||||
rm -rf conftest*
|
rm -rf conftest*
|
||||||
eval "ac_cv_lib_$ac_lib_var=yes"
|
eval "ac_cv_lib_$ac_lib_var=yes"
|
||||||
else
|
else
|
||||||
@ -3208,12 +3209,12 @@ fi
|
|||||||
fi
|
fi
|
||||||
|
|
||||||
echo $ac_n "checking for rint""... $ac_c" 1>&6
|
echo $ac_n "checking for rint""... $ac_c" 1>&6
|
||||||
echo "configure:3212: checking for rint" >&5
|
echo "configure:3213: checking for rint" >&5
|
||||||
if eval "test \"`echo '$''{'ac_cv_func_rint'+set}'`\" = set"; then
|
if eval "test \"`echo '$''{'ac_cv_func_rint'+set}'`\" = set"; then
|
||||||
echo $ac_n "(cached) $ac_c" 1>&6
|
echo $ac_n "(cached) $ac_c" 1>&6
|
||||||
else
|
else
|
||||||
cat > conftest.$ac_ext <<EOF
|
cat > conftest.$ac_ext <<EOF
|
||||||
#line 3217 "configure"
|
#line 3218 "configure"
|
||||||
#include "confdefs.h"
|
#include "confdefs.h"
|
||||||
/* System header to define __stub macros and hopefully few prototypes,
|
/* System header to define __stub macros and hopefully few prototypes,
|
||||||
which can conflict with char rint(); below. */
|
which can conflict with char rint(); below. */
|
||||||
@ -3236,7 +3237,7 @@ rint();
|
|||||||
|
|
||||||
; return 0; }
|
; return 0; }
|
||||||
EOF
|
EOF
|
||||||
if { (eval echo configure:3240: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
|
if { (eval echo configure:3241: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
|
||||||
rm -rf conftest*
|
rm -rf conftest*
|
||||||
eval "ac_cv_func_rint=yes"
|
eval "ac_cv_func_rint=yes"
|
||||||
else
|
else
|
||||||
@ -3257,7 +3258,7 @@ EOF
|
|||||||
else
|
else
|
||||||
echo "$ac_t""no" 1>&6
|
echo "$ac_t""no" 1>&6
|
||||||
echo $ac_n "checking for rint in -lm""... $ac_c" 1>&6
|
echo $ac_n "checking for rint in -lm""... $ac_c" 1>&6
|
||||||
echo "configure:3261: checking for rint in -lm" >&5
|
echo "configure:3262: checking for rint in -lm" >&5
|
||||||
ac_lib_var=`echo m'_'rint | sed 'y%./+-%__p_%'`
|
ac_lib_var=`echo m'_'rint | sed 'y%./+-%__p_%'`
|
||||||
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
|
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
|
||||||
echo $ac_n "(cached) $ac_c" 1>&6
|
echo $ac_n "(cached) $ac_c" 1>&6
|
||||||
@ -3265,7 +3266,7 @@ else
|
|||||||
ac_save_LIBS="$LIBS"
|
ac_save_LIBS="$LIBS"
|
||||||
LIBS="-lm $LIBS"
|
LIBS="-lm $LIBS"
|
||||||
cat > conftest.$ac_ext <<EOF
|
cat > conftest.$ac_ext <<EOF
|
||||||
#line 3269 "configure"
|
#line 3270 "configure"
|
||||||
#include "confdefs.h"
|
#include "confdefs.h"
|
||||||
/* Override any gcc2 internal prototype to avoid an error. */
|
/* Override any gcc2 internal prototype to avoid an error. */
|
||||||
/* We use char because int might match the return type of a gcc2
|
/* We use char because int might match the return type of a gcc2
|
||||||
@ -3276,7 +3277,7 @@ int main() {
|
|||||||
rint()
|
rint()
|
||||||
; return 0; }
|
; return 0; }
|
||||||
EOF
|
EOF
|
||||||
if { (eval echo configure:3280: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
|
if { (eval echo configure:3281: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
|
||||||
rm -rf conftest*
|
rm -rf conftest*
|
||||||
eval "ac_cv_lib_$ac_lib_var=yes"
|
eval "ac_cv_lib_$ac_lib_var=yes"
|
||||||
else
|
else
|
||||||
@ -3461,8 +3462,8 @@ s%@xargs@%$xargs%g
|
|||||||
s%@ipcs@%$ipcs%g
|
s%@ipcs@%$ipcs%g
|
||||||
s%@ipcrm@%$ipcrm%g
|
s%@ipcrm@%$ipcrm%g
|
||||||
s%@LIBOBJS@%$LIBOBJS%g
|
s%@LIBOBJS@%$LIBOBJS%g
|
||||||
s%@INET_ATON@%$INET_ATON%g
|
|
||||||
s%@STRDUP@%$STRDUP%g
|
s%@STRDUP@%$STRDUP%g
|
||||||
|
s%@INET_ATON@%$INET_ATON%g
|
||||||
|
|
||||||
CEOF
|
CEOF
|
||||||
EOF
|
EOF
|
||||||
|
@ -160,9 +160,9 @@ AC_FUNC_VPRINTF
|
|||||||
AC_CHECK_FUNCS(isinf tzset getrusage vfork memmove sigsetjmp kill sysconf)
|
AC_CHECK_FUNCS(isinf tzset getrusage vfork memmove sigsetjmp kill sysconf)
|
||||||
AC_CHECK_FUNCS(sigprocmask waitpid setsid)
|
AC_CHECK_FUNCS(sigprocmask waitpid setsid)
|
||||||
AC_CHECK_FUNC(inet_aton, AC_DEFINE(HAVE_INET_ATON), INET_ATON='inet_aton.o')
|
AC_CHECK_FUNC(inet_aton, AC_DEFINE(HAVE_INET_ATON), INET_ATON='inet_aton.o')
|
||||||
AC_CHECK_FUNC(strdup, [STRDUP='../../utils/strdup.o' AC_DEFINE(HAVE_STRDUP)])
|
AC_CHECK_FUNC(strdup, AC_DEFINE(HAVE_STRDUP), STRDUP='../../utils/strdup.o')
|
||||||
AC_SUBST(INET_ATON)
|
|
||||||
AC_SUBST(STRDUP)
|
AC_SUBST(STRDUP)
|
||||||
|
AC_SUBST(INET_ATON)
|
||||||
AC_CHECK_FUNC(cbrt, AC_DEFINE(HAVE_CBRT), AC_CHECK_LIB(m, cbrt, AC_DEFINE(HAVE_CBRT)))
|
AC_CHECK_FUNC(cbrt, AC_DEFINE(HAVE_CBRT), AC_CHECK_LIB(m, cbrt, AC_DEFINE(HAVE_CBRT)))
|
||||||
AC_CHECK_FUNC(rint, AC_DEFINE(HAVE_RINT), AC_CHECK_LIB(m, rint, AC_DEFINE(HAVE_RINT)))
|
AC_CHECK_FUNC(rint, AC_DEFINE(HAVE_RINT), AC_CHECK_LIB(m, rint, AC_DEFINE(HAVE_RINT)))
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user