--------------------- PatchSet 3204 Date: 2001/10/19 19:35:03 Author: serassio Branch: cygwin Tag: (none) Log: Manually merged changes from HEAD after cvsmerge crash Members: configure.in:1.8.2.20->1.8.2.21 errors/.cvsignore:1.3->1.3.12.1 icons/.cvsignore:1.3->1.3.12.1 scripts/.cvsignore:1.3->1.3.12.1 snmplib/.cvsignore:1.3->1.3.12.1 src/repl/.cvsignore:1.3->1.3.12.1 src/repl/heap/.cvsignore:1.3->1.3.12.1 src/repl/lru/.cvsignore:1.3->1.3.12.1 Index: squid/configure.in =================================================================== RCS file: /cvsroot/squid-sf//squid/configure.in,v retrieving revision 1.8.2.20 retrieving revision 1.8.2.21 diff -u -r1.8.2.20 -r1.8.2.21 --- squid/configure.in 19 Oct 2001 19:24:12 -0000 1.8.2.20 +++ squid/configure.in 19 Oct 2001 19:35:03 -0000 1.8.2.21 @@ -3,7 +3,7 @@ dnl dnl Duane Wessels, wessels@nlanr.net, February 1996 (autoconf v2.9) dnl -dnl $Id: configure.in,v 1.8.2.20 2001/10/19 19:24:12 serassio Exp $ +dnl $Id: configure.in,v 1.8.2.21 2001/10/19 19:35:03 serassio Exp $ dnl dnl dnl @@ -11,7 +11,7 @@ AC_CONFIG_AUX_DIR(cfgaux) AM_INIT_AUTOMAKE(Squid, 2.5-DEVEL) AM_CONFIG_HEADER(include/autoconf.h) -AC_REVISION($Revision: 1.8.2.20 $)dnl +AC_REVISION($Revision: 1.8.2.21 $)dnl AC_PREFIX_DEFAULT(/usr/local/squid) AM_MAINTAINER_MODE @@ -54,7 +54,7 @@ case "$host_os" in cygwin|cygwin32) AM_CONDITIONAL(ENABLE_WIN32SPECIFIC, true) - ;; + ;; *) AM_CONDITIONAL(ENABLE_WIN32SPECIFIC, false) ;;