---------------------
PatchSet 2017 
Date: 2001/04/20 23:43:29
Author: rbcollins
Branch: squid-amake
Tag: (none) 
Log:
better cleanup on uninstall, bugfix for cygwin CC detection

Members: 
	configure.in:1.19.4.2->1.19.4.3 
	errors/Makefile.am:1.1.2.3->1.1.2.4 
	src/Makefile.am:1.1.2.26->1.1.2.27 

Index: squid/configure.in
===================================================================
RCS file: /cvsroot/squid-sf//squid/configure.in,v
retrieving revision 1.19.4.2
retrieving revision 1.19.4.3
diff -u -r1.19.4.2 -r1.19.4.3
--- squid/configure.in	16 Apr 2001 13:03:07 -0000	1.19.4.2
+++ squid/configure.in	20 Apr 2001 23:43:29 -0000	1.19.4.3
@@ -3,18 +3,27 @@
 dnl
 dnl  Duane Wessels, wessels@nlanr.net, February 1996 (autoconf v2.9)
 dnl
-dnl  $Id: configure.in,v 1.19.4.2 2001/04/16 13:03:07 rbcollins Exp $
+dnl  $Id: configure.in,v 1.19.4.3 2001/04/20 23:43:29 rbcollins Exp $
 dnl
 dnl
 dnl
 AC_INIT(src/main.c)
 AM_INIT_AUTOMAKE(squid, 2.5-DEVEL)
 AM_CONFIG_HEADER(include/autoconf.h)
-AC_REVISION($Revision: 1.19.4.2 $)dnl
+AC_REVISION($Revision: 1.19.4.3 $)dnl
 AC_PREFIX_DEFAULT(/usr/local/squid)
 
 dnl AC_CONFIG_AUX_DIR(cfgaux)
+dnl Set default LDFLAGS
+if test -z "$LDFLAGS"; then
+        LDFLAGS="-g"
+fi
+
+PRESET_CFLAGS="$CFLAGS"
 
+dnl Check for GNU cc
+AC_PROG_CC
+AC_PROG_CC_C_O
 AC_CANONICAL_HOST
 
 
@@ -32,19 +41,6 @@
 dnl find out the exe extension for this platform. If it's not empty, use it for CGI's as well.
 AC_EXEEXT
 AC_OBJEXT
-dnl use .exe suffix for executables on cygwin32 platform
-dnl case "$host_os" in
-dnl cygwin|cygwin32|os2)
-dnl	EXEEXT=".exe"
-dnl	CGIEXT=".exe"
-dnl	;;
-dnl *)
-dnl	EXEEXT=""
-dnl	CGIEXT=".cgi"
-dnl	;;
-dnl esac
-dnl AC_SUBST(EXEEXT)
-dnl AC_SUBST(CGIEXT)
 
 if test -z "$EXEEXT"; then
 	CGIEXT=".cgi"
@@ -65,16 +61,6 @@
 
 AC_DEFINE_UNQUOTED(CONFIG_HOST_TYPE, "$host")
 
-dnl Set default LDFLAGS
-if test -z "$LDFLAGS"; then
-	LDFLAGS="-g"
-fi
-
-PRESET_CFLAGS="$CFLAGS"
-
-dnl Check for GNU cc
-AC_PROG_CC
-AM_PROG_CC_C_O
 
 dnl Gerben Wierda <Gerben_Wierda@RnA.nl>
 case "$host" in
Index: squid/errors/Makefile.am
===================================================================
RCS file: /cvsroot/squid-sf//squid/errors/Makefile.am,v
retrieving revision 1.1.2.3
retrieving revision 1.1.2.4
diff -u -r1.1.2.3 -r1.1.2.4
--- squid/errors/Makefile.am	20 Apr 2001 09:58:54 -0000	1.1.2.3
+++ squid/errors/Makefile.am	20 Apr 2001 23:43:29 -0000	1.1.2.4
@@ -28,6 +28,13 @@
 		fi; \
 	done
 
+uninstall-local:
+	@for f in $(srcdir)/$(LANGUAGE)/ERR_*; do \
+	        if test -f $(DEFAULT_ERROR_DIR)/`echo $$f | echo "$$f" | sed -e "s/.*\///;"` ; then \
+	                rm -f $(DEFAULT_ERROR_DIR)/`echo $$f | echo "$$f" | sed -e "s/.*\///;"`; \
+	        fi; \
+	done
+
 # undocumented hack.  You can use this target to create multi-lingual
 # error pages.  For example:
 #
Index: squid/src/Makefile.am
===================================================================
RCS file: /cvsroot/squid-sf//squid/src/Makefile.am,v
retrieving revision 1.1.2.26
retrieving revision 1.1.2.27
diff -u -r1.1.2.26 -r1.1.2.27
--- squid/src/Makefile.am	20 Apr 2001 10:49:13 -0000	1.1.2.26
+++ squid/src/Makefile.am	20 Apr 2001 23:43:29 -0000	1.1.2.27
@@ -183,6 +183,17 @@
 	        $(INSTALL_DATA) squid.conf.default $(sysconfdir)/squid.conf; \
 	fi
 
+uninstall-local:
+	@if test -f $(sysconfdir)/mime.conf ; then \
+		echo "rm -f $(sysconfdir)/mime.conf"; \
+		$(RM) -f $(sysconfdir)/mime.conf; \
+	fi
+	@if test -f $(sysconfdir)/squid.conf ; then \
+		echo "rm -f $(sysconfdir)/squid.conf"; \
+		$(RM) -f $(sysconfdir)/squid.conf; \
+	fi
+
+
 ##install-pinger:
 ##	@f=$(PINGER_EXE); \
 ##	if test -f $(libexecdir)/$$f; then \