--------------------- PatchSet 6313 Date: 2004/10/03 13:44:27 Author: serassio Branch: nt-2_5 Tag: (none) Log: Workaround needed to allow to run configure on latest Cygwin tha uses Automake 1.8 and Autoconf 2.59 Members: acinclude.m4:1.1.64.6->1.1.64.7 configure.in:1.42.2.5.4.55->1.42.2.5.4.56 Index: squid/acinclude.m4 =================================================================== RCS file: /cvsroot/squid-sf//squid/acinclude.m4,v retrieving revision 1.1.64.6 retrieving revision 1.1.64.7 diff -u -r1.1.64.6 -r1.1.64.7 --- squid/acinclude.m4 16 Jul 2002 12:46:49 -0000 1.1.64.6 +++ squid/acinclude.m4 3 Oct 2004 13:44:28 -0000 1.1.64.7 @@ -127,7 +127,7 @@ dnl (it at least makes use of , and ) dnl AC_CHECK_SIZEOF_SYSTYPE(TYPE [, CROSS-SIZE]) -AC_DEFUN(AC_CHECK_SIZEOF_SYSTYPE, +AC_DEFUN([AC_CHECK_SIZEOF_SYSTYPE], [changequote(<<, >>)dnl dnl The name to #define. define(<>, translit(sizeof_$1, [a-z *], [A-Z_P]))dnl @@ -166,8 +166,8 @@ ]) dnl AC_CHECK_SYSTYPE(TYPE, DEFAULT) -AC_DEFUN(AC_CHECK_SYSTYPE, -[AC_REQUIRE([AC_HEADER_STDC])dnl +AC_DEFUN([AC_CHECK_SYSTYPE], +[ AC_MSG_CHECKING(for $1) AC_CACHE_VAL(ac_cv_type_$1, [AC_EGREP_CPP(dnl Index: squid/configure.in =================================================================== RCS file: /cvsroot/squid-sf//squid/configure.in,v retrieving revision 1.42.2.5.4.55 retrieving revision 1.42.2.5.4.56 diff -u -r1.42.2.5.4.55 -r1.42.2.5.4.56 --- squid/configure.in 25 Sep 2004 07:34:52 -0000 1.42.2.5.4.55 +++ squid/configure.in 3 Oct 2004 13:44:27 -0000 1.42.2.5.4.56 @@ -3,7 +3,7 @@ dnl dnl Duane Wessels, wessels@nlanr.net, February 1996 (autoconf v2.9) dnl -dnl $Id: configure.in,v 1.42.2.5.4.55 2004/09/25 07:34:52 serassio Exp $ +dnl $Id: configure.in,v 1.42.2.5.4.56 2004/10/03 13:44:27 serassio Exp $ dnl dnl dnl @@ -11,7 +11,7 @@ AC_CONFIG_AUX_DIR(cfgaux) AM_INIT_AUTOMAKE(squid, 2.5.STABLE6-NT-CVS) AM_CONFIG_HEADER(include/autoconf.h) -AC_REVISION($Revision: 1.42.2.5.4.55 $)dnl +AC_REVISION($Revision: 1.42.2.5.4.56 $)dnl AC_PREFIX_DEFAULT(/usr/local/squid) AM_MAINTAINER_MODE @@ -1242,6 +1242,12 @@ esac AC_SUBST(AR_R) +case "$host_os" in +cygwin|cygwin32) + ac_cv_header_stdc='yes' + ;; +esac + dnl Check for headers AC_HEADER_DIRENT AC_HEADER_STDC @@ -1456,6 +1462,17 @@ AC_CHECK_SIZEOF_SYSTYPE(uint64_t) AC_CHECK_SIZEOF_SYSTYPE(u_int64_t) +case "$host_os" in +cygwin|cygwin32) + ac_cv_type_int16_t='yes' + ac_cv_type_int32_t='yes' + ac_cv_type_int64_t='yes' + ac_cv_type_u_int16_t='yes' + ac_cv_type_u_int32_t='yes' + ac_cv_type_u_int64_t='yes' + ;; +esac + dnl int16_t if test "x$ac_cv_sizeof_short" = "x2"; then AC_CHECK_SYSTYPE(int16_t,short)