From: hno <>
Date: Sun, 24 Apr 2005 06:10:35 +0000 (+0000)
Subject: Bootstrapped
X-Git-Tag: SQUID_3_0_PRE4~797
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=02d05ccbcbffba4828072e09dfd9fc9a63913048;p=thirdparty%2Fsquid.git

Bootstrapped
---

diff --git a/configure b/configure
index d7171ef887..75c7176a23 100755
--- a/configure
+++ b/configure
@@ -1,5 +1,5 @@
 #! /bin/sh
-# From configure.in Revision: 1.372 .
+# From configure.in Revision: 1.373 .
 # Guess values for system-dependent variables and create Makefiles.
 # Generated by GNU Autoconf 2.59.
 #
@@ -24254,6 +24254,7 @@ fi
 
 
 
+
 
 
 for ac_header in \
@@ -24266,6 +24267,7 @@ for ac_header in \
 	errno.h \
 	execinfo.h \
 	fcntl.h \
+	fnmatch.h \
 	getopt.h \
 	gnumalloc.h \
 	grp.h \
diff --git a/include/autoconf.h.in b/include/autoconf.h.in
index 722e2b4e0a..b0c82c97fb 100644
--- a/include/autoconf.h.in
+++ b/include/autoconf.h.in
@@ -140,6 +140,9 @@
 /* fd_mask is defined by the system headers */
 #undef HAVE_FD_MASK
 
+/* Define to 1 if you have the <fnmatch.h> header file. */
+#undef HAVE_FNMATCH_H
+
 /* Define to 1 if you have the `getdtablesize' function. */
 #undef HAVE_GETDTABLESIZE
 
diff --git a/src/Makefile.in b/src/Makefile.in
index d886ebc47c..798750f9e3 100644
--- a/src/Makefile.in
+++ b/src/Makefile.in
@@ -17,7 +17,7 @@
 #
 #  Makefile for the Squid Object Cache server
 #
-#  $Id: Makefile.in,v 1.341 2005/04/19 00:10:40 hno Exp $
+#  $Id: Makefile.in,v 1.342 2005/04/24 00:10:37 hno Exp $
 #
 #  Uncomment and customize the following to suit your needs:
 #
@@ -382,6 +382,7 @@ cf_gen_SOURCES = cf_gen.cc defines.h
 nodist_cf_gen_HEADER = cf_gen_defines.h
 squidclient_SOURCES = client.cc
 cachemgr__CGIEXT__SOURCES = cachemgr.cc
+cachemgr__CGIEXT__CFLAGS = -DDEFAULT_CACHEMGR_CONFIG=\"$(DEFAULT_CACHEMGR_CONFIG)\" $(AM_CFLAGS)
 
 all_FSMODULES = \
 	fs/aufs/StoreFSaufs.cc \
@@ -974,6 +975,7 @@ EXTRA_DIST = \
 	mk-string-arrays.pl \
 	repl_modules.sh \
 	mib.txt \
+	cachemgr.conf \
 	mime.conf.default
 
 
@@ -1019,6 +1021,7 @@ DiskIO_DiskDaemon_diskd_LDADD = $(top_builddir)/lib/libmiscutil.a @XTRA_LIBS@
 
 DEFAULT_PREFIX = $(prefix)
 DEFAULT_CONFIG_FILE = $(sysconfdir)/squid.conf
+DEFAULT_CACHEMGR_CONFIG = $(sysconfdir)/cachemgr.conf
 DEFAULT_MIME_TABLE = $(sysconfdir)/mime.conf
 DEFAULT_DNSSERVER = $(libexecdir)/`echo dnsserver | sed '$(transform);s/$$/$(EXEEXT)/'`
 DEFAULT_LOG_PREFIX = $(localstatedir)/logs
@@ -4979,6 +4982,12 @@ install-data-local: install-sysconfDATA install-dataDATA
 	        echo "$(INSTALL_DATA) squid.conf.default $(DESTDIR)$(DEFAULT_CONFIG_FILE)"; \
 	        $(INSTALL_DATA) squid.conf.default $(DESTDIR)$(DEFAULT_CONFIG_FILE); \
 	fi
+	@if test -f $(DESTDIR)$(DEFAULT_CACHEMGR_CONFIG) ; then \
+	        echo "$@ will not overwrite existing $(DESTDIR)$(DEFAULT_CACHEMGR_CONFIG)" ; \
+	else \
+	        echo "$(INSTALL_DATA) $(srcdir)/cachemgr.conf $(DESTDIR)$(DEFAULT_CACHEMGR_CONFIG)"; \
+	        $(INSTALL_DATA) $(srcdir)/cachemgr.conf $(DESTDIR)$(DEFAULT_CACHEMGR_CONFIG); \
+	fi
 	$(mkinstalldirs) $(DESTDIR)$(DEFAULT_LOG_PREFIX)
 
 uninstall-local: