--------------------- PatchSet 2340 Date: 2001/05/16 00:52:37 Author: rbcollins Branch: squid-amake Tag: (none) Log: fixup from merge and remove duplicate version location Members: configure.in:1.19.4.6->1.19.4.7 include/version.h:1.4->1.4.40.1 src/Makefile.am:1.1.2.28->1.1.2.29 src/cachemgr.c:1.4->1.4.18.1 src/dnsserver.c:1.4->1.4.18.1 src/globals.h:1.7.18.2->1.7.18.3 src/snmp_agent.c:1.6->1.6.14.1 Index: squid/configure.in =================================================================== RCS file: /cvsroot/squid-sf//squid/configure.in,v retrieving revision 1.19.4.6 retrieving revision 1.19.4.7 diff -u -r1.19.4.6 -r1.19.4.7 --- squid/configure.in 15 May 2001 23:58:08 -0000 1.19.4.6 +++ squid/configure.in 16 May 2001 00:52:37 -0000 1.19.4.7 @@ -3,14 +3,14 @@ dnl dnl Duane Wessels, wessels@nlanr.net, February 1996 (autoconf v2.9) dnl -dnl $Id: configure.in,v 1.19.4.6 2001/05/15 23:58:08 rbcollins Exp $ +dnl $Id: configure.in,v 1.19.4.7 2001/05/16 00:52:37 rbcollins Exp $ dnl dnl dnl AC_INIT(src/main.c) -AM_INIT_AUTOMAKE(squid, 2.5-DEVEL) +AM_INIT_AUTOMAKE(Squid, 2.5-DEVEL) AM_CONFIG_HEADER(include/autoconf.h) -AC_REVISION($Revision: 1.19.4.6 $)dnl +AC_REVISION($Revision: 1.19.4.7 $)dnl AC_PREFIX_DEFAULT(/usr/local/squid) dnl AC_CONFIG_AUX_DIR(cfgaux) @@ -52,13 +52,12 @@ dnl (adding an option like --enable-cygwin-support doesn't make sense :]) - R Collins 2001 case "$host_os" in cygwin|cygwin32) - WIN32_OBJS="win32.o" + AM_CONDITIONAL(ENABLE_WIN32SPECIFIC, true) ;; *) - WIN32_OBJS="" + AM_CONDITIONAL(ENABLE_WIN32SPECIFIC, false) ;; esac -AC_SUBST(WIN32_OBJS) if test -z "$CACHE_HTTP_PORT"; then CACHE_HTTP_PORT="3128" Index: squid/include/version.h =================================================================== RCS file: /cvsroot/squid-sf//squid/include/version.h,v retrieving revision 1.4 retrieving revision 1.4.40.1 diff -u -r1.4 -r1.4.40.1 --- squid/include/version.h 14 Nov 2000 13:03:47 -0000 1.4 +++ squid/include/version.h 16 May 2001 00:52:37 -0000 1.4.40.1 @@ -1,11 +1,12 @@ /* - * $Id: version.h,v 1.4 2000/11/14 13:03:47 adri Exp $ + * $Id: version.h,v 1.4.40.1 2001/05/16 00:52:37 rbcollins Exp $ * * SQUID_VERSION - String for version id of this distribution */ -#ifndef SQUID_VERSION -#define SQUID_VERSION "2.5.DEVEL" -#endif + +/* + * SQUID_VERSION is now the automake "VERSION" string. + */ #ifndef SQUID_RELEASE_TIME #define SQUID_RELEASE_TIME squid_curtime Index: squid/src/Makefile.am =================================================================== RCS file: /cvsroot/squid-sf//squid/src/Makefile.am,v retrieving revision 1.1.2.28 retrieving revision 1.1.2.29 diff -u -r1.1.2.28 -r1.1.2.29 --- squid/src/Makefile.am 15 May 2001 00:36:21 -0000 1.1.2.28 +++ squid/src/Makefile.am 16 May 2001 00:52:37 -0000 1.1.2.29 @@ -38,6 +38,10 @@ SSLSOURCE = ssl_support.c endif +if ENABLE_WIN32SPECIFIC +WIN32SOURCE = win32.c +endif + SUBDIRS = fs repl auth #look into pkgsbin.. libexecdir = ${prefix}/libexec/squid @@ -56,7 +60,7 @@ ##cf_gen_LDADD = ../lib/libmiscutil.a EXTRA_squid_SOURCES = delay_pools.c dns.c dnsserver.c dns_internal.c htcp.c \ -leakfinder.c snmp_core.c snmp_agent.c unlinkd.c ssl_support.c +leakfinder.c snmp_core.c snmp_agent.c unlinkd.c ssl_support.c win32.c squid_SOURCES = \ access_log.c acl.c asn.c authenticate.c cache_cf.c \ CacheDigest.c cache_manager.c carp.c cbdata.c client_db.c client_side.c \ @@ -71,7 +75,7 @@ squid.h ssl.c $(SSLSOURCE) stat.c StatHist.c String.c stmem.c store.c store_io.c \ store_client.c store_digest.c store_dir.c store_key_md5.c store_log.c store_rebuild.c \ store_swapin.c store_swapmeta.c store_swapout.c structs.h tools.c typedefs.h \ -$(UNLINKDSOURCE) url.c urn.c useragent.c wais.c wccp.c whois.c +$(UNLINKDSOURCE) url.c urn.c useragent.c wais.c wccp.c whois.c $(WIN32SOURCE) nodist_squid_SOURCES = repl_modules.c auth_modules.c store_modules.c \ cf_parser.h globals.c string_arrays.c squid_LDADD = @XTRA_OBJS@ @REPL_OBJS@ @STORE_OBJS@ @AUTH_OBJS@ \ Index: squid/src/cachemgr.c =================================================================== RCS file: /cvsroot/squid-sf//squid/src/Attic/cachemgr.c,v retrieving revision 1.4 retrieving revision 1.4.18.1 diff -u -r1.4 -r1.4.18.1 --- squid/src/cachemgr.c 12 Jan 2001 08:20:32 -0000 1.4 +++ squid/src/cachemgr.c 16 May 2001 00:52:37 -0000 1.4.18.1 @@ -1,6 +1,6 @@ /* - * $Id: cachemgr.c,v 1.4 2001/01/12 08:20:32 hno Exp $ + * $Id: cachemgr.c,v 1.4.18.1 2001/05/16 00:52:37 rbcollins Exp $ * * DEBUG: section 0 CGI Cache Manager * AUTHOR: Duane Wessels @@ -221,7 +221,7 @@ printf("
\n"); printf("
\n"); printf("Generated %s, by %s/%s@%s\n", - mkrfc1123(now), progname, SQUID_VERSION, getfullhostname()); + mkrfc1123(now), progname, VERSION, getfullhostname()); printf("
\n"); } Index: squid/src/dnsserver.c =================================================================== RCS file: /cvsroot/squid-sf//squid/src/dnsserver.c,v retrieving revision 1.4 retrieving revision 1.4.18.1 diff -u -r1.4 -r1.4.18.1 --- squid/src/dnsserver.c 12 Jan 2001 08:20:32 -0000 1.4 +++ squid/src/dnsserver.c 16 May 2001 00:52:37 -0000 1.4.18.1 @@ -1,6 +1,6 @@ /* - * $Id: dnsserver.c,v 1.4 2001/01/12 08:20:32 hno Exp $ + * $Id: dnsserver.c,v 1.4.18.1 2001/05/16 00:52:37 rbcollins Exp $ * * DEBUG: section 0 DNS Resolver * AUTHOR: Harvest Derived @@ -322,7 +322,7 @@ #endif /* HAVE_RES_INIT */ break; case 'v': - printf("dnsserver version %s\n", SQUID_VERSION); + printf("dnsserver version %s\n", VERSION); exit(0); break; case 'h': Index: squid/src/globals.h =================================================================== RCS file: /cvsroot/squid-sf//squid/src/globals.h,v retrieving revision 1.7.18.2 retrieving revision 1.7.18.3 diff -u -r1.7.18.2 -r1.7.18.3 --- squid/src/globals.h 15 May 2001 23:58:08 -0000 1.7.18.2 +++ squid/src/globals.h 16 May 2001 00:52:37 -0000 1.7.18.3 @@ -1,6 +1,6 @@ /* - * $Id: globals.h,v 1.7.18.2 2001/05/15 23:58:08 rbcollins Exp $ + * $Id: globals.h,v 1.7.18.3 2001/05/16 00:52:37 rbcollins Exp $ * * * SQUID Web Proxy Cache http://www.squid-cache.org/ @@ -52,8 +52,8 @@ extern const char *const dash_str; /* "-" */ extern const char *const localhost; /* "127.0.0.1" */ extern const char *const null_string; /* "" */ -extern const char *const version_string; /* SQUID_VERSION */ -extern const char *const full_appname_string; /* "Squid/" SQUID_VERSION */ +extern const char *const version_string; /* VERSION */ +extern const char *const full_appname_string; /* PACKAGE "/" VERSION */ extern const char *const w_space; /* " \t\n\r" */ extern const char *fdTypeStr[]; extern const char *hier_strings[]; Index: squid/src/snmp_agent.c =================================================================== RCS file: /cvsroot/squid-sf//squid/src/snmp_agent.c,v retrieving revision 1.6 retrieving revision 1.6.14.1 diff -u -r1.6 -r1.6.14.1 --- squid/src/snmp_agent.c 7 Feb 2001 19:11:48 -0000 1.6 +++ squid/src/snmp_agent.c 16 May 2001 00:52:37 -0000 1.6.14.1 @@ -1,6 +1,6 @@ /* - * $Id: snmp_agent.c,v 1.6 2001/02/07 19:11:48 hno Exp $ + * $Id: snmp_agent.c,v 1.6.14.1 2001/05/16 00:52:37 rbcollins Exp $ * * DEBUG: section 49 SNMP Interface * AUTHOR: Kostas Anagnostakis @@ -96,8 +96,8 @@ case CONF_VERSION_ID: Answer = snmp_var_new(Var->name, Var->name_length); Answer->type = ASN_OCTET_STR; - Answer->val_len = strlen(SQUID_VERSION); - Answer->val.string = (u_char *) xstrdup(SQUID_VERSION); + Answer->val_len = strlen(VERSION); + Answer->val.string = (u_char *) xstrdup(VERSION); break; case CONF_STORAGE: switch (Var->name[LEN_SQ_CONF + 1]) {