summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog3
-rw-r--r--configure.ac40
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 @@
2 - (tim) [defines.h] Bug 313 patch by dirk.meyer@dinoex.sub.org 2 - (tim) [defines.h] Bug 313 patch by dirk.meyer@dinoex.sub.org
3 - (tim) [monitor_mm.c] add missing declaration for xmmap(). Reported 3 - (tim) [monitor_mm.c] add missing declaration for xmmap(). Reported
4 by ayamura@ayamura.org 4 by ayamura@ayamura.org
5 - (tim) [configure.ac] Bug 267 rework int64_t test.
5 6
620020717 720020717
7 - (bal) aixbff package updated by dtucker@zip.com.au 8 - (bal) aixbff package updated by dtucker@zip.com.au
@@ -1387,4 +1388,4 @@
1387 - (stevesk) entropy.c: typo in debug message 1388 - (stevesk) entropy.c: typo in debug message
1388 - (djm) ssh-keygen -i needs seeded RNG; report from markus@ 1389 - (djm) ssh-keygen -i needs seeded RNG; report from markus@
1389 1390
1390$Id: ChangeLog,v 1.2375 2002/07/18 18:34:29 tim Exp $ 1391$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 @@
1# $Id: configure.ac,v 1.80 2002/07/18 02:20:08 tim Exp $ 1# $Id: configure.ac,v 1.81 2002/07/18 18:44:50 tim Exp $
2 2
3AC_INIT 3AC_INIT
4AC_CONFIG_SRCDIR([ssh.c]) 4AC_CONFIG_SRCDIR([ssh.c])
@@ -1038,7 +1038,16 @@ fi
1038 1038
1039AC_CACHE_CHECK([for int64_t type], ac_cv_have_int64_t, [ 1039AC_CACHE_CHECK([for int64_t type], ac_cv_have_int64_t, [
1040 AC_TRY_COMPILE( 1040 AC_TRY_COMPILE(
1041 [ #include <sys/types.h> ], 1041 [
1042#include <sys/types.h>
1043#ifdef HAVE_STDINT_H
1044# include <stdint.h>
1045#endif
1046#include <sys/socket.h>
1047#ifdef HAVE_SYS_BITYPES_H
1048# include <sys/bitypes.h>
1049#endif
1050 ],
1042 [ int64_t a; a = 1;], 1051 [ int64_t a; a = 1;],
1043 [ ac_cv_have_int64_t="yes" ], 1052 [ ac_cv_have_int64_t="yes" ],
1044 [ ac_cv_have_int64_t="no" ] 1053 [ ac_cv_have_int64_t="no" ]
@@ -1046,33 +1055,6 @@ AC_CACHE_CHECK([for int64_t type], ac_cv_have_int64_t, [
1046]) 1055])
1047if test "x$ac_cv_have_int64_t" = "xyes" ; then 1056if test "x$ac_cv_have_int64_t" = "xyes" ; then
1048 AC_DEFINE(HAVE_INT64_T) 1057 AC_DEFINE(HAVE_INT64_T)
1049 have_int64_t=1
1050fi
1051
1052if test -z "$have_int64_t" ; then
1053 AC_MSG_CHECKING([for int64_t type in sys/socket.h])
1054 AC_TRY_COMPILE(
1055 [ #include <sys/socket.h> ],
1056 [ int64_t a; a = 1],
1057 [
1058 AC_DEFINE(HAVE_INT64_T)
1059 AC_MSG_RESULT(yes)
1060 ],
1061 [ AC_MSG_RESULT(no) ]
1062 )
1063fi
1064
1065if test -z "$have_int64_t" ; then
1066 AC_MSG_CHECKING([for int64_t type in sys/bitypes.h])
1067 AC_TRY_COMPILE(
1068 [ #include <sys/bitypes.h> ],
1069 [ int64_t a; a = 1],
1070 [
1071 AC_DEFINE(HAVE_INT64_T)
1072 AC_MSG_RESULT(yes)
1073 ],
1074 [ AC_MSG_RESULT(no) ]
1075 )
1076fi 1058fi
1077 1059
1078AC_CACHE_CHECK([for u_intXX_t types], ac_cv_have_u_intxx_t, [ 1060AC_CACHE_CHECK([for u_intXX_t types], ac_cv_have_u_intxx_t, [