From: hno <>
Date: Wed, 12 Feb 2003 08:10:52 +0000 (+0000)
Subject: Bootstrapped
X-Git-Tag: SQUID_3_0_PRE1~360
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=7f013c67f97b2d2fcb4552c1b650ddd1a15f2587;p=thirdparty%2Fsquid.git

Bootstrapped
---

diff --git a/Makefile.in b/Makefile.in
index 4b51264f4e..4dc647d388 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -14,7 +14,7 @@
 @SET_MAKE@
 
 #
-# $Id: Makefile.in,v 1.42 2003/02/06 09:59:47 robertc Exp $
+# $Id: Makefile.in,v 1.43 2003/02/12 01:10:52 hno Exp $
 #
 
 SHELL = @SHELL@
@@ -101,6 +101,7 @@ REPL_LIBS = @REPL_LIBS@
 REPL_OBJS = @REPL_OBJS@
 REPL_POLICIES = @REPL_POLICIES@
 RM = @RM@
+SAMBASOURCES = @SAMBASOURCES@
 SH = @SH@
 SNMPLIB = @SNMPLIB@
 SSLLIB = @SSLLIB@
@@ -467,7 +468,7 @@ uninstall-info: uninstall-info-recursive
 
 
 dist-hook:
-	@ for subdir in "include"; do \
+	@ for subdir in "include include/samba/nsswitch"; do \
 	  if test "$$subdir" = .; then :; else \
 	    test -d $(distdir)/$$subdir \
 	    || mkdir $(distdir)/$$subdir \
diff --git a/configure b/configure
index 5bb86d2bd5..18ba0c6cd9 100755
--- a/configure
+++ b/configure
@@ -1,5 +1,5 @@
 #! /bin/sh
-# From configure.in Revision: 1.320 .
+# From configure.in Revision: 1.321 .
 # Guess values for system-dependent variables and create Makefiles.
 # Generated by GNU Autoconf 2.53.
 #
@@ -1014,6 +1014,11 @@ Optional Packages:
 			  installation can be specified if outside of the
 			  system standard directories
   --with-coss-membuf-size COSS membuf size (default 1048576 bytes)
+  --with-samba-sources=/path/to/samba-source-tree
+                          Path where the correct Samba source files can be
+			  found while building winbind helpers. (defaults to
+			  use internal copies of the headers from Samba-2.2.7)
+
   --with-filedescriptors=NUMBER Force squid to support NUMBER filedescriptors
 
 Some influential environment variables:
@@ -5235,6 +5240,23 @@ _ACEOF
 
 fi;
 
+
+SAMBASOURCES='$(top_srcdir)/include/samba'
+
+# Check whether --with-samba-sources or --without-samba-sources was given.
+if test "${with_samba_sources+set}" = set; then
+  withval="$with_samba_sources"
+   if test -f $withval/source/nsswitch/winbind_nss_config.h; then
+	echo "Using Samba sources from $withval"
+	SAMBASOURCES="$withval/source"
+    else
+	echo "ERROR: Cannot find Samba sources at $withval"
+	exit 1
+    fi
+
+fi;
+
+
 # Check whether --enable-unlinkd or --disable-unlinkd was given.
 if test "${enable_unlinkd+set}" = set; then
   enableval="$enable_unlinkd"
@@ -16568,6 +16590,7 @@ s,@BASIC_AUTH_HELPERS@,$BASIC_AUTH_HELPERS,;t t
 s,@NTLM_AUTH_HELPERS@,$NTLM_AUTH_HELPERS,;t t
 s,@DIGEST_AUTH_HELPERS@,$DIGEST_AUTH_HELPERS,;t t
 s,@EXTERNAL_ACL_HELPERS@,$EXTERNAL_ACL_HELPERS,;t t
+s,@SAMBASOURCES@,$SAMBASOURCES,;t t
 s,@ENABLE_UNLINKD_TRUE@,$ENABLE_UNLINKD_TRUE,;t t
 s,@ENABLE_UNLINKD_FALSE@,$ENABLE_UNLINKD_FALSE,;t t
 s,@ENABLE_XPROF_STATS_TRUE@,$ENABLE_XPROF_STATS_TRUE,;t t
diff --git a/contrib/Makefile.in b/contrib/Makefile.in
index cddf2503bf..4bc946b3d0 100644
--- a/contrib/Makefile.in
+++ b/contrib/Makefile.in
@@ -102,6 +102,7 @@ REPL_LIBS = @REPL_LIBS@
 REPL_OBJS = @REPL_OBJS@
 REPL_POLICIES = @REPL_POLICIES@
 RM = @RM@
+SAMBASOURCES = @SAMBASOURCES@
 SH = @SH@
 SNMPLIB = @SNMPLIB@
 SSLLIB = @SSLLIB@
diff --git a/doc/Makefile.in b/doc/Makefile.in
index b09761acce..6c12edfdeb 100644
--- a/doc/Makefile.in
+++ b/doc/Makefile.in
@@ -16,7 +16,7 @@
 #
 #  Makefile for the Squid Object Cache server
 #
-#  $Id: Makefile.in,v 1.24 2003/02/06 09:59:51 robertc Exp $
+#  $Id: Makefile.in,v 1.25 2003/02/12 01:10:55 hno Exp $
 #
 #  Uncomment and customize the following to suit your needs:
 #
@@ -105,6 +105,7 @@ REPL_LIBS = @REPL_LIBS@
 REPL_OBJS = @REPL_OBJS@
 REPL_POLICIES = @REPL_POLICIES@
 RM = @RM@
