From 9de05727e334336ceb0abcca404d770abd23b876 Mon Sep 17 00:00:00 2001 From: Mark Andrews Date: Tue, 11 Oct 2005 22:34:09 +0000 Subject: [PATCH] 1925. [port] All outer level AC_TRY_RUNs need cross compiling defaults. [RT #15469] --- CHANGES | 3 +++ configure | 27 ++++++++++++--------------- configure.in | 21 +++++++++++++++++---- 3 files changed, 32 insertions(+), 19 deletions(-) diff --git a/CHANGES b/CHANGES index 413b7f5f0b..26512eca31 100644 --- a/CHANGES +++ b/CHANGES @@ -1,3 +1,6 @@ +1925. [port] All outer level AC_TRY_RUNs need cross compiling + defaults. [RT #15469] + 1924. [port] libbind: hpux ia64 support. [RT #15473] 1923. [bug] ns_client_detach() called too early. [RT #15499] diff --git a/configure b/configure index 5d25769359..dc949331cb 100755 --- a/configure +++ b/configure @@ -14,7 +14,7 @@ # OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR # PERFORMANCE OF THIS SOFTWARE. # -# $Id: configure,v 1.382 2005/09/09 06:17:03 marka Exp $ +# $Id: configure,v 1.383 2005/10/11 22:34:09 marka Exp $ # # Portions Copyright (C) 1996-2001 Nominum, Inc. # @@ -29,7 +29,7 @@ # WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN # ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT # OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. -# From configure.in Revision: 1.393 . +# From configure.in Revision: 1.394 . # Guess values for system-dependent variables and create Makefiles. # Generated by GNU Autoconf 2.59. # @@ -23773,11 +23773,11 @@ rm -f conftest.err conftest.$ac_objext \ echo "$as_me:$LINENO: checking for inet_ntop with IPv6 support" >&5 echo $ECHO_N "checking for inet_ntop with IPv6 support... $ECHO_C" >&6 if test "$cross_compiling" = yes; then - { { echo "$as_me:$LINENO: error: cannot run test program while cross compiling -See \`config.log' for more details." >&5 -echo "$as_me: error: cannot run test program while cross compiling -See \`config.log' for more details." >&2;} - { (exit 1); exit 1; }; } + echo "$as_me:$LINENO: result: assuming inet_ntop needed" >&5 +echo "${ECHO_T}assuming inet_ntop needed" >&6 + ISC_EXTRA_OBJS="$ISC_EXTRA_OBJS inet_ntop.$O" + ISC_EXTRA_SRCS="$ISC_EXTRA_SRCS inet_ntop.c" + ISC_PLATFORM_NEEDNTOP="#define ISC_PLATFORM_NEEDNTOP 1" else cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ @@ -26958,9 +26958,10 @@ echo "${ECHO_T}no" >&6 echo "$as_me:$LINENO: checking type of rlim_cur" >&5 echo $ECHO_N "checking type of rlim_cur... $ECHO_C" >&6 if test "$cross_compiling" = yes; then - { { echo "$as_me:$LINENO: error: cannot determine type of rlim_cur when cross compiling - define rlim_t" >&5 -echo "$as_me: error: cannot determine type of rlim_cur when cross compiling - define rlim_t" >&2;} - { (exit 1); exit 1; }; } + +ISC_PLATFORM_RLIMITTYPE="#define ISC_PLATFORM_RLIMITTYPE long long int" +echo "$as_me:$LINENO: result: cannot determine type of rlim_cur when cross compiling - assuming long long int" >&5 +echo "${ECHO_T}cannot determine type of rlim_cur when cross compiling - assuming long long int" >&6 else cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ @@ -27561,11 +27562,7 @@ echo $ECHO_N "checking architecture type for atomic operations... $ECHO_C" >&6 # XXX: some old x86 architectures actually do not support # (some of) these operations. Do we need stricter checks? if test "$cross_compiling" = yes; then - { { echo "$as_me:$LINENO: error: cannot run test program while cross compiling -See \`config.log' for more details." >&5 -echo "$as_me: error: cannot run test program while cross compiling -See \`config.log' for more details." >&2;} - { (exit 1); exit 1; }; } + arch=x86_32 else cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ diff --git a/configure.in b/configure.in index 42f3159f2f..c41de80933 100644 --- a/configure.in +++ b/configure.in @@ -18,7 +18,7 @@ AC_DIVERT_PUSH(1)dnl esyscmd([sed "s/^/# /" COPYRIGHT])dnl AC_DIVERT_POP()dnl -AC_REVISION($Revision: 1.393 $) +AC_REVISION($Revision: 1.394 $) AC_INIT(lib/dns/name.c) AC_PREREQ(2.59) @@ -1273,6 +1273,10 @@ char a[16],b[64]; return(inet_ntop(AF_INET6, a, b, sizeof(b)) == (char*)0);}], [AC_MSG_RESULT(no) ISC_EXTRA_OBJS="$ISC_EXTRA_OBJS inet_ntop.$O" ISC_EXTRA_SRCS="$ISC_EXTRA_SRCS inet_ntop.c" + ISC_PLATFORM_NEEDNTOP="#define ISC_PLATFORM_NEEDNTOP 1"], + [AC_MSG_RESULT(assuming inet_ntop needed) + ISC_EXTRA_OBJS="$ISC_EXTRA_OBJS inet_ntop.$O" + ISC_EXTRA_SRCS="$ISC_EXTRA_SRCS inet_ntop.c" ISC_PLATFORM_NEEDNTOP="#define ISC_PLATFORM_NEEDNTOP 1"]) @@ -1296,7 +1300,13 @@ main() { char a[16]; return (inet_pton(AF_INET, "1.2.3", a) == 1 ? 1 : ISC_EXTRA_SRCS="$ISC_EXTRA_SRCS inet_pton.c" ISC_PLATFORM_NEEDPTON="#define ISC_PLATFORM_NEEDPTON 1"], [AC_MSG_RESULT(assuming target platform has working inet_pton) - ISC_PLATFORM_NEEDPTON="#undef ISC_PLATFORM_NEEDPTON"]) + ISC_PLATFORM_NEEDPTON="#undef ISC_PLATFORM_NEEDPTON"], + [AC_MSG_RESULT(assuming inet_pton needed) + ISC_EXTRA_OBJS="$ISC_EXTRA_OBJS inet_pton.$O" + ISC_EXTRA_SRCS="$ISC_EXTRA_SRCS inet_pton.c" + ISC_PLATFORM_NEEDPTON="#define ISC_PLATFORM_NEEDPTON 1"], + [AC_MSG_RESULT(assuming target platform has working inet_pton) + ISC_PLATFORM_NEEDPTON="#undef ISC_PLATFORM_NEEDPTON"]) AC_MSG_CHECKING([for inet_aton]) AC_TRY_LINK([ @@ -1742,7 +1752,9 @@ ISC_PLATFORM_RLIMITTYPE="#define ISC_PLATFORM_RLIMITTYPE long long int"], [AC_MSG_ERROR([unable to determine sizeof rlim_cur]) ],[AC_MSG_ERROR(this cannot happen)]) ],[AC_MSG_ERROR(this cannot happen)]) -],[AC_MSG_ERROR(cannot determine type of rlim_cur when cross compiling - define rlim_t)]) +],[ +ISC_PLATFORM_RLIMITTYPE="#define ISC_PLATFORM_RLIMITTYPE long long int" +AC_MSG_RESULT(cannot determine type of rlim_cur when cross compiling - assuming long long int)]) ]) AC_SUBST(ISC_PLATFORM_RLIMITTYPE) @@ -1888,7 +1900,8 @@ main() { } ], [arch=x86_64], - [arch=x86_32]) + [arch=x86_32], + [arch=x86_32]) ;; x86_64-*) arch=x86_64