---------------------
PatchSet 2115 
Date: 2005/11/05 21:37:53
Author: serassio
Branch: nt
Tag: (none) 
Log:
Optimized MinGW support

Members: 
	configure.in:1.26.2.70->1.26.2.71 
	lib/Makefile.am:1.6.2.11->1.6.2.12 
	src/Makefile.am:1.26.2.51->1.26.2.52 

Index: squid3/configure.in
===================================================================
RCS file: /cvsroot/squid-sf//squid3/configure.in,v
retrieving revision 1.26.2.70
retrieving revision 1.26.2.71
diff -u -r1.26.2.70 -r1.26.2.71
--- squid3/configure.in	1 Nov 2005 12:57:52 -0000	1.26.2.70
+++ squid3/configure.in	5 Nov 2005 21:37:53 -0000	1.26.2.71
@@ -3,7 +3,7 @@
 dnl
 dnl  Duane Wessels, wessels@nlanr.net, February 1996 (autoconf v2.9)
 dnl
-dnl  $Id: configure.in,v 1.26.2.70 2005/11/01 12:57:52 serassio Exp $
+dnl  $Id: configure.in,v 1.26.2.71 2005/11/05 21:37:53 serassio Exp $
 dnl
 dnl
 dnl
@@ -13,7 +13,7 @@
 AC_CONFIG_AUX_DIR(cfgaux)
 AM_INIT_AUTOMAKE(squid, 3.0-PRE3-NT-CVS)
 AM_CONFIG_HEADER(include/autoconf.h)
-AC_REVISION($Revision: 1.26.2.70 $)dnl
+AC_REVISION($Revision: 1.26.2.71 $)dnl
 AC_PREFIX_DEFAULT(/usr/local/squid)
 AM_MAINTAINER_MODE
 
@@ -65,7 +65,6 @@
 
 case "$host_os" in
 mingw|mingw32)
-        AM_CONDITIONAL(ENABLE_MINGW32SPECIFIC, true)
 	AC_PATH_PROG(WIN32_PSAPI, psapi.dll, none)
 	CFLAGS="$CFLAGS -mthreads"
 	CXXFLAGS="$CXXFLAGS -mthreads"
@@ -76,9 +75,11 @@
 		AC_DEFINE(HAVE_WIN32_PSAPI,1,[Define if you have PSAPI.DLL on Windows systems])
 		LIBS="$LIBS -lpsapi"
 	fi
+	MINGW_LIBS="-lmingwex"
+	AC_SUBST(MINGW_LIBS)
+
 	;;
 *)
-	AM_CONDITIONAL(ENABLE_MINGW32SPECIFIC, false)
 	;;
 esac
 
Index: squid3/lib/Makefile.am
===================================================================
RCS file: /cvsroot/squid-sf//squid3/lib/Makefile.am,v
retrieving revision 1.6.2.11
retrieving revision 1.6.2.12
diff -u -r1.6.2.11 -r1.6.2.12
--- squid3/lib/Makefile.am	21 Aug 2005 18:41:06 -0000	1.6.2.11
+++ squid3/lib/Makefile.am	5 Nov 2005 21:37:53 -0000	1.6.2.12
@@ -1,6 +1,6 @@
 ## Process this file with automake to produce Makefile.in
 #
-#  $Id: Makefile.am,v 1.6.2.11 2005/08/21 18:41:06 serassio Exp $
+#  $Id: Makefile.am,v 1.6.2.12 2005/11/05 21:37:53 serassio Exp $
 #
 
 DIST_SUBDIRS = libTrie cppunit-1.10.0
@@ -31,13 +31,9 @@
 
 if ENABLE_WIN32SPECIFIC
 LIBSSPWIN32=libsspwin32.a
-else
-LIBSSPWIN32=
-endif
-
-if ENABLE_MINGW32SPECIFIC
 WIN32SRC = win32lib.c
 else
+LIBSSPWIN32=
 WIN32SRC=
 endif
 
Index: squid3/src/Makefile.am
===================================================================
RCS file: /cvsroot/squid-sf//squid3/src/Makefile.am,v
retrieving revision 1.26.2.51
retrieving revision 1.26.2.52
diff -u -r1.26.2.51 -r1.26.2.52
--- squid3/src/Makefile.am	4 Nov 2005 08:02:18 -0000	1.26.2.51
+++ squid3/src/Makefile.am	5 Nov 2005 21:37:53 -0000	1.26.2.52
@@ -1,7 +1,7 @@
 #
 #  Makefile for the Squid Object Cache server
 #
-#  $Id: Makefile.am,v 1.26.2.51 2005/11/04 08:02:18 serassio Exp $
+#  $Id: Makefile.am,v 1.26.2.52 2005/11/05 21:37:53 serassio Exp $
 #
 #  Uncomment and customize the following to suit your needs:
 #
@@ -155,12 +155,6 @@
 ARP_ACL_SOURCE =
 endif
 
-if ENABLE_MINGW32SPECIFIC
-MINGWEXLIB = -lmingwex
-else
-MINGWEXLIB =
-endif
-
 AM_CFLAGS = @SQUID_CFLAGS@
 AM_CXXFLAGS = @SQUID_CXXFLAGS@
 
@@ -566,7 +560,7 @@
 	-lmiscutil \
 	@XTRA_LIBS@ \
 	@EPOLL_LIBS@ \
-	$(MINGWEXLIB)
+	@MINGW_LIBS@ 
 squid_DEPENDENCIES = $(top_builddir)/lib/libmiscutil.a @STORE_OBJS@ @STORE_LINKOBJS@ \
 	@DISK_LIBS@ \
 	@DISK_LINKOBJS@ \
@@ -766,7 +760,8 @@
 	@SSLLIB@ \
 	-lmiscutil \
 	@XTRA_LIBS@ \
-	@EPOLL_LIBS@
+	@EPOLL_LIBS@ \
+	@MINGW_LIBS@ 
 ufsdump_DEPENDENCIES = $(top_builddir)/lib/libmiscutil.a
 nodist_ufsdump_SOURCES = \
 	repl_modules.cc \
@@ -791,7 +786,7 @@
 data_DATA = \
 	mib.txt
 
-LDADD = -L../lib -lmiscutil @XTRA_LIBS@ @EPOLL_LIBS@
+LDADD = -L../lib -lmiscutil @XTRA_LIBS@ @EPOLL_LIBS@ @MINGW_LIBS@
 
 EXTRA_DIST = \
 	cf_gen_defines \