+SAMBASOURCES = @SAMBASOURCES@
 SH = @SH@
 SNMPLIB = @SNMPLIB@
 SSLLIB = @SSLLIB@
diff --git a/errors/Makefile.in b/errors/Makefile.in
index 9b9f0a1980..2104816b5d 100644
--- a/errors/Makefile.in
+++ b/errors/Makefile.in
@@ -14,7 +14,7 @@
 @SET_MAKE@
 
 #
-# $Id: Makefile.in,v 1.40 2003/02/06 09:59:52 robertc Exp $
+# $Id: Makefile.in,v 1.41 2003/02/12 01:10:59 hno Exp $
 #
 
 SHELL = @SHELL@
@@ -101,6 +101,7 @@ REPL_LIBS = @REPL_LIBS@
 REPL_OBJS = @REPL_OBJS@
 REPL_POLICIES = @REPL_POLICIES@
 RM = @RM@
+SAMBASOURCES = @SAMBASOURCES@
 SH = @SH@
 SNMPLIB = @SNMPLIB@
 SSLLIB = @SSLLIB@
diff --git a/helpers/Makefile.in b/helpers/Makefile.in
index 29ef88b132..35c98263e8 100644
--- a/helpers/Makefile.in
+++ b/helpers/Makefile.in
@@ -97,6 +97,7 @@ REPL_LIBS = @REPL_LIBS@
 REPL_OBJS = @REPL_OBJS@
 REPL_POLICIES = @REPL_POLICIES@
 RM = @RM@
+SAMBASOURCES = @SAMBASOURCES@
 SH = @SH@
 SNMPLIB = @SNMPLIB@
 SSLLIB = @SSLLIB@
diff --git a/helpers/basic_auth/LDAP/Makefile.in b/helpers/basic_auth/LDAP/Makefile.in
index ce60b56af0..eda8764afb 100644
--- a/helpers/basic_auth/LDAP/Makefile.in
+++ b/helpers/basic_auth/LDAP/Makefile.in
@@ -16,7 +16,7 @@
 #
 #  Makefile for the Squid LDAP authentication helper
 #
-#  $Id: Makefile.in,v 1.33 2003/02/06 09:59:58 robertc Exp $
+#  $Id: Makefile.in,v 1.34 2003/02/12 01:11:19 hno Exp $
 #
 #  Uncomment and customize the following to suit your needs:
 #
@@ -105,6 +105,7 @@ REPL_LIBS = @REPL_LIBS@
 REPL_OBJS = @REPL_OBJS@
 REPL_POLICIES = @REPL_POLICIES@
 RM = @RM@
+SAMBASOURCES = @SAMBASOURCES@
 SH = @SH@
 SNMPLIB = @SNMPLIB@
 SSLLIB = @SSLLIB@
diff --git a/helpers/basic_auth/MSNT/Makefile.in b/helpers/basic_auth/MSNT/Makefile.in
index 81d612cc17..87300f182d 100644
--- a/helpers/basic_auth/MSNT/Makefile.in
+++ b/helpers/basic_auth/MSNT/Makefile.in
@@ -16,7 +16,7 @@
 #
 #  Makefile for the Squid Object Cache server
 #
-#  $Id: Makefile.in,v 1.36 2003/02/06 09:59:58 robertc Exp $
+#  $Id: Makefile.in,v 1.37 2003/02/12 01:11:36 hno Exp $
 #
 #  Uncomment and customize the following to suit your needs:
 #
@@ -105,6 +105,7 @@ REPL_LIBS = @REPL_LIBS@
 REPL_OBJS = @REPL_OBJS@
 REPL_POLICIES = @REPL_POLICIES@
 RM = @RM@
+SAMBASOURCES = @SAMBASOURCES@
 SH = @SH@
 SNMPLIB = @SNMPLIB@
 SSLLIB = @SSLLIB@
diff --git a/helpers/basic_auth/Makefile.in b/helpers/basic_auth/Makefile.in
index 6877a49ffd..5331a17bf6 100644
--- a/helpers/basic_auth/Makefile.in
+++ b/helpers/basic_auth/Makefile.in
@@ -15,7 +15,7 @@
 
 #  Makefile for storage modules in the Squid Object Cache server
 #
-#  $Id: Makefile.in,v 1.31 2003/02/06 09:59:57 robertc Exp $
+#  $Id: Makefile.in,v 1.32 2003/02/12 01:11:13 hno Exp $
 #
 
 SHELL = @SHELL@
@@ -102,6 +102,7 @@ REPL_LIBS = @REPL_LIBS@
 REPL_OBJS = @REPL_OBJS@
 REPL_POLICIES = @REPL_POLICIES@
 RM = @RM@
+SAMBASOURCES = @SAMBASOURCES@
 SH = @SH@
 SNMPLIB = @SNMPLIB@
 SSLLIB = @SSLLIB@
diff --git a/helpers/basic_auth/NCSA/Makefile.in b/helpers/basic_auth/NCSA/Makefile.in
index ae9c1d6ade..2926542535 100644
--- a/helpers/basic_auth/NCSA/Makefile.in
+++ b/helpers/basic_auth/NCSA/Makefile.in
@@ -16,7 +16,7 @@
 #
 #  Makefile for the Squid Object Cache server
 #
-#  $Id: Makefile.in,v 1.31 2003/02/06 09:59:59 robertc Exp $
+#  $Id: Makefile.in,v 1.32 2003/02/12 01:11:41 hno Exp $
 #
 #  Uncomment and customize the following to suit your needs:
 #
@@ -105,6 +105,7 @@ REPL_LIBS = @REPL_LIBS@
 REPL_OBJS = @REPL_OBJS@
 REPL_POLICIES = @REPL_POLICIES@
 RM = @RM@
+SAMBASOURCES = @SAMBASOURCES@
 SH = @SH@
 SNMPLIB = @SNMPLIB@
 SSLLIB = @SSLLIB@
diff --git a/helpers/basic_auth/PAM/Makefile.in b/helpers/basic_auth/PAM/Makefile.in
index e90209e3f4..6713da392d 100644
--- a/helpers/basic_auth/PAM/Makefile.in
+++ b/helpers/basic_auth/PAM/Makefile.in
@@ -16,7 +16,7 @@
 #
 #  Makefile for the Squid PAM authentication helper
 #
-#  $Id: Makefile.in,v 1.32 2003/02/06 10:00:04 robertc Exp $
+#  $Id: Makefile.in,v 1.33 2003/02/12 01:11:42 hno Exp $
 #
 #  Uncomment and customize the following to suit your needs:
 #
@@ -105,6 +105,7 @@ REPL_LIBS = @REPL_LIBS@
 REPL_OBJS = @REPL_OBJS@
 REPL_POLICIES = @REPL_POLICIES@
 RM = @RM@
+SAMBASOURCES = @SAMBASOURCES@
 SH = @SH@
 SNMPLIB = @SNMPLIB@
 SSLLIB = @SSLLIB@
diff --git a/helpers/basic_auth/SASL/Makefile.in b/helpers/basic_auth/SASL/Makefile.in
index d979b65727..cd6d63c80f 100644
--- a/helpers/basic_auth/SASL/Makefile.in
+++ b/helpers/basic_auth/SASL/Makefile.in
@@ -16,7 +16,7 @@
 #
 #  Makefile for the Squid SASL authentication helper
 #
-#  $Id: Makefile.in,v 1.29 2003/02/06 10:00:04 robertc Exp $
+#  $Id: Makefile.in,v 1.30 2003/02/12 01:11:46 hno Exp $
 #
 #  Uncomment and customize the following to suit your needs:
 #
@@ -105,6 +105,7 @@ REPL_LIBS = @REPL_LIBS@
 REPL_OBJS = @REPL_OBJS@
 REPL_POLICIES = @REPL_POLICIES@
 RM = @RM@
+SAMBASOURCES = @SAMBASOURCES@
 SH = @SH@
 SNMPLIB = @SNMPLIB@
 SSLLIB = @SSLLIB@
diff --git a/helpers/basic_auth/SMB/Makefile.in b/helpers/basic_auth/SMB/Makefile.in
index 9d500995d1..3bd6a0acc0 100644
--- a/helpers/basic_auth/SMB/Makefile.in
+++ b/helpers/basic_auth/SMB/Makefile.in
@@ -16,7 +16,7 @@
 #
 #  Makefile for the Squid Object Cache server
 #
-#  $Id: Makefile.in,v 1.32 2003/02/06 10:00:07 robertc Exp $
+#  $Id: Makefile.in,v 1.33 2003/02/12 01:11:48 hno Exp $
 #
 #  Uncomment and customize the following to suit your needs:
 #
@@ -110,6 +110,7 @@ REPL_LIBS = @REPL_LIBS@
 REPL_OBJS = @REPL_OBJS@
 REPL_POLICIES = @REPL_POLICIES@
 RM = @RM@
+SAMBASOURCES = @SAMBASOURCES@
 SH = @SH@
 SNMPLIB = @SNMPLIB@
 SSLLIB = @SSLLIB@
diff --git a/helpers/basic_auth/YP/Makefile.in b/helpers/basic_auth/YP/Makefile.in
index f848430ca5..8ce7652667 100644
--- a/helpers/basic_auth/YP/Makefile.in
+++ b/helpers/basic_auth/YP/Makefile.in
@@ -16,7 +16,7 @@
 #
 #  Makefile for the Squid Object Cache server
 #
-#  $Id: Makefile.in,v 1.33 2003/02/06 10:00:09 robertc Exp $
+#  $Id: Makefile.in,v 1.34 2003/02/12 01:11:51 hno Exp $
 #
 #
 
@@ -104,6 +104,7 @@ REPL_LIBS = @REPL_LIBS@
 REPL_OBJS = @REPL_OBJS@
 REPL_POLICIES = @REPL_POLICIES@
 RM = @RM@
+SAMBASOURCES = @SAMBASOURCES@
 SH = @SH@
 SNMPLIB = @SNMPLIB@
 SSLLIB = @SSLLIB@
diff --git a/helpers/basic_auth/getpwnam/Makefile.in b/helpers/basic_auth/getpwnam/Makefile.in
index 131384c56e..16803047a2 100644
--- a/helpers/basic_auth/getpwnam/Makefile.in
+++ b/helpers/basic_auth/getpwnam/Makefile.in
@@ -16,7 +16,7 @@
 #
 #  Makefile for the Squid Object Cache server
 #
-#  $Id: Makefile.in,v 1.31 2003/02/06 10:00:09 robertc Exp $
+#  $Id: Makefile.in,v 1.32 2003/02/12 01:11:54 hno Exp $
 #
 #  Uncomment and customize the following to suit your needs:
 #
@@ -105,6 +105,7 @@ REPL_LIBS = @REPL_LIBS@
 REPL_OBJS = @REPL_OBJS@
 REPL_POLICIES = @REPL_POLICIES@
 RM = @RM@
