From: serassio <>
Date: Sun, 6 Nov 2005 04:56:26 +0000 (+0000)
Subject: More MinGW build support in Makefiles and configure.
X-Git-Tag: SQUID_3_0_PRE4~543
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=790ebe36dd1317e1f0a021bb8694d7799bf9353c;p=thirdparty%2Fsquid.git

More MinGW build support in Makefiles and configure.
---

diff --git a/configure.in b/configure.in
index 0eda227109..16fbc87860 100644
--- a/configure.in
+++ b/configure.in
@@ -3,7 +3,7 @@ dnl  Configuration input file for Squid
 dnl
 dnl  Duane Wessels, wessels@nlanr.net, February 1996 (autoconf v2.9)
 dnl
-dnl  $Id: configure.in,v 1.390 2005/10/31 16:29:45 serassio Exp $
+dnl  $Id: configure.in,v 1.391 2005/11/05 21:56:26 serassio Exp $
 dnl
 dnl
 dnl
@@ -13,7 +13,7 @@ AC_CONFIG_SRCDIR([src/main.cc])
 AC_CONFIG_AUX_DIR(cfgaux)
 AM_INIT_AUTOMAKE(squid, 3.0-PRE3-CVS)
 AM_CONFIG_HEADER(include/autoconf.h)
-AC_REVISION($Revision: 1.390 $)dnl
+AC_REVISION($Revision: 1.391 $)dnl
 AC_PREFIX_DEFAULT(/usr/local/squid)
 AM_MAINTAINER_MODE
 
@@ -75,6 +75,8 @@ mingw|mingw32)
 		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)
 	;;
 esac
 
diff --git a/src/Makefile.am b/src/Makefile.am
index 9f57835ebc..f25c921ec7 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -1,7 +1,7 @@
 #
 #  Makefile for the Squid Object Cache server
 #
-#  $Id: Makefile.am,v 1.115 2005/11/03 20:03:29 serassio Exp $
+#  $Id: Makefile.am,v 1.116 2005/11/05 21:56:27 serassio Exp $
 #
 #  Uncomment and customize the following to suit your needs:
 #
@@ -555,7 +555,8 @@ squid_LDADD = \
 	@SSLLIB@ \
 	-lmiscutil \
 	@XTRA_LIBS@ \
-	@EPOLL_LIBS@
+	@EPOLL_LIBS@ \
+	@MINGW_LIBS@ 
 squid_DEPENDENCIES = $(top_builddir)/lib/libmiscutil.a @STORE_OBJS@ @STORE_LINKOBJS@ \
 	@DISK_LIBS@ \
 	@DISK_LINKOBJS@ \
@@ -755,7 +756,8 @@ ufsdump_LDADD = \
 	@SSLLIB@ \
 	-lmiscutil \
 	@XTRA_LIBS@ \
-	@EPOLL_LIBS@
+	@EPOLL_LIBS@ \
+	@MINGW_LIBS@ 
 ufsdump_DEPENDENCIES = $(top_builddir)/lib/libmiscutil.a
 nodist_ufsdump_SOURCES = \
 	repl_modules.cc \
@@ -780,7 +782,7 @@ sysconf_DATA = \
 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 \