From: Amos Jeffries <amosjeffries@squid-cache.org>
Date: Sat, 12 Jun 2010 10:35:54 +0000 (-0600)
Subject: Revert libntlmauth .h dependency changes.
X-Git-Tag: SQUID_3_2_0_1~146
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=226e6561a8138744be5a1308b26764553c83d7b7;p=thirdparty%2Fsquid.git

Revert libntlmauth .h dependency changes.

catch-22:
 * without these ntlm helpers dont pick up libntlmauth API changes in .h

 * with these libntlmauth fails make dist with file overwrite Permission errors.

Caused by the automated natiure of include/*.h dist bundling. This will be
properly resolved when libntlmauth can be broken out of lib/ and include/
---

diff --git a/helpers/ntlm_auth/smb_lm/Makefile.am b/helpers/ntlm_auth/smb_lm/Makefile.am
index 96baa4e8c5..1d4c2ce20a 100644
--- a/helpers/ntlm_auth/smb_lm/Makefile.am
+++ b/helpers/ntlm_auth/smb_lm/Makefile.am
@@ -17,6 +17,4 @@ ntlm_smb_lm_auth_LDADD = \
 	$(CRYPTLIB) \
 	$(XTRA_LIBS)
 
-ntlm_smb_lm_auth_DEPENDENCIES = $(top_builddir)/lib/libntlmauth.a
-
 EXTRA_DIST = config.test
diff --git a/lib/Makefile.am b/lib/Makefile.am
index d65d2cf3a1..dc2119b519 100644
--- a/lib/Makefile.am
+++ b/lib/Makefile.am
@@ -78,8 +78,7 @@ libmiscutil_a_LIBADD = $(LIBOBJS)
 
 # $(top_srcdir)/include/version.h should be a dependency
 libntlmauth_a_SOURCES = \
-	ntlmauth.c \
-	$(top_srcdir)/include/ntlmauth.h
+	ntlmauth.c
 libntlmauth_a_LIBADD = \
 	$(LIBOBJS)
 libsspwin32_a_SOURCES = \