+SAMBASOURCES = @SAMBASOURCES@
 SH = @SH@
 SNMPLIB = @SNMPLIB@
 SSLLIB = @SSLLIB@
diff --git a/helpers/basic_auth/multi-domain-NTLM/Makefile.in b/helpers/basic_auth/multi-domain-NTLM/Makefile.in
index 947b9ce470..2e4de5f36f 100644
--- a/helpers/basic_auth/multi-domain-NTLM/Makefile.in
+++ b/helpers/basic_auth/multi-domain-NTLM/Makefile.in
@@ -16,7 +16,7 @@
 #
 #  Makefile for the Squid Object Cache server
 #
-#  $Id: Makefile.in,v 1.29 2003/02/06 10:00:10 robertc Exp $
+#  $Id: Makefile.in,v 1.30 2003/02/12 01:11:56 hno Exp $
 #
 #  Uncomment and customize the following to suit your needs:
 #
@@ -105,6 +105,7 @@ REPL_LIBS = @REPL_LIBS@
 REPL_OBJS = @REPL_OBJS@
 REPL_POLICIES = @REPL_POLICIES@
 RM = @RM@
+SAMBASOURCES = @SAMBASOURCES@
 SH = @SH@
 SNMPLIB = @SNMPLIB@
 SSLLIB = @SSLLIB@
diff --git a/helpers/basic_auth/winbind/Makefile.in b/helpers/basic_auth/winbind/Makefile.in
index 8758dd52cf..c6360dc423 100644
--- a/helpers/basic_auth/winbind/Makefile.in
+++ b/helpers/basic_auth/winbind/Makefile.in
@@ -16,7 +16,7 @@
 #
 #  Makefile for the Squid Object Cache server
 #
-#  $Id: Makefile.in,v 1.23 2003/02/06 10:00:14 robertc Exp $
+#  $Id: Makefile.in,v 1.24 2003/02/12 01:11:59 hno Exp $
 #
 
 SHELL = @SHELL@
@@ -103,6 +103,7 @@ REPL_LIBS = @REPL_LIBS@
 REPL_OBJS = @REPL_OBJS@
 REPL_POLICIES = @REPL_POLICIES@
 RM = @RM@
+SAMBASOURCES = @SAMBASOURCES@
 SH = @SH@
 SNMPLIB = @SNMPLIB@
 SSLLIB = @SSLLIB@
@@ -121,8 +122,8 @@ install_sh = @install_sh@
 makesnmplib = @makesnmplib@
 
 libexec_PROGRAMS = wb_auth
-wb_auth_SOURCES = wb_basic_auth.c wb_common.c samba_nss.h winbindd_nss.h wbntlm.h winbind_nss_config.h
-INCLUDES = -I$(top_srcdir)/include
+wb_auth_SOURCES = wb_basic_auth.c wb_common.c wbntlm.h
+INCLUDES = -I$(top_srcdir)/include -I@SAMBASOURCES@
 LDADD = -L$(top_builddir)/lib -lmiscutil -lntlmauth $(XTRA_LIBS)
 subdir = helpers/basic_auth/winbind
 mkinstalldirs = $(SHELL) $(top_srcdir)/cfgaux/mkinstalldirs
diff --git a/helpers/digest_auth/Makefile.in b/helpers/digest_auth/Makefile.in
index 9e425a26a5..58f0a8e92c 100644
--- a/helpers/digest_auth/Makefile.in
+++ b/helpers/digest_auth/Makefile.in
@@ -15,7 +15,7 @@
 
 #  Makefile for digest auth helpers in the Squid Object Cache server
 #
-#  $Id: Makefile.in,v 1.28 2003/02/06 10:00:14 robertc Exp $
+#  $Id: Makefile.in,v 1.29 2003/02/12 01:12:02 hno Exp $
 #
 
 SHELL = @SHELL@
@@ -102,6 +102,7 @@ REPL_LIBS = @REPL_LIBS@
 REPL_OBJS = @REPL_OBJS@
 REPL_POLICIES = @REPL_POLICIES@
 RM = @RM@
+SAMBASOURCES = @SAMBASOURCES@
 SH = @SH@
 SNMPLIB = @SNMPLIB@
 SSLLIB = @SSLLIB@
diff --git a/helpers/digest_auth/password/Makefile.in b/helpers/digest_auth/password/Makefile.in
index 47c56f39f7..dd9ef5fa80 100644
--- a/helpers/digest_auth/password/Makefile.in
+++ b/helpers/digest_auth/password/Makefile.in
@@ -16,7 +16,7 @@
 #
 #  Makefile for the Squid Object Cache server
 #
-#  $Id: Makefile.in,v 1.30 2003/02/06 10:00:15 robertc Exp $
+#  $Id: Makefile.in,v 1.31 2003/02/12 01:12:03 hno Exp $
 #
 #  Uncomment and customize the following to suit your needs:
 #
@@ -105,6 +105,7 @@ REPL_LIBS = @REPL_LIBS@
 REPL_OBJS = @REPL_OBJS@
 REPL_POLICIES = @REPL_POLICIES@
 RM = @RM@
+SAMBASOURCES = @SAMBASOURCES@
 SH = @SH@
 SNMPLIB = @SNMPLIB@
 SSLLIB = @SSLLIB@
diff --git a/helpers/external_acl/Makefile.in b/helpers/external_acl/Makefile.in
index 4b7e1e2145..912ba22002 100644
--- a/helpers/external_acl/Makefile.in
+++ b/helpers/external_acl/Makefile.in
@@ -15,7 +15,7 @@
 
 #  Makefile for storage modules in the Squid Object Cache server
 #
-#  $Id: Makefile.in,v 1.18 2003/02/06 10:00:16 robertc Exp $
+#  $Id: Makefile.in,v 1.19 2003/02/12 01:12:08 hno Exp $
 #
 
 SHELL = @SHELL@
@@ -102,6 +102,7 @@ REPL_LIBS = @REPL_LIBS@
 REPL_OBJS = @REPL_OBJS@
 REPL_POLICIES = @REPL_POLICIES@
 RM = @RM@
+SAMBASOURCES = @SAMBASOURCES@
 SH = @SH@
 SNMPLIB = @SNMPLIB@
 SSLLIB = @SSLLIB@
diff --git a/helpers/external_acl/ip_user/Makefile.in b/helpers/external_acl/ip_user/Makefile.in
index 98a78094d1..57c43f36b5 100644
--- a/helpers/external_acl/ip_user/Makefile.in
+++ b/helpers/external_acl/ip_user/Makefile.in
@@ -16,7 +16,7 @@
 #
 #  Makefile for the ip_user external_acl helper by Rodrigo Campos
 #
-#  $Id: Makefile.in,v 1.18 2003/02/06 10:00:16 robertc Exp $
+#  $Id: Makefile.in,v 1.19 2003/02/12 01:12:08 hno Exp $
 #
 #  Uncomment and customize the following to suit your needs:
 #
@@ -105,6 +105,7 @@ REPL_LIBS = @REPL_LIBS@
 REPL_OBJS = @REPL_OBJS@
 REPL_POLICIES = @REPL_POLICIES@
 RM = @RM@
+SAMBASOURCES = @SAMBASOURCES@
 SH = @SH@
 SNMPLIB = @SNMPLIB@
 SSLLIB = @SSLLIB@
diff --git a/helpers/external_acl/ldap_group/Makefile.in b/helpers/external_acl/ldap_group/Makefile.in
index c944d4687c..190e7f99fc 100644
--- a/helpers/external_acl/ldap_group/Makefile.in
+++ b/helpers/external_acl/ldap_group/Makefile.in
@@ -16,7 +16,7 @@
 #
 #  Makefile for the Squid LDAP authentication helper
 #
-#  $Id: Makefile.in,v 1.19 2003/02/06 10:00:16 robertc Exp $
+#  $Id: Makefile.in,v 1.20 2003/02/12 01:12:15 hno Exp $
 #
 #  Uncomment and customize the following to suit your needs:
 #
@@ -105,6 +105,7 @@ REPL_LIBS = @REPL_LIBS@
 REPL_OBJS = @REPL_OBJS@
 REPL_POLICIES = @REPL_POLICIES@
 RM = @RM@
+SAMBASOURCES = @SAMBASOURCES@
 SH = @SH@
 SNMPLIB = @SNMPLIB@
 SSLLIB = @SSLLIB@
diff --git a/helpers/external_acl/unix_group/Makefile.in b/helpers/external_acl/unix_group/Makefile.in
index c022ae5848..f2c6e06c96 100644
--- a/helpers/external_acl/unix_group/Makefile.in
+++ b/helpers/external_acl/unix_group/Makefile.in
@@ -16,7 +16,7 @@
 #
 #  Makefile for the Squid LDAP authentication helper
 #
-#  $Id: Makefile.in,v 1.18 2003/02/06 10:00:17 robertc Exp $
+#  $Id: Makefile.in,v 1.19 2003/02/12 01:12:15 hno Exp $
 #
 #  Uncomment and customize the following to suit your needs:
 #
@@ -105,6 +105,7 @@ REPL_LIBS = @REPL_LIBS@
 REPL_OBJS = @REPL_OBJS@
 REPL_POLICIES = @REPL_POLICIES@
 RM = @RM@
+SAMBASOURCES = @SAMBASOURCES@
 SH = @SH@
 SNMPLIB = @SNMPLIB@
 SSLLIB = @SSLLIB@
diff --git a/helpers/external_acl/wbinfo_group/Makefile.in b/helpers/external_acl/wbinfo_group/Makefile.in
index c4bdf4e1cb..1093863920 100644
--- a/helpers/external_acl/wbinfo_group/Makefile.in
+++ b/helpers/external_acl/wbinfo_group/Makefile.in
@@ -16,7 +16,7 @@
 #
 #  Makefile for the Squid LDAP authentication helper
 #
-#  $Id: Makefile.in,v 1.17 2003/02/06 10:00:17 robertc Exp $
+#  $Id: Makefile.in,v 1.18 2003/02/12 01:12:17 hno Exp $
 #
 #  Uncomment and customize the following to suit your needs:
 #
@@ -105,6 +105,7 @@ REPL_LIBS = @REPL_LIBS@
 REPL_OBJS = @REPL_OBJS@
 REPL_POLICIES = @REPL_POLICIES@
 RM = @RM@
+SAMBASOURCES = @SAMBASOURCES@
 SH = @SH@
 SNMPLIB = @SNMPLIB@
 SSLLIB = @SSLLIB@
diff --git a/helpers/external_acl/winbind_group/Makefile.in b/helpers/external_acl/winbind_group/Makefile.in
index ed17f54bfc..399f15cabf 100644
--- a/helpers/external_acl/winbind_group/Makefile.in
+++ b/helpers/external_acl/winbind_group/Makefile.in
@@ -16,7 +16,7 @@
 #
 #  Makefile for the wb_group external_acl helper
 #
-#  $Id: Makefile.in,v 1.18 2003/02/06 10:00:19 robertc Exp $
+#  $Id: Makefile.in,v 1.19 2003/02/12 01:12:22 hno Exp $
 #
 
 SHELL = @SHELL@
@@ -103,6 +103,7 @@ REPL_LIBS = @REPL_LIBS@
 REPL_OBJS = @REPL_OBJS@
 REPL_POLICIES = @REPL_POLICIES@
 RM = @RM@
+SAMBASOURCES = @SAMBASOURCES@
 SH = @SH@
 SNMPLIB = @SNMPLIB@
 SSLLIB = @SSLLIB@
@@ -121,10 +122,10 @@ install_sh = @install_sh@
 makesnmplib = @makesnmplib@
 
 libexec_PROGRAMS = wb_group
-wb_group_SOURCES = wb_check_group.c wb_common.c samba_nss.h winbindd_nss.h wbntlm.h winbind_nss_config.h
+wb_group_SOURCES = wb_check_group.c wb_common.c wbntlm.h
 EXTRA_DIST = readme.txt
 INCLUDES = -I. -I$(top_builddir)/include -I$(top_srcdir)/include \
-    -I$(top_srcdir)/src
+    -I$(top_srcdir)/src -I@SAMBASOURCES@
 
 LDADD = -L$(top_builddir)/lib $(XTRA_LIBS)
 subdir = helpers/external_acl/winbind_group
diff --git a/helpers/ntlm_auth/Makefile.in b/helpers/ntlm_auth/Makefile.in
index 1661a23d0e..4123c1bae9 100644
--- a/helpers/ntlm_auth/Makefile.in
+++ b/helpers/ntlm_auth/Makefile.in
@@ -15,7 +15,7 @@
 
 #  Makefile for storage modules in the Squid Object Cache server
 #
-#  $Id: Makefile.in,v 1.31 2003/02/06 10:00:21 robertc Exp $
+#  $Id: Makefile.in,v 1.32 2003/02/12 01:12:24 hno Exp $
 #
 
 SHELL = @SHELL@
@@ -102,6 +102,7 @@ REPL_LIBS = @REPL_LIBS@
 REPL_OBJS = @REPL_OBJS@
 REPL_POLICIES = @REPL_POLICIES@
 RM = @RM@
+SAMBASOURCES = @SAMBASOURCES@
 SH = @SH@
 SNMPLIB = @SNMPLIB@
 SSLLIB = @SSLLIB@
diff --git a/helpers/ntlm_auth/SMB/Makefile.in b/helpers/ntlm_auth/SMB/Makefile.in
index c9725fc72a..54450c7ddc 100644
--- a/helpers/ntlm_auth/SMB/Makefile.in
+++ b/helpers/ntlm_auth/SMB/Makefile.in
@@ -16,7 +16,7 @@
 #
 #  Makefile for the Squid Object Cache server
 #
-#  $Id: Makefile.in,v 1.31 2003/02/06 10:00:21 robertc Exp $
+#  $Id: Makefile.in,v 1.32 2003/02/12 01:12:26 hno Exp $
 #
 
 SHELL = @SHELL@
@@ -103,6 +103,7 @@ REPL_LIBS = @REPL_LIBS@
 REPL_OBJS = @REPL_OBJS@
 REPL_POLICIES = @REPL_POLICIES@
 RM = @RM@
+SAMBASOURCES = @SAMBASOURCES@
 SH = @SH@
 SNMPLIB = @SNMPLIB@
 SSLLIB = @SSLLIB@
diff --git a/helpers/ntlm_auth/SMB/smbval/Makefile.in b/helpers/ntlm_auth/SMB/smbval/Makefile.in
index d8cdd37319..6fbc65da33 100644
--- a/helpers/ntlm_auth/SMB/smbval/Makefile.in
+++ b/helpers/ntlm_auth/SMB/smbval/Makefile.in
@@ -99,6 +99,7 @@ REPL_LIBS = @REPL_LIBS@
 REPL_OBJS = @REPL_OBJS@
 REPL_POLICIES = @REPL_POLICIES@
 RM = @RM@
+SAMBASOURCES = @SAMBASOURCES@
 SH = @SH@
 SNMPLIB = @SNMPLIB@
 SSLLIB = @SSLLIB@
diff --git a/helpers/ntlm_auth/fakeauth/Makefile.in b/helpers/ntlm_auth/fakeauth/Makefile.in
index be25cc5d77..94c0e2267f 100644
--- a/helpers/ntlm_auth/fakeauth/Makefile.in
+++ b/helpers/ntlm_auth/fakeauth/Makefile.in
@@ -16,7 +16,7 @@
 #
 #  Makefile for the Squid Object Cache server
 #
-#  $Id: Makefile.in,v 1.30 2003/02/06 10:00:23 robertc Exp $
+#  $Id: Makefile.in,v 1.31 2003/02/12 01:12:31 hno Exp $
 #
 #  Uncomment and customize the following to suit your needs:
 #
@@ -105,6 +105,7 @@ REPL_LIBS = @REPL_LIBS@
 REPL_OBJS = @REPL_OBJS@
 REPL_POLICIES = @REPL_POLICIES@
 RM = @RM@
+SAMBASOURCES = @SAMBASOURCES@
 SH = @SH@
 SNMPLIB = @SNMPLIB@
 SSLLIB = @SSLLIB@
diff --git a/helpers/ntlm_auth/no_check/Makefile.in b/helpers/ntlm_auth/no_check/Makefile.in
index e159cc4488..4511616858 100644
--- a/helpers/ntlm_auth/no_check/Makefile.in
+++ b/helpers/ntlm_auth/no_check/Makefile.in
@@ -16,7 +16,7 @@
 #
 #  Makefile for the Squid Object Cache server
 #
-#  $Id: Makefile.in,v 1.32 2003/02/06 10:00:23 robertc Exp $
+#  $Id: Makefile.in,v 1.33 2003/02/12 01:12:34 hno Exp $
 #
 #  Uncomment and customize the following to suit your needs:
 #
@@ -105,6 +105,7 @@ REPL_LIBS = @REPL_LIBS@
 REPL_OBJS = @REPL_OBJS@
 REPL_POLICIES = @REPL_POLICIES@
 RM = @RM@
+SAMBASOURCES = @SAMBASOURCES@
 SH = @SH@
 SNMPLIB = @SNMPLIB@
 SSLLIB = @SSLLIB@
diff --git a/helpers/ntlm_auth/winbind/Makefile.in b/helpers/ntlm_auth/winbind/Makefile.in
index 1f8c216712..ea2ae0b9c9 100644
--- a/helpers/ntlm_auth/winbind/Makefile.in
+++ b/helpers/ntlm_auth/winbind/Makefile.in
@@ -16,7 +16,7 @@
 #
 #  Makefile for the Squid Object Cache server
 #
-#  $Id: Makefile.in,v 1.23 2003/02/06 10:00:25 robertc Exp $
+#  $Id: Makefile.in,v 1.24 2003/02/12 01:12:37 hno Exp $
 #
 
 SHELL = @SHELL@
@@ -103,6 +103,7 @@ REPL_LIBS = @REPL_LIBS@
 REPL_OBJS = @REPL_OBJS@
 REPL_POLICIES = @REPL_POLICIES@
 RM = @RM@
+SAMBASOURCES = @SAMBASOURCES@
 SH = @SH@
 SNMPLIB = @SNMPLIB@
 SSLLIB = @SSLLIB@
@@ -121,13 +122,13 @@ install_sh = @install_sh@
 makesnmplib = @makesnmplib@
 
 libexec_PROGRAMS = wb_ntlmauth
-wb_ntlmauth_SOURCES = wb_ntlm_auth.c wb_common.c samba_nss.h winbindd_nss.h wbntlm.h winbind_nss_config.h
+wb_ntlmauth_SOURCES = wb_ntlm_auth.c wb_common.c wbntlm.h
 EXTRA_DIST = \
 	patches/wb_common.patch \
 	patches/winbind_nss_config.patch
 
 INCLUDES = -I. -I$(top_builddir)/include -I$(top_srcdir)/include \
-    -I$(top_srcdir)/src
+    -I$(top_srcdir)/src -I@SAMBASOURCES@
 
 LDADD = -L$(top_builddir)/lib -lmiscutil -lntlmauth $(XTRA_LIBS)
 subdir = helpers/ntlm_auth/winbind
diff --git a/icons/Makefile.in b/icons/Makefile.in
index 58dc63568d..3641c4e6ab 100644
--- a/icons/Makefile.in
+++ b/icons/Makefile.in
@@ -13,7 +13,7 @@
 
 @SET_MAKE@
 
-# $Id: Makefile.in,v 1.42 2003/02/06 10:00:26 robertc Exp $
+# $Id: Makefile.in,v 1.43 2003/02/12 01:12:39 hno Exp $
 #
 
 SHELL = @SHELL@
@@ -100,6 +100,7 @@ REPL_LIBS = @REPL_LIBS@
 REPL_OBJS = @REPL_OBJS@
 REPL_POLICIES = @REPL_POLICIES@
 RM = @RM@
+SAMBASOURCES = @SAMBASOURCES@
 SH = @SH@
 SNMPLIB = @SNMPLIB@
 SSLLIB = @SSLLIB@
diff --git a/lib/Makefile.in b/lib/Makefile.in
index 22ff3cd8ff..9600ac6c62 100644
--- a/lib/Makefile.in
+++ b/lib/Makefile.in
@@ -14,7 +14,7 @@
 @SET_MAKE@
 
 #
-#  $Id: Makefile.in,v 1.79 2003/02/06 10:00:26 robertc Exp $
+#  $Id: Makefile.in,v 1.80 2003/02/12 01:12:42 hno Exp $
 #
 
 SHELL = @SHELL@
@@ -101,6 +101,7 @@ REPL_LIBS = @REPL_LIBS@
 REPL_OBJS = @REPL_OBJS@
 REPL_POLICIES = @REPL_POLICIES@
 RM = @RM@
+SAMBASOURCES = @SAMBASOURCES@
 SH = @SH@
 SNMPLIB = @SNMPLIB@
 SSLLIB = @SSLLIB@
diff --git a/scripts/Makefile.in b/scripts/Makefile.in
index c7dc08c5b8..067fec276b 100644
--- a/scripts/Makefile.in
+++ b/scripts/Makefile.in
@@ -102,6 +102,7 @@ REPL_LIBS = @REPL_LIBS@
 REPL_OBJS = @REPL_OBJS@
 REPL_POLICIES = @REPL_POLICIES@
 RM = @RM@
