From 907881ec8e6077a57c9b9f01c8a30db13cf52b69 Mon Sep 17 00:00:00 2001 From: Tim Rice Date: Thu, 18 Jul 2002 11:44:50 -0700 Subject: [configure.ac] Bug 267 rework int64_t test. --- ChangeLog | 3 ++- configure.ac | 40 +++++++++++----------------------------- 2 files changed, 13 insertions(+), 30 deletions(-) diff --git a/ChangeLog b/ChangeLog index 25fe3eac2..5c2c9d8fe 100644 --- a/ChangeLog +++ b/ChangeLog @@ -2,6 +2,7 @@ - (tim) [defines.h] Bug 313 patch by dirk.meyer@dinoex.sub.org - (tim) [monitor_mm.c] add missing declaration for xmmap(). Reported by ayamura@ayamura.org + - (tim) [configure.ac] Bug 267 rework int64_t test. 20020717 - (bal) aixbff package updated by dtucker@zip.com.au @@ -1387,4 +1388,4 @@ - (stevesk) entropy.c: typo in debug message - (djm) ssh-keygen -i needs seeded RNG; report from markus@ -$Id: ChangeLog,v 1.2375 2002/07/18 18:34:29 tim Exp $ +$Id: ChangeLog,v 1.2376 2002/07/18 18:44:50 tim Exp $ diff --git a/configure.ac b/configure.ac index f94f6c848..281e2f63f 100644 --- a/configure.ac +++ b/configure.ac @@ -1,4 +1,4 @@ -# $Id: configure.ac,v 1.80 2002/07/18 02:20:08 tim Exp $ +# $Id: configure.ac,v 1.81 2002/07/18 18:44:50 tim Exp $ AC_INIT AC_CONFIG_SRCDIR([ssh.c]) @@ -1038,7 +1038,16 @@ fi AC_CACHE_CHECK([for int64_t type], ac_cv_have_int64_t, [ AC_TRY_COMPILE( - [ #include ], + [ +#include +#ifdef HAVE_STDINT_H +# include +#endif +#include +#ifdef HAVE_SYS_BITYPES_H +# include +#endif + ], [ int64_t a; a = 1;], [ ac_cv_have_int64_t="yes" ], [ ac_cv_have_int64_t="no" ] @@ -1046,33 +1055,6 @@ AC_CACHE_CHECK([for int64_t type], ac_cv_have_int64_t, [ ]) if test "x$ac_cv_have_int64_t" = "xyes" ; then AC_DEFINE(HAVE_INT64_T) - have_int64_t=1 -fi - -if test -z "$have_int64_t" ; then - AC_MSG_CHECKING([for int64_t type in sys/socket.h]) - AC_TRY_COMPILE( - [ #include ], - [ int64_t a; a = 1], - [ - AC_DEFINE(HAVE_INT64_T) - AC_MSG_RESULT(yes) - ], - [ AC_MSG_RESULT(no) ] - ) -fi - -if test -z "$have_int64_t" ; then - AC_MSG_CHECKING([for int64_t type in sys/bitypes.h]) - AC_TRY_COMPILE( - [ #include ], - [ int64_t a; a = 1], - [ - AC_DEFINE(HAVE_INT64_T) - AC_MSG_RESULT(yes) - ], - [ AC_MSG_RESULT(no) ] - ) fi AC_CACHE_CHECK([for u_intXX_t types], ac_cv_have_u_intxx_t, [ -- cgit v1.2.3