---------------------
PatchSet 6316 
Date: 2004/10/03 15:21:09
Author: serassio
Branch: nt-2_5
Tag: (none) 
Log:
A little trick needed to have SQUID_CONFIGURE_OPTIONS updated with effective build options when compiling with MS Visual Studio

Members: 
	port/win32/include/autoconf.h:1.1.2.36->1.1.2.37 

Index: squid/port/win32/include/autoconf.h
===================================================================
RCS file: /cvsroot/squid-sf//squid/port/win32/include/Attic/autoconf.h,v
retrieving revision 1.1.2.36
retrieving revision 1.1.2.37
diff -u -r1.1.2.36 -r1.1.2.37
--- squid/port/win32/include/autoconf.h	6 Jun 2004 08:46:18 -0000	1.1.2.36
+++ squid/port/win32/include/autoconf.h	3 Oct 2004 15:21:09 -0000	1.1.2.37
@@ -22,14 +22,13 @@
  *
  */
 
-/* $Id: autoconf.h,v 1.1.2.36 2004/06/06 08:46:18 serassio Exp $ */
+/* $Id: autoconf.h,v 1.1.2.37 2004/10/03 15:21:09 serassio Exp $ */
 
 /*
  * configure command line used to configure Squid
  */
 
 #undef SQUID_CONFIGURE_OPTIONS
-#define SQUID_CONFIGURE_OPTIONS "--enable-win32-service --enable-htcp --disable-wccp --enable-underscores --enable-storeio='ufs awin32 null' --enable-removal-policies='heap lru' --enable-snmp --enable-win32-service --enable-useragent-log --enable-referer-log --enable-auth='basic ntlm digest' --enable-basic-auth-helpers=win32_locallogon --enable-ntlm-auth-helpers=NTLMSSP-WIN32 --enable-external-acl-helpers=win32_group --prefix=c:/squid"
 
 /*********************************
  * START OF CONFIGURABLE OPTIONS *
@@ -947,3 +946,34 @@
 /* #undef u_int64_t */
 
 typedef	unsigned char	u_char;
+
+#if DELAY_POOLS
+#define STR_DELAY_POOLS "--enable-delay-pools "
+#else
+#define STR_DELAY_POOLS ""
+#endif
+#if USE_ICMP
+#define STR_USE_ICMP "--enable-icmp "
+#else
+#define STR_USE_ICMP ""
+#endif
+#if USE_DNSSERVERS
+#define STR_USE_DNSSERVERS "--disable-internal-dns "
+#else
+#define STR_USE_DNSSERVERS ""
+#endif
+#if USE_SSL
+#define STR_USE_SSL "--enable-ssl "
+#else
+#define STR_USE_SSL ""
+#endif
+
+#define SQUID_CONFIGURE_OPTIONS "--enable-win32-service --enable-underscores --enable-storeio='ufs awin32 null' " \
+    "--enable-removal-policies='heap lru' --enable-snmp --enable-htcp --disable-wccp --enable-useragent-log " \
+    "--enable-referer-log --enable-auth='basic ntlm digest' --enable-basic-auth-helpers='LDAP ncsa_auth win32_locallogon' " \
+    "--enable-ntlm-auth-helpers=NTLMSSP-WIN32 --enable-external-acl-helpers='win32_group ldap_group' "\
+    STR_DELAY_POOLS \
+    STR_USE_ICMP \
+    STR_USE_DNSSERVERS \
+    STR_USE_SSL \
+    "--prefix=c:/squid"