--------------------- PatchSet 4584 Date: 2002/07/25 13:12:54 Author: rbcollins Branch: autoconf-25 Tag: (none) Log: require autoconf 2.50 or newer Members: acinclude.m4:1.4.4.2->1.4.4.3 configure.in:1.61.4.4->1.61.4.5 Index: squid/acinclude.m4 =================================================================== RCS file: /cvsroot/squid-sf//squid/acinclude.m4,v retrieving revision 1.4.4.2 retrieving revision 1.4.4.3 diff -u -r1.4.4.2 -r1.4.4.3 --- squid/acinclude.m4 25 Jul 2002 11:29:49 -0000 1.4.4.2 +++ squid/acinclude.m4 25 Jul 2002 13:12:54 -0000 1.4.4.3 @@ -26,57 +26,3 @@ #include SQUID_DEFAULT_INCLUDES ]) - - -dnl AC_CHECK_SIZEOF_SYSTYPE is as the standard AC_CHECK_SIZEOF macro -dnl but also capable of checking the size of system defined types, not -dnl only compiler defined types. -dnl -dnl AC_CHECK_SYSTYPE is the same thing but replacing AC_CHECK_TYPE -dnl However AC_CHECK_TYPE is not by far as limited as AC_CHECK_SIZEOF -dnl (it at least makes use of , and ) - -dnl AC_CHECK_SIZEOF_SYSTYPE(TYPE [, CROSS-SIZE]) -AC_DEFUN(AC_CHECK_SIZEOF_SYSTYPE, -[changequote(<<, >>)dnl -dnl The name to #define. -define(<>, translit(sizeof_$1, [a-z *], [A-Z_P]))dnl -dnl The cache variable name. -define(<>, translit(ac_cv_sizeof_$1, [ *], [_p]))dnl -changequote([, ])dnl -AC_MSG_CHECKING(size of $1) -AC_CACHE_VAL(AC_CV_NAME, -[AC_TRY_RUN( -SQUID_DEFAULT_SIZEOF_INCLUDES -[ -int main() -{ - FILE *f=fopen("conftestval", "w"); - if (!f) return(1); - fprintf(f, "%d\n", sizeof($1)); - return(0); -} -], AC_CV_NAME=`cat conftestval`, AC_CV_NAME=0, ifelse([$2], , , AC_CV_NAME=$2))])dnl -AC_MSG_RESULT($AC_CV_NAME) -AC_DEFINE_UNQUOTED(AC_TYPE_NAME, $AC_CV_NAME,[What size is $1]) -undefine([AC_TYPE_NAME])dnl -undefine([AC_CV_NAME])dnl -]) - -dnl AC_CHECK_SYSTYPE(TYPE, DEFAULT) -AC_DEFUN(AC_CHECK_SYSTYPE, -[AC_REQUIRE([AC_HEADER_STDC])dnl -AC_MSG_CHECKING(for $1) -AC_CACHE_VAL(ac_cv_type_$1, -[AC_EGREP_CPP(dnl -changequote(<<,>>)dnl -<<(^|[^a-zA-Z_0-9])$1[^a-zA-Z_0-9]>>dnl -changequote([,]), [ -SQUID_DEFAULT_INCLUDES -], ac_cv_type_$1=yes, ac_cv_type_$1=no)])dnl -AC_MSG_RESULT($ac_cv_type_$1) -if test $ac_cv_type_$1 = no; then - AC_DEFINE($1, $2,[Do we have $1]) -fi -]) - Index: squid/configure.in =================================================================== RCS file: /cvsroot/squid-sf//squid/configure.in,v retrieving revision 1.61.4.4 retrieving revision 1.61.4.5 diff -u -r1.61.4.4 -r1.61.4.5 --- squid/configure.in 25 Jul 2002 12:49:04 -0000 1.61.4.4 +++ squid/configure.in 25 Jul 2002 13:12:54 -0000 1.61.4.5 @@ -3,16 +3,17 @@ dnl dnl Duane Wessels, wessels@nlanr.net, February 1996 (autoconf v2.9) dnl -dnl $Id: configure.in,v 1.61.4.4 2002/07/25 12:49:04 rbcollins Exp $ +dnl $Id: configure.in,v 1.61.4.5 2002/07/25 13:12:54 rbcollins Exp $ dnl dnl dnl AC_INIT +AC_PREREQ(2.50) AC_CONFIG_SRCDIR([src/main.c]) AC_CONFIG_AUX_DIR(cfgaux) AM_INIT_AUTOMAKE(squid, 2.6-DEVEL-autoconf25) AM_CONFIG_HEADER(include/autoconf.h) -AC_REVISION($Revision: 1.61.4.4 $)dnl +AC_REVISION($Revision: 1.61.4.5 $)dnl AC_PREFIX_DEFAULT(/usr/local/squid) AM_MAINTAINER_MODE