---------------------
PatchSet 7947 
Date: 2006/05/24 20:07:33
Author: serassio
Branch: nt
Tag: (none) 
Log:
Fixed merge problems

Members: 
	ChangeLog:1.44.2.6->1.44.2.7 
	configure.in:1.87.2.10->1.87.2.11 
	src/main.c:1.45.2.7->1.45.2.8 

Index: squid/ChangeLog
===================================================================
RCS file: /cvsroot/squid-sf//squid/ChangeLog,v
retrieving revision 1.44.2.6
retrieving revision 1.44.2.7
diff -u -r1.44.2.6 -r1.44.2.7
--- squid/ChangeLog	23 May 2006 18:47:06 -0000	1.44.2.6
+++ squid/ChangeLog	24 May 2006 20:07:33 -0000	1.44.2.7
@@ -83,6 +83,7 @@
 	- [Cosmetic] Add additinal tracing to squid_ldap_auth making
 	  diagnostics easier on squid_ldap_auth configuration errors
 	  (Bug #1395)
+	- [Minor] $HOME not set when started as root (Bug #1401)
 	- [Minor] httpd_accel_single_host breaks in combination with
 	  server_persistent_connections (Bug #1402)
 	- [Cosmetic] Setting CACHE_HTTP_PORT to configure was only partially
Index: squid/configure.in
===================================================================
RCS file: /cvsroot/squid-sf//squid/configure.in,v
retrieving revision 1.87.2.10
retrieving revision 1.87.2.11
diff -u -r1.87.2.10 -r1.87.2.11
--- squid/configure.in	24 May 2006 14:02:43 -0000	1.87.2.10
+++ squid/configure.in	24 May 2006 20:07:33 -0000	1.87.2.11
@@ -3,7 +3,7 @@
 dnl
 dnl  Duane Wessels, wessels@nlanr.net, February 1996 (autoconf v2.9)
 dnl
-dnl  $Id: configure.in,v 1.87.2.10 2006/05/24 14:02:43 serassio Exp $
+dnl  $Id: configure.in,v 1.87.2.11 2006/05/24 20:07:33 serassio Exp $
 dnl
 dnl
 dnl
@@ -11,7 +11,7 @@
 AC_CONFIG_AUX_DIR(cfgaux)
 AM_INIT_AUTOMAKE(squid, 2.6.DEVEL-NT-CVS)
 AM_CONFIG_HEADER(include/autoconf.h)
-AC_REVISION($Revision: 1.87.2.10 $)dnl
+AC_REVISION($Revision: 1.87.2.11 $)dnl
 AC_PREFIX_DEFAULT(/usr/local/squid)
 AM_MAINTAINER_MODE
 
@@ -2703,19 +2703,19 @@
 	AC_MSG_RESULT("no")
 	case "$host_os" in
 	mingw|mingw32)
-	  echo "Using Win32 resolver instead."
-	  ;;
-	  *)      
-	  echo "Will use our own inet_ntoa()."
-	# autoconf-2.13 needs the lines below switched
-#	LIBOBJS="$LIBOBJS inet_ntoa.o"
-	AC_LIBOBJ(inet_ntoa)
-#	echo "WARNING: This looks bad, and probably prevents Squid from working."
-#	echo "         If you're on IRIX and using GCC 2.8, you probably need"
-#	echo "         to use the IRIX C compiler instead."
-#	sleep 10
-	  ;;
-	  esac
+	    echo "Using Win32 resolver instead."
+	    ;;
+	    *)      
+	    echo "Will use our own inet_ntoa()."
+	    # autoconf-2.13 needs the lines below switched
+#	    LIBOBJS="$LIBOBJS inet_ntoa.o"
+	    AC_LIBOBJ(inet_ntoa)
+#	    echo "WARNING: This looks bad, and probably prevents Squid from working."
+#	    echo "         If you're on IRIX and using GCC 2.8, you probably need"
+#	    echo "         to use the IRIX C compiler instead."
+#	    sleep 10
+	;;
+	esac
 fi
 
 if test "$ac_cv_header_sys_statvfs_h" = "yes" ; then
Index: squid/src/main.c
===================================================================
RCS file: /cvsroot/squid-sf//squid/src/main.c,v
retrieving revision 1.45.2.7
retrieving revision 1.45.2.8
diff -u -r1.45.2.7 -r1.45.2.8
--- squid/src/main.c	24 May 2006 19:37:23 -0000	1.45.2.7
+++ squid/src/main.c	24 May 2006 20:07:34 -0000	1.45.2.8
@@ -1,6 +1,6 @@
 
 /*
- * $Id: main.c,v 1.45.2.7 2006/05/24 19:37:23 serassio Exp $
+ * $Id: main.c,v 1.45.2.8 2006/05/24 20:07:34 serassio Exp $
  *
  * DEBUG: section 1     Startup and Main Loop
  * AUTHOR: Harvest Derived
@@ -134,7 +134,7 @@
 	"       -D        Disable initial DNS tests.\n"
 	"       -F        Don't serve any requests until store is rebuilt.\n"
 	"       -N        No daemon mode.\n"
-#if USE_WIN32_SERVICE
+#if defined(USE_WIN32_SERVICE) && defined(_SQUID_WIN32_)
 	"       -O options\n"
 	"                 Set Windows Service Command line options in Registry.\n"
 #endif
@@ -171,7 +171,7 @@
 	case 'N':
 	    opt_no_daemon = 1;
 	    break;
-#if USE_WIN32_SERVICE
+#if defined(USE_WIN32_SERVICE) && defined(_SQUID_WIN32_)
 	case 'O':
 	    opt_command_line = 1;
 	    WIN32_Command_Line = xstrdup(optarg);