Commit c5bbf592 authored by Bob Halley's avatar Bob Halley
Browse files

update

parent a456d4c3
......@@ -15,15 +15,6 @@
/* Define if you can safely include both <sys/time.h> and <time.h>. */
#undef TIME_WITH_SYS_TIME
/* define if you need inet_aton() */
#undef NEED_INET_ATON
/* define if you need inet_ntop() */
#undef NEED_INET_NTOP
/* define if you need inet_pton() */
#undef NEED_INET_PTON
/* define if your system needs pthread_init() before using pthreads */
#undef NEED_PTHREAD_INIT
......
#! /bin/sh
# From configure.in Revision: 1.41
# From configure.in Revision: 1.42
......@@ -2136,6 +2136,7 @@ else
ISC_NET_HAVEIPV6="#undef ISC_NET_HAVEIPV6"
ISC_IPV6_H="ipv6.h"
ISC_IPV6_O="ipv6.o"
ISC_ISCIPV6_O="unix/ipv6.o"
ISC_IPV6_C="ipv6.c"
fi
rm -f conftest*
......@@ -2144,6 +2145,7 @@ rm -f conftest*
# Check whether --with-libtool or --without-libtool was given.
if test "${with_libtool+set}" = set; then
withval="$with_libtool"
......@@ -2225,7 +2227,7 @@ else
fi
echo $ac_n "checking build system type""... $ac_c" 1>&6
echo "configure:2229: checking build system type" >&5
echo "configure:2231: checking build system type" >&5
build_alias=$build
case "$build_alias" in
......@@ -2254,7 +2256,7 @@ ac_prog=ld
if test "$ac_cv_prog_gcc" = yes; then
# Check if gcc -print-prog-name=ld gives a path.
echo $ac_n "checking for ld used by GCC""... $ac_c" 1>&6
echo "configure:2258: checking for ld used by GCC" >&5
echo "configure:2260: checking for ld used by GCC" >&5
ac_prog=`($CC -print-prog-name=ld) 2>&5`
case "$ac_prog" in
# Accept absolute paths.
......@@ -2278,10 +2280,10 @@ echo "configure:2258: checking for ld used by GCC" >&5
esac
elif test "$with_gnu_ld" = yes; then
echo $ac_n "checking for GNU ld""... $ac_c" 1>&6
echo "configure:2282: checking for GNU ld" >&5
echo "configure:2284: checking for GNU ld" >&5
else
echo $ac_n "checking for non-GNU ld""... $ac_c" 1>&6
echo "configure:2285: checking for non-GNU ld" >&5
echo "configure:2287: checking for non-GNU ld" >&5
fi
if eval "test \"`echo '$''{'ac_cv_path_LD'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
......@@ -2317,7 +2319,7 @@ fi
test -z "$LD" && { echo "configure: error: no acceptable ld found in \$PATH" 1>&2; exit 1; }
echo $ac_n "checking if the linker ($LD) is GNU ld""... $ac_c" 1>&6
echo "configure:2321: checking if the linker ($LD) is GNU ld" >&5
echo "configure:2323: checking if the linker ($LD) is GNU ld" >&5
if eval "test \"`echo '$''{'ac_cv_prog_gnu_ld'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
......@@ -2333,7 +2335,7 @@ echo "$ac_t""$ac_cv_prog_gnu_ld" 1>&6
echo $ac_n "checking for BSD-compatible nm""... $ac_c" 1>&6
echo "configure:2337: checking for BSD-compatible nm" >&5
echo "configure:2339: checking for BSD-compatible nm" >&5
if eval "test \"`echo '$''{'ac_cv_path_NM'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
......@@ -2370,7 +2372,7 @@ echo "$ac_t""$NM" 1>&6
echo $ac_n "checking whether ln -s works""... $ac_c" 1>&6
echo "configure:2374: checking whether ln -s works" >&5
echo "configure:2376: checking whether ln -s works" >&5
if eval "test \"`echo '$''{'ac_cv_prog_LN_S'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
......@@ -2414,8 +2416,8 @@ test x"$silent" = xyes && libtool_flags="$libtool_flags --silent"
case "$host" in
*-*-irix6*)
# Find out which ABI we are using.
echo '#line 2418 "configure"' > conftest.$ac_ext
if { (eval echo configure:2419: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
echo '#line 2420 "configure"' > conftest.$ac_ext
if { (eval echo configure:2421: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
case "`/usr/bin/file conftest.o`" in
*32-bit*)
LD="${LD-ld} -32"
......@@ -2436,19 +2438,19 @@ case "$host" in
SAVE_CFLAGS="$CFLAGS"
CFLAGS="$CFLAGS -belf"
echo $ac_n "checking whether the C compiler needs -belf""... $ac_c" 1>&6
echo "configure:2440: checking whether the C compiler needs -belf" >&5
echo "configure:2442: checking whether the C compiler needs -belf" >&5
if eval "test \"`echo '$''{'lt_cv_cc_needs_belf'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
#line 2445 "configure"
#line 2447 "configure"
#include "confdefs.h"
int main() {
; return 0; }
EOF
if { (eval echo configure:2452: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
if { (eval echo configure:2454: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
lt_cv_cc_needs_belf=yes
else
......@@ -2563,12 +2565,12 @@ esac
echo $ac_n "checking for inet_ntop""... $ac_c" 1>&6
echo "configure:2567: checking for inet_ntop" >&5
echo "configure:2569: checking for inet_ntop" >&5
if eval "test \"`echo '$''{'ac_cv_func_inet_ntop'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
#line 2572 "configure"
#line 2574 "configure"
#include "confdefs.h"
/* System header to define __stub macros and hopefully few prototypes,
which can conflict with char inet_ntop(); below. */
......@@ -2591,7 +2593,7 @@ inet_ntop();
; return 0; }
EOF
if { (eval echo configure:2595: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
if { (eval echo configure:2597: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_func_inet_ntop=yes"
else
......@@ -2605,25 +2607,22 @@ fi
if eval "test \"`echo '$ac_cv_func_'inet_ntop`\" = yes"; then
echo "$ac_t""yes" 1>&6
:
ISC_NET_NEEDNTOP="#undef ISC_NET_NEEDNTOP"
else
echo "$ac_t""no" 1>&6
ISC_EXTRA_OBJS="$ISC_EXTRA_OBJS inet_ntop.$O"
ISC_EXTRA_SRCS="$ISC_EXTRA_SRCS inet_ntop.c"
cat >> confdefs.h <<\EOF
#define NEED_INET_NTOP 1
EOF
ISC_NET_NEEDNTOP="#define ISC_NET_NEEDNTOP 1"
fi
echo $ac_n "checking for inet_pton""... $ac_c" 1>&6
echo "configure:2622: checking for inet_pton" >&5
echo "configure:2621: checking for inet_pton" >&5
if eval "test \"`echo '$''{'ac_cv_func_inet_pton'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
#line 2627 "configure"
#line 2626 "configure"
#include "confdefs.h"
/* System header to define __stub macros and hopefully few prototypes,
which can conflict with char inet_pton(); below. */
......@@ -2646,7 +2645,7 @@ inet_pton();
; return 0; }
EOF
if { (eval echo configure:2650: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
if { (eval echo configure:2649: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_func_inet_pton=yes"
else
......@@ -2660,25 +2659,22 @@ fi
if eval "test \"`echo '$ac_cv_func_'inet_pton`\" = yes"; then
echo "$ac_t""yes" 1>&6
:
ISC_NET_NEEDPTON="#undef ISC_NET_NEEDPTON"
else
echo "$ac_t""no" 1>&6
ISC_EXTRA_OBJS="$ISC_EXTRA_OBJS inet_pton.$O"
ISC_EXTRA_SRCS="$ISC_EXTRA_SRCS inet_pton.c"
cat >> confdefs.h <<\EOF
#define NEED_INET_PTON 1
EOF
ISC_NET_NEEDPTON="#define ISC_NET_NEEDPTON 1"
fi
echo $ac_n "checking for inet_aton""... $ac_c" 1>&6
echo "configure:2677: checking for inet_aton" >&5
echo "configure:2673: checking for inet_aton" >&5
if eval "test \"`echo '$''{'ac_cv_func_inet_aton'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
#line 2682 "configure"
#line 2678 "configure"
#include "confdefs.h"
/* System header to define __stub macros and hopefully few prototypes,
which can conflict with char inet_aton(); below. */
......@@ -2701,7 +2697,7 @@ inet_aton();
; return 0; }
EOF
if { (eval echo configure:2705: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
if { (eval echo configure:2701: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_func_inet_aton=yes"
else
......@@ -2715,15 +2711,12 @@ fi
if eval "test \"`echo '$ac_cv_func_'inet_aton`\" = yes"; then
echo "$ac_t""yes" 1>&6
:
ISC_NET_NEEDATON="#undef ISC_NET_NEEDATON"
else
echo "$ac_t""no" 1>&6
ISC_EXTRA_OBJS="$ISC_EXTRA_OBJS inet_aton.$O"
ISC_EXTRA_SRCS="$ISC_EXTRA_SRCS inet_aton.c"
cat >> confdefs.h <<\EOF
#define NEED_INET_ATON 1
EOF
ISC_NET_NEEDATON="#define ISC_NET_NEEDATON 1"
fi
......@@ -2731,6 +2724,9 @@ fi
BIND9_TOP_BUILDDIR=`pwd`
......@@ -2939,6 +2935,7 @@ s%@ISC_NET_NEEDAFINET6@%$ISC_NET_NEEDAFINET6%g
s%@ISC_NET_HAVEIPV6@%$ISC_NET_HAVEIPV6%g
s%@ISC_IPV6_H@%$ISC_IPV6_H%g
s%@ISC_IPV6_O@%$ISC_IPV6_O%g
s%@ISC_ISCIPV6_O@%$ISC_ISCIPV6_O%g
s%@ISC_IPV6_C@%$ISC_IPV6_C%g
s%@build@%$build%g
s%@build_alias@%$build_alias%g
......@@ -2951,6 +2948,9 @@ s%@LN_S@%$LN_S%g
s%@LIBTOOL@%$LIBTOOL%g
s%@O@%$O%g
s%@A@%$A%g
s%@ISC_NET_NEEDNTOP@%$ISC_NET_NEEDNTOP%g
s%@ISC_NET_NEEDPTON@%$ISC_NET_NEEDPTON%g
s%@ISC_NET_NEEDATON@%$ISC_NET_NEEDATON%g
s%@ISC_EXTRA_OBJS@%$ISC_EXTRA_OBJS%g
s%@ISC_EXTRA_SRCS@%$ISC_EXTRA_SRCS%g
s%@BIND9_TOP_BUILDDIR@%$BIND9_TOP_BUILDDIR%g
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment