---------------------
PatchSet 2592 
Date: 2001/07/10 20:25:43
Author: serassio
Branch: cygwin
Tag: (none) 
Log:
Splitted Windows section from OS/2 in configure.in

Members: 
	configure.in:1.8.2.11->1.8.2.12 
	src/useragent.c:1.3.28.2->1.3.28.3 

Index: squid/configure.in
===================================================================
RCS file: /cvsroot/squid-sf//squid/configure.in,v
retrieving revision 1.8.2.11
retrieving revision 1.8.2.12
diff -u -r1.8.2.11 -r1.8.2.12
--- squid/configure.in	14 Jun 2001 20:32:39 -0000	1.8.2.11
+++ squid/configure.in	10 Jul 2001 20:25:43 -0000	1.8.2.12
@@ -3,13 +3,13 @@
 dnl
 dnl  Duane Wessels, wessels@nlanr.net, February 1996 (autoconf v2.9)
 dnl
-dnl  $Id: configure.in,v 1.8.2.11 2001/06/14 20:32:39 serassio Exp $
+dnl  $Id: configure.in,v 1.8.2.12 2001/07/10 20:25:43 serassio Exp $
 dnl
 dnl
 dnl
 AC_INIT(src/main.c)
 AC_CONFIG_HEADER(include/autoconf.h)
-AC_REVISION($Revision: 1.8.2.11 $)dnl
+AC_REVISION($Revision: 1.8.2.12 $)dnl
 AC_PREFIX_DEFAULT(/usr/local/squid)
 AC_CONFIG_AUX_DIR(cfgaux)
 
@@ -31,6 +31,20 @@
 dnl (adding an option like --enable-cygwin-support doesn't make sense :]) - R Collins 2001
 case "$host_os" in
 cygwin|cygwin32|os2)
+	exec_suffix=".exe"
+	cgi_suffix=".exe"
+	;;
+*)
+	exec_suffix=""
+	cgi_suffix=".cgi"
+	;;
+esac
+AC_SUBST(exec_suffix)
+AC_SUBST(cgi_suffix)
+
+dnl check for PSAPI.DLL on cygwin32 platform and add win32.o to squid objects
+case "$host_os" in
+cygwin|cygwin32)
 	AC_PATH_PROG(WIN32_PSAPI, psapi.dll, none)
 	if test "$ac_cv_path_WIN32_PSAPI" = "none"; then
 		echo "PSAPI.DLL is reccommended to run Squid on Windows NT Platform"
@@ -40,19 +54,13 @@
 		AC_DEFINE(HAVE_WIN32_PSAPI)
 		WIN32_LIBS="-lpsapi"
 	fi
-	exec_suffix=".exe"
-	cgi_suffix=".exe"
 	WIN32_OBJS="win32.o"
 	;;
 *)
-	exec_suffix=""
-	cgi_suffix=".cgi"
 	WIN32_OBJS=""
 	WIN32_LIBS=""
 	;;
 esac
-AC_SUBST(exec_suffix)
-AC_SUBST(cgi_suffix)
 AC_SUBST(WIN32_OBJS)
 AC_SUBST(WIN32_LIBS)
 
@@ -80,7 +88,7 @@
 AC_PROG_CC
 
 dnl Can the CC program be asked to use the Win32 API?
-dnl AC_API_WIN32
+AC_API_WIN32
 
 dnl Gerben Wierda <Gerben_Wierda@RnA.nl>
 case "$host" in
Index: squid/src/useragent.c
===================================================================
RCS file: /cvsroot/squid-sf//squid/src/useragent.c,v
retrieving revision 1.3.28.2
retrieving revision 1.3.28.3
diff -u -r1.3.28.2 -r1.3.28.3
--- squid/src/useragent.c	21 May 2001 21:10:28 -0000	1.3.28.2
+++ squid/src/useragent.c	10 Jul 2001 20:25:43 -0000	1.3.28.3
@@ -1,6 +1,6 @@
 
 /*
- * $Id: useragent.c,v 1.3.28.2 2001/05/21 21:10:28 serassio Exp $
+ * $Id: useragent.c,v 1.3.28.3 2001/07/10 20:25:43 serassio Exp $
  *
  * DEBUG: section 40    User-Agent logging
  * AUTHOR: Joe Ramey <ramey@csc.ti.com>
@@ -87,7 +87,8 @@
 useragentLogClose(void)
 {
 #if USE_USERAGENT_LOG
-    logfileClose(useragentlog);
+    if (NULL == useragentlog)
+	logfileClose(useragentlog);
     useragentlog = NULL;
 #endif
 }