---------------------
PatchSet 3193 
Date: 2001/10/18 15:38:27
Author: serassio
Branch: cygwin
Tag: (none) 
Log:
Pre HEAD merge commit

Members: 
	aclocal.m4:1.1.2.4->1.1.2.5 
	src/auth/basic/helpers/Makefile.am:1.2.6.1->1.2.6.2 

Index: squid/aclocal.m4
===================================================================
RCS file: /cvsroot/squid-sf//squid/Attic/aclocal.m4,v
retrieving revision 1.1.2.4
retrieving revision 1.1.2.5
diff -u -r1.1.2.4 -r1.1.2.5
--- squid/aclocal.m4	2 Sep 2001 10:30:39 -0000	1.1.2.4
+++ squid/aclocal.m4	18 Oct 2001 15:38:27 -0000	1.1.2.5
@@ -678,6 +678,26 @@
 	      m4_patsubst([$1], [^\(.*[^/]\)//*[^/][^/]*/*$], [\1]))[]dnl
 ]) # _AM_DIRNAME
 
+# Add --enable-maintainer-mode option to configure.
+# From Jim Meyering
+
+# serial 1
+
+AC_DEFUN([AM_MAINTAINER_MODE],
+[AC_MSG_CHECKING([whether to enable maintainer-specific portions of Makefiles])
+  dnl maintainer-mode is disabled by default
+  AC_ARG_ENABLE(maintainer-mode,
+[  --enable-maintainer-mode enable make rules and dependencies not useful
+                          (and sometimes confusing) to the casual installer],
+      USE_MAINTAINER_MODE=$enableval,
+      USE_MAINTAINER_MODE=no)
+  AC_MSG_RESULT([$USE_MAINTAINER_MODE])
+  AM_CONDITIONAL(MAINTAINER_MODE, [test $USE_MAINTAINER_MODE = yes])
+  MAINT=$MAINTAINER_MODE_TRUE
+  AC_SUBST(MAINT)dnl
+]
+)
+
 # serial 2
 
 # AM_PROG_CC_C_O
Index: squid/src/auth/basic/helpers/Makefile.am
===================================================================
RCS file: /cvsroot/squid-sf//squid/src/auth/basic/helpers/Attic/Makefile.am,v
retrieving revision 1.2.6.1
retrieving revision 1.2.6.2
diff -u -r1.2.6.1 -r1.2.6.2
--- squid/src/auth/basic/helpers/Makefile.am	2 Sep 2001 08:46:08 -0000	1.2.6.1
+++ squid/src/auth/basic/helpers/Makefile.am	18 Oct 2001 15:38:27 -0000	1.2.6.2
@@ -3,5 +3,5 @@
 #  $Id$
 #
 
-DIST_SUBDIRS	= getpwnam LDAP MSNT multi-domain-NTLM NCSA PAM SMB YP
+DIST_SUBDIRS	= getpwnam LDAP MSNT multi-domain-NTLM NCSA PAM SMB win32_locallogon YP
 SUBDIRS		= @BASIC_AUTH_HELPERS@