+SAMBASOURCES = @SAMBASOURCES@
 SH = @SH@
 SNMPLIB = @SNMPLIB@
 SSLLIB = @SSLLIB@
diff --git a/snmplib/Makefile.in b/snmplib/Makefile.in
index f9cfda5d10..ba399d1456 100644
--- a/snmplib/Makefile.in
+++ b/snmplib/Makefile.in
@@ -97,6 +97,7 @@ REPL_LIBS = @REPL_LIBS@
 REPL_OBJS = @REPL_OBJS@
 REPL_POLICIES = @REPL_POLICIES@
 RM = @RM@
+SAMBASOURCES = @SAMBASOURCES@
 SH = @SH@
 SNMPLIB = @SNMPLIB@
 SSLLIB = @SSLLIB@
diff --git a/src/Makefile.in b/src/Makefile.in
index 66c918081d..fb9c595b16 100644
--- a/src/Makefile.in
+++ b/src/Makefile.in
@@ -16,7 +16,7 @@
 #
 #  Makefile for the Squid Object Cache server
 #
-#  $Id: Makefile.in,v 1.282 2003/02/11 13:07:27 hno Exp $
+#  $Id: Makefile.in,v 1.283 2003/02/12 01:12:52 hno Exp $
 #
 #  Uncomment and customize the following to suit your needs:
 #
@@ -105,6 +105,7 @@ REPL_LIBS = @REPL_LIBS@
 REPL_OBJS = @REPL_OBJS@
 REPL_POLICIES = @REPL_POLICIES@
 RM = @RM@
+SAMBASOURCES = @SAMBASOURCES@
 SH = @SH@
 SNMPLIB = @SNMPLIB@
 SSLLIB = @SSLLIB@
diff --git a/src/auth/Makefile.in b/src/auth/Makefile.in
index f2f5c114ac..24fc140830 100644
--- a/src/auth/Makefile.in
+++ b/src/auth/Makefile.in
@@ -15,7 +15,7 @@
 
 #  Makefile for authentication modules in the Squid Object Cache server
 #
-#  $Id: Makefile.in,v 1.30 2003/02/06 10:00:31 robertc Exp $
+#  $Id: Makefile.in,v 1.31 2003/02/12 01:12:53 hno Exp $
 #
 
 SHELL = @SHELL@
@@ -102,6 +102,7 @@ REPL_LIBS = @REPL_LIBS@
 REPL_OBJS = @REPL_OBJS@
 REPL_POLICIES = @REPL_POLICIES@
 RM = @RM@
+SAMBASOURCES = @SAMBASOURCES@
 SH = @SH@
 SNMPLIB = @SNMPLIB@
 SSLLIB = @SSLLIB@
diff --git a/src/fs/Makefile.in b/src/fs/Makefile.in
index d3ca6459da..6a6ca266d3 100644
--- a/src/fs/Makefile.in
+++ b/src/fs/Makefile.in
@@ -15,7 +15,7 @@
 
 #  Makefile for storage modules in the Squid Object Cache server
 #
-#  $Id: Makefile.in,v 1.33 2003/02/06 10:00:31 robertc Exp $
+#  $Id: Makefile.in,v 1.34 2003/02/12 01:12:55 hno Exp $
 #
 
 SHELL = @SHELL@
@@ -102,6 +102,7 @@ REPL_LIBS = @REPL_LIBS@
 REPL_OBJS = @REPL_OBJS@
 REPL_POLICIES = @REPL_POLICIES@
 RM = @RM@
+SAMBASOURCES = @SAMBASOURCES@
 SH = @SH@
 SNMPLIB = @SNMPLIB@
 SSLLIB = @SSLLIB@
diff --git a/src/repl/Makefile.in b/src/repl/Makefile.in
index c55efaa4b9..787156d9c1 100644
--- a/src/repl/Makefile.in
+++ b/src/repl/Makefile.in
@@ -15,7 +15,7 @@
 
 #  Makefile for storage modules in the Squid Object Cache server
 #
-#  $Id: Makefile.in,v 1.30 2003/02/06 10:00:33 robertc Exp $
+#  $Id: Makefile.in,v 1.31 2003/02/12 01:12:58 hno Exp $
 #
 
 SHELL = @SHELL@
@@ -102,6 +102,7 @@ REPL_LIBS = @REPL_LIBS@
 REPL_OBJS = @REPL_OBJS@
 REPL_POLICIES = @REPL_POLICIES@
 RM = @RM@
+SAMBASOURCES = @SAMBASOURCES@
 SH = @SH@
 SNMPLIB = @SNMPLIB@
 SSLLIB = @SSLLIB@
diff --git a/test-suite/Makefile.in b/test-suite/Makefile.in
index 0607db66f3..baf4b4c3c3 100644
--- a/test-suite/Makefile.in
+++ b/test-suite/Makefile.in
@@ -16,7 +16,7 @@
 #
 #  Makefile for the Squid Object Cache server
 #
-#  $Id: Makefile.in,v 1.17 2003/02/06 10:00:35 robertc Exp $
+#  $Id: Makefile.in,v 1.18 2003/02/12 01:13:04 hno Exp $
 #
 
 SHELL = @SHELL@
@@ -103,6 +103,7 @@ REPL_LIBS = @REPL_LIBS@
 REPL_OBJS = @REPL_OBJS@
 REPL_POLICIES = @REPL_POLICIES@
 RM = @RM@
+SAMBASOURCES = @SAMBASOURCES@
 SH = @SH@
 SNMPLIB = @SNMPLIB@
 SSLLIB = @SSLLIB@