From: serassio <>
Date: Sun, 7 May 2006 16:20:43 +0000 (+0000)
Subject: Added missing size checks from 2.5
X-Git-Tag: SQUID_3_0_PRE4~184
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=62266438b90f0316123f6d4688f3ea729706fdbd;p=thirdparty%2Fsquid.git

Added missing size checks from 2.5
---

diff --git a/configure.in b/configure.in
index 48822a52e9..a38e95779c 100644
--- a/configure.in
+++ b/configure.in
@@ -3,7 +3,7 @@ dnl  Configuration input file for Squid
 dnl
 dnl  Duane Wessels, wessels@nlanr.net, February 1996 (autoconf v2.9)
 dnl
-dnl  $Id: configure.in,v 1.408 2006/05/07 10:17:25 serassio Exp $
+dnl  $Id: configure.in,v 1.409 2006/05/07 10:20:43 serassio Exp $
 dnl
 dnl
 dnl
@@ -13,7 +13,7 @@ AC_CONFIG_SRCDIR([src/main.cc])
 AC_CONFIG_AUX_DIR(cfgaux)
 AM_INIT_AUTOMAKE([tar-ustar])
 AM_CONFIG_HEADER(include/autoconf.h)
-AC_REVISION($Revision: 1.408 $)dnl
+AC_REVISION($Revision: 1.409 $)dnl
 AC_PREFIX_DEFAULT(/usr/local/squid)
 AM_MAINTAINER_MODE
 
@@ -1991,9 +1991,10 @@ AC_CHECK_SIZEOF(void *)
 
 dnl 16 bit integers - int16_t and u_int16_t
 dnl if this is defined we trust it to be 16 bits
