diff -urN squid-2.5.STABLE5.orig/configure squid-2.5.STABLE5/configure
--- squid-2.5.STABLE5.orig/configure	2004-05-07 18:26:39.687573000 +0900
+++ squid-2.5.STABLE5/configure	2004-05-07 18:30:36.158289000 +0900
@@ -7316,12 +7316,6 @@
 esac
 
 case "$host" in
-	i386-*-solaris2.*)
-    		if test "$GCC" = "yes"; then
-			echo "Removing -O for gcc on $host"
-			CFLAGS="`echo $CFLAGS | sed -e 's/-O[0-9]*//'`"
-		fi
-		;;
 	*-sgi-irix*)
         	echo "Removing -lsocket for IRIX..."
         	LIBS=`echo $LIBS | sed -e s/-lsocket//`
@@ -7363,18 +7357,6 @@
 		;;
 esac
 
-# Remove optimization for GCC 2.95.[123]
-# gcc -O[2] on *BSD and Linux (x86) causes pointers to magically become NULL
-if test "$GCC" = "yes"; then
-	GCCVER=`$CC -v 2>&1 | awk '$2 ==  "version" {print $3}'`
-	case "$GCCVER" in
-	2.95.[123])
-		echo "Removing -O for gcc on $host with GCC $GCCVER"
-		CFLAGS="`echo $CFLAGS | sed -e 's/-O[0-9]*//'`"
-		;;
-	esac
-fi
-
 # Recommended by Balint Nagy Endre <bne@CareNet.hu>
 case "$host" in
 	*-univel-sysv4.2MP)
diff -urN squid-2.5.STABLE5.orig/helpers/basic_auth/SMB/Makefile.in squid-2.5.STABLE5/helpers/basic_auth/SMB/Makefile.in
--- squid-2.5.STABLE5.orig/helpers/basic_auth/SMB/Makefile.in	2003-02-12 11:02:25.000000000 +0900
+++ squid-2.5.STABLE5/helpers/basic_auth/SMB/Makefile.in	2004-05-07 18:28:47.751026000 +0900
@@ -126,7 +126,7 @@
 makesnmplib = @makesnmplib@
 
 SMB_AUTH_HELPER = smb_auth.sh
-SAMBAPREFIX = /usr/local/samba
+SAMBAPREFIX = /usr/local
 SMB_AUTH_HELPER_PATH = $(libexecdir)/$(SMB_AUTH_HELPER)
 
 libexec_SCRIPTS = $(SMB_AUTH_HELPER)
diff -urN squid-2.5.STABLE5.orig/src/Makefile.in squid-2.5.STABLE5/src/Makefile.in
--- squid-2.5.STABLE5.orig/src/Makefile.in	2003-02-12 11:03:14.000000000 +0900
+++ squid-2.5.STABLE5/src/Makefile.in	2004-05-07 18:34:10.083848000 +0900
@@ -374,12 +374,12 @@
 DEFAULT_CONFIG_FILE = $(sysconfdir)/squid.conf
 DEFAULT_MIME_TABLE = $(sysconfdir)/mime.conf
 DEFAULT_DNSSERVER = $(libexecdir)/dnsserver$(EXEEXT)
-DEFAULT_LOG_PREFIX = $(localstatedir)/logs
+DEFAULT_LOG_PREFIX = $(localstatedir)/log/squid
 DEFAULT_CACHE_LOG = $(DEFAULT_LOG_PREFIX)/cache.log
 DEFAULT_ACCESS_LOG = $(DEFAULT_LOG_PREFIX)/access.log
 DEFAULT_STORE_LOG = $(DEFAULT_LOG_PREFIX)/store.log
-DEFAULT_PID_FILE = $(DEFAULT_LOG_PREFIX)/squid.pid
-DEFAULT_SWAP_DIR = $(localstatedir)/cache
+DEFAULT_PID_FILE = $(localstatedir)/run/squid.pid
+DEFAULT_SWAP_DIR = $(localstatedir)/spool/squid/cache
 DEFAULT_PINGER = $(libexecdir)/pinger$(EXEEXT)
 DEFAULT_UNLINKD = $(libexecdir)/unlinkd$(EXEEXT)
 DEFAULT_DISKD = $(libexecdir)/diskd$(EXEEXT)