]> git.ipfire.org Git - thirdparty/squid.git/commitdiff
Revert libntlmauth .h dependency changes.
authorAmos Jeffries <amosjeffries@squid-cache.org>
Sat, 12 Jun 2010 10:35:54 +0000 (04:35 -0600)
committerAmos Jeffries <amosjeffries@squid-cache.org>
Sat, 12 Jun 2010 10:35:54 +0000 (04:35 -0600)
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/

helpers/ntlm_auth/smb_lm/Makefile.am
lib/Makefile.am

index 96baa4e8c5eba7bb86671575c7b9e44430ba26fe..1d4c2ce20a82da53a931f463e4b91be152fe4e18 100644 (file)
@@ -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
index d65d2cf3a107c1e08960e37a00a39eaf933d5f02..dc2119b5196b1869311cab51607bfec52121a4d2 100644 (file)
@@ -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 = \