-AC_CHECK_TYPE(int16_t,
-  AC_DEFINE(HAVE_INT16_T,1,[int16_t is defined in system headers]),
-  ,SQUID_DEFAULT_INCLUDES)
+AC_CHECK_TYPE(int16_t,[
+  AC_CHECK_SIZEOF(int16_t,,SQUID_DEFAULT_SIZEOF_INCLUDES)
+  AC_DEFINE(HAVE_INT16_T,1,[int16_t is defined in system headers])
+  ],,SQUID_DEFAULT_INCLUDES)
 
 dnl fallback #1
 AC_CHECK_TYPE(short,[
@@ -2009,21 +2010,24 @@ AC_CHECK_TYPE(int,[
 
 dnl unsigned 16 bit ints - u_int16_t
 dnl if this is defined we trust it to be 16 bits
-AC_CHECK_TYPE(u_int16_t,
-  AC_DEFINE(HAVE_U_INT16_T,1,[u_int16_t is defined in system headers]), 
-  ,SQUID_DEFAULT_INCLUDES)
+AC_CHECK_TYPE(u_int16_t,[
+  AC_CHECK_SIZEOF(u_int16_t,,SQUID_DEFAULT_SIZEOF_INCLUDES)
+  AC_DEFINE(HAVE_U_INT16_T,1,[u_int16_t is defined in system headers])
+  ],,SQUID_DEFAULT_INCLUDES)
 
 dnl fallback #1
 dnl if this is defined we trust it to be 16 bits
-AC_CHECK_TYPE(uint16_t,
-  AC_DEFINE(HAVE_UINT16_T,1,[uint16_t is defined in system headers]),     
-  ,SQUID_DEFAULT_INCLUDES)
+AC_CHECK_TYPE(uint16_t,[
+  AC_CHECK_SIZEOF(uint16_t,,SQUID_DEFAULT_SIZEOF_INCLUDES)
+  AC_DEFINE(HAVE_UINT16_T,1,[uint16_t is defined in system headers])
+  ],,SQUID_DEFAULT_INCLUDES)
 
 dnl 32 bit signed int - int32_t
 dnl if this is defined we trust it to be 32 bits
-AC_CHECK_TYPE(int32_t,
-  AC_DEFINE(HAVE_INT32_T,1,[int32_t is defined in system headers]),
-  ,SQUID_DEFAULT_INCLUDES)
+AC_CHECK_TYPE(int32_t,[
+  AC_CHECK_SIZEOF(int32_t,,SQUID_DEFAULT_SIZEOF_INCLUDES)
+  AC_DEFINE(HAVE_INT32_T,1,[int32_t is defined in system headers])
+  ],,SQUID_DEFAULT_INCLUDES)
 
 dnl fallback #1
 AC_CHECK_TYPE(long,[
@@ -2033,27 +2037,31 @@ AC_CHECK_TYPE(long,[
 
 dnl 32 bit unsigned int - u_int32_t
 dnl if this is defined we trust it to be 32 bits
-AC_CHECK_TYPE(u_int32_t,
-  AC_DEFINE(HAVE_U_INT32_T,1,[u_int32_t is defined in system headers]),
-  ,SQUID_DEFAULT_INCLUDES)
+AC_CHECK_TYPE(u_int32_t,[
+  AC_CHECK_SIZEOF(u_int32_t,,SQUID_DEFAULT_SIZEOF_INCLUDES)
+  AC_DEFINE(HAVE_U_INT32_T,1,[u_int32_t is defined in system headers])
+  ],,SQUID_DEFAULT_INCLUDES)
 
 dnl fallback #1
 dnl if this is defined we trust it to be 32 bits
-AC_CHECK_TYPE(uint32_t,
-  AC_DEFINE(HAVE_UINT32_T,1,[uint32_t is defined in system headers]),
-    ,SQUID_DEFAULT_INCLUDES)
+AC_CHECK_TYPE(uint32_t,[
+  AC_CHECK_SIZEOF(uint32_t,,SQUID_DEFAULT_SIZEOF_INCLUDES)
+  AC_DEFINE(HAVE_UINT32_T,1,[uint32_t is defined in system headers])
+  ],,SQUID_DEFAULT_INCLUDES)
 
 dnl 64 bit signed - int64_t
 dnl if this is defind we trust it to be 64 bits
-AC_CHECK_TYPE(int64_t,
-  AC_DEFINE(HAVE_INT64_T,1,[int64_t is defined in system headers]),
-  ,SQUID_DEFAULT_INCLUDES)
+AC_CHECK_TYPE(int64_t,[
+  AC_CHECK_SIZEOF(int64_t,,SQUID_DEFAULT_SIZEOF_INCLUDES)
+  AC_DEFINE(HAVE_INT64_T,1,[int64_t is defined in system headers])
+  ],,SQUID_DEFAULT_INCLUDES)
 
 dnl fallback #1
 dnl if this is defind we trust it to be 64 bits
-AC_CHECK_TYPE(__int64,
-  AC_DEFINE(HAVE___INT64,1,[__int64 is defined in system headers]),
-  ,SQUID_DEFAULT_INCLUDES)
+AC_CHECK_TYPE(__int64,[
+  AC_CHECK_SIZEOF(__int64,,SQUID_DEFAULT_SIZEOF_INCLUDES)
+  AC_DEFINE(HAVE___INT64,1,[__int64 is defined in system headers])
+  ],,SQUID_DEFAULT_INCLUDES)
 
 dnl fallback #2
 AC_CHECK_TYPE(long long,[
@@ -2063,15 +2071,17 @@ AC_CHECK_TYPE(long long,[
 
 dnl 64 bit unsigned - u_int64_t
 dnl if this is defind we trust it to be 64 bits
-AC_CHECK_TYPE(u_int64_t,
-  AC_DEFINE(HAVE_U_INT64_T,1,[u_int64_t is defined in system headers]),
-  ,SQUID_DEFAULT_INCLUDES)
+AC_CHECK_TYPE(u_int64_t,[
+  AC_CHECK_SIZEOF(u_int64_t,,SQUID_DEFAULT_SIZEOF_INCLUDES)
+  AC_DEFINE(HAVE_U_INT64_T,1,[u_int64_t is defined in system headers])
+  ],,SQUID_DEFAULT_INCLUDES)
 
 dnl fallback #1
 dnl if this is defind we trust it to be 64 bits
-AC_CHECK_TYPE(uint64_t,
-  AC_DEFINE(HAVE_UINT64_T,1,[uint64_t is defined in system headers]),
-  ,SQUID_DEFAULT_INCLUDES)
+AC_CHECK_TYPE(uint64_t,[
+  AC_CHECK_SIZEOF(uint64_t,,SQUID_DEFAULT_SIZEOF_INCLUDES)
+  AC_DEFINE(HAVE_UINT64_T,1,[uint64_t is defined in system headers])
+  ],,SQUID_DEFAULT_INCLUDES)
 
 dnl On Solaris 9 x86, gcc may includes a "fixed" set of old system include files
 dnl that is incompatible with the updated Solaris header files.