From: serassio <> Date: Sat, 2 Sep 2006 19:58:01 +0000 (+0000) Subject: Bootstrapped X-Git-Tag: SQUID_3_0_PRE5~144 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=795c3ae09437dc174e234b90c700923130c3df80;p=thirdparty%2Fsquid.git Bootstrapped --- diff --git a/configure b/configure index 617bd4b76f..d976a36322 100755 --- a/configure +++ b/configure @@ -1,5 +1,5 @@ #! /bin/sh -# From configure.in Revision: 1.430 . +# From configure.in Revision. # Guess values for system-dependent variables and create Makefiles. # Generated by GNU Autoconf 2.59 for Squid Web Proxy 3.0.PRE4-CVS. # @@ -24981,7 +24981,17 @@ _ACEOF fi -echo "$as_me:$LINENO: checking for struct rusage" >&5 +case "$host_os" in + mingw|mingw32) + cat >>confdefs.h <<\_ACEOF +#define HAVE_STRUCT_RUSAGE 1 +_ACEOF + + ac_cv_func_getrusage='yes' + echo "Using own rusage." + ;; + *) + echo "$as_me:$LINENO: checking for struct rusage" >&5 echo $ECHO_N "checking for struct rusage... $ECHO_C" >&6 if test "${ac_cv_type_struct_rusage+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -25052,6 +25062,8 @@ _ACEOF fi + ;; +esac echo "$as_me:$LINENO: checking for struct iphdr.ip_hl" >&5 echo $ECHO_N "checking for struct iphdr.ip_hl... $ECHO_C" >&6 @@ -41213,6 +41225,11 @@ fi ;; esac fi +case "$host_os" in +mingw|mingw32) + echo "Use MSVCRT for math functions." + ;; + *) echo "$as_me:$LINENO: checking for main in -lm" >&5 echo $ECHO_N "checking for main in -lm... $ECHO_C" >&6 @@ -41281,6 +41298,8 @@ _ACEOF fi + ;; +esac echo "$as_me:$LINENO: checking for crypt in -lcrypt" >&5 echo $ECHO_N "checking for crypt in -lcrypt... $ECHO_C" >&6 @@ -42010,6 +42029,12 @@ if test -z "$ac_cv_func_poll"; then esac fi +case "$host_os" in +mingw|mingw32) + ac_cv_func_statfs='yes' + ;; +esac + diff --git a/lib/Makefile.in b/lib/Makefile.in index 787807ffe5..30adf5fc53 100644 --- a/lib/Makefile.in +++ b/lib/Makefile.in @@ -15,7 +15,7 @@ @SET_MAKE@ # -# $Id: Makefile.in,v 1.122 2006/07/02 19:33:16 serassio Exp $ +# $Id: Makefile.in,v 1.123 2006/09/02 13:58:01 serassio Exp $ # srcdir = @srcdir@ @@ -65,11 +65,12 @@ am__libmiscutil_a_SOURCES_DIST = MemPool.cc base64.c getfullhostname.c \ hash.c heap.c html_quote.c iso3307.c md5.c radix.c rfc1035.c \ rfc1123.c rfc1738.c rfc2617.c safe_inet_addr.c snprintf.c \ Splay.cc strsep.c stub_memaccount.c util.c uudecode.c assert.c \ - Profiler.c + Profiler.c win32lib.c @NEED_OWN_MD5_TRUE@am__objects_1 = md5.$(OBJEXT) @NEED_OWN_SNPRINTF_TRUE@am__objects_2 = snprintf.$(OBJEXT) @NEED_OWN_STRSEP_TRUE@am__objects_3 = strsep.$(OBJEXT) @ENABLE_XPROF_STATS_TRUE@am__objects_4 = Profiler.$(OBJEXT) +@ENABLE_WIN32SPECIFIC_TRUE@am__objects_5 = win32lib.$(OBJEXT) am_libmiscutil_a_OBJECTS = MemPool.$(OBJEXT) base64.$(OBJEXT) \ getfullhostname.$(OBJEXT) hash.$(OBJEXT) heap.$(OBJEXT) \ html_quote.$(OBJEXT) iso3307.$(OBJEXT) $(am__objects_1) \ @@ -77,7 +78,7 @@ am_libmiscutil_a_OBJECTS = MemPool.$(OBJEXT) base64.$(OBJEXT) \ rfc1738.$(OBJEXT) rfc2617.$(OBJEXT) safe_inet_addr.$(OBJEXT) \ $(am__objects_2) Splay.$(OBJEXT) $(am__objects_3) \ stub_memaccount.$(OBJEXT) util.$(OBJEXT) uudecode.$(OBJEXT) \ - assert.$(OBJEXT) $(am__objects_4) + assert.$(OBJEXT) $(am__objects_4) $(am__objects_5) libmiscutil_a_OBJECTS = $(am_libmiscutil_a_OBJECTS) libntlmauth_a_AR = $(AR) $(ARFLAGS) libntlmauth_a_DEPENDENCIES = @LIBOBJS@ @@ -92,9 +93,10 @@ libsspwin32_a_LIBADD = am_libsspwin32_a_OBJECTS = sspwin32.$(OBJEXT) libsspwin32_a_OBJECTS = $(am_libsspwin32_a_OBJECTS) am__tests_testAll_SOURCES_DIST = tests/testArray.cc tests/testMain.cc \ - tests/testArray.h Profiler.c util.c assert.c + tests/testArray.h Profiler.c win32lib.c util.c assert.c am_tests_testAll_OBJECTS = testArray.$(OBJEXT) testMain.$(OBJEXT) \ - $(am__objects_4) util.$(OBJEXT) assert.$(OBJEXT) + $(am__objects_4) $(am__objects_5) util.$(OBJEXT) \ + assert.$(OBJEXT) tests_testAll_OBJECTS = $(am_tests_testAll_OBJECTS) tests_testAll_DEPENDENCIES = am__dirstamp = $(am__leading_dot)dirstamp @@ -344,6 +346,8 @@ AM_CXXFLAGS = @SQUID_CXXFLAGS@ @NEED_OWN_MD5_TRUE@MD5SOURCE = md5.c @ENABLE_WIN32SPECIFIC_FALSE@LIBSSPWIN32 = @ENABLE_WIN32SPECIFIC_TRUE@LIBSSPWIN32 = libsspwin32.a +@ENABLE_WIN32SPECIFIC_FALSE@WIN32SRC = +@ENABLE_WIN32SPECIFIC_TRUE@WIN32SRC = win32lib.c EXTRA_LIBRARIES = \ libdlmalloc.a \ libregex.a \ @@ -360,7 +364,8 @@ EXTRA_libmiscutil_a_SOURCES = \ md5.c \ Profiler.c \ snprintf.c \ - strsep.c + strsep.c \ + win32lib.c libmiscutil_a_SOURCES = \ MemPool.cc \ @@ -384,7 +389,8 @@ libmiscutil_a_SOURCES = \ util.c \ uudecode.c \ assert.c \ - $(XPROF_STATS_SOURCE) + $(XPROF_STATS_SOURCE) \ + $(WIN32SRC) libmiscutil_a_LIBADD = \ libTrie/src/Trie.o \ @@ -411,6 +417,7 @@ INCLUDES = -I$(top_builddir)/include -I$(top_srcdir)/include @SQUID_CPPUNIT_INC@ TESTS = $(check_PROGRAMS) tests_testAll_SOURCES = tests/testArray.cc tests/testMain.cc tests/testArray.h \ $(XPROF_STATS_SOURCE) \ + $(WIN32SRC) \ util.c assert.c tests_testAll_LDADD = @SQUID_CPPUNIT_LA@ @SQUID_CPPUNIT_LIBS@ @@ -524,6 +531,7 @@ distclean-compile: @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/testMain.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/util.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/uudecode.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/win32lib.Po@am__quote@ .c.o: @am__fastdepCC_TRUE@ if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \