From: hno <> Date: Sun, 23 Oct 2005 19:22:23 +0000 (+0000) Subject: Bootstrapped X-Git-Tag: SQUID_3_0_PRE4~577 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=4bf2a6c5b5cbf4349226e2cf5092593ef32bf8a8;p=thirdparty%2Fsquid.git Bootstrapped --- diff --git a/configure b/configure index abd993fbc8..fffada4273 100755 --- a/configure +++ b/configure @@ -1,5 +1,5 @@ #! /bin/sh -# From configure.in Revision: 1.387 . +# From configure.in Revision: 1.388 . # Guess values for system-dependent variables and create Makefiles. # Generated by GNU Autoconf 2.59. # @@ -23149,7 +23149,7 @@ if test "${enable_auth+set}" = set; then else if test -z "$AUTH_MODULES"; then - AUTH_MODULES="basic digest ntlm" + AUTH_MODULES="ntlm basic digest negotiate" fi fi; diff --git a/src/Makefile.in b/src/Makefile.in index 1e9f7275f4..e9f8a6fff3 100644 --- a/src/Makefile.in +++ b/src/Makefile.in @@ -17,7 +17,7 @@ # # Makefile for the Squid Object Cache server # -# $Id: Makefile.in,v 1.349 2005/10/17 00:11:34 hno Exp $ +# $Id: Makefile.in,v 1.350 2005/10/23 13:22:24 hno Exp $ # # Uncomment and customize the following to suit your needs: # @@ -880,7 +880,9 @@ all_AUTHMODULES = \ auth/digest/digestScheme.cc \ auth/digest/digestScheme.h \ auth/ntlm/ntlmScheme.cc \ - auth/ntlm/ntlmScheme.h + auth/ntlm/ntlmScheme.h \ + auth/negotiate/negotiateScheme.cc \ + auth/negotiate/negotiateScheme.h EXTRA_squid_SOURCES = \ $(all_FSMODULES) \ @@ -1959,6 +1961,15 @@ auth/ntlm/$(DEPDIR)/$(am__dirstamp): @: > auth/ntlm/$(DEPDIR)/$(am__dirstamp) auth/ntlm/ntlmScheme.$(OBJEXT): auth/ntlm/$(am__dirstamp) \ auth/ntlm/$(DEPDIR)/$(am__dirstamp) +auth/negotiate/$(am__dirstamp): + @$(mkdir_p) auth/negotiate + @: > auth/negotiate/$(am__dirstamp) +auth/negotiate/$(DEPDIR)/$(am__dirstamp): + @$(mkdir_p) auth/negotiate/$(DEPDIR) + @: > auth/negotiate/$(DEPDIR)/$(am__dirstamp) +auth/negotiate/negotiateScheme.$(OBJEXT): \ + auth/negotiate/$(am__dirstamp) \ + auth/negotiate/$(DEPDIR)/$(am__dirstamp) squid$(EXEEXT): $(squid_OBJECTS) $(squid_DEPENDENCIES) @rm -f squid$(EXEEXT) $(CXXLINK) $(squid_LDFLAGS) $(squid_OBJECTS) $(squid_LDADD) $(LIBS) @@ -2076,6 +2087,7 @@ mostlyclean-compile: -rm -f DiskIO/WriteRequest.$(OBJEXT) -rm -f auth/basic/basicScheme.$(OBJEXT) -rm -f auth/digest/digestScheme.$(OBJEXT) + -rm -f auth/negotiate/negotiateScheme.$(OBJEXT) -rm -f auth/ntlm/ntlmScheme.$(OBJEXT) -rm -f fs/aufs/StoreFSaufs.$(OBJEXT) -rm -f fs/coss/StoreFScoss.$(OBJEXT) @@ -2329,6 +2341,7 @@ distclean-compile: @AMDEP_TRUE@@am__include@ @am__quote@DiskIO/DiskThreads/$(DEPDIR)/async_io.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@auth/basic/$(DEPDIR)/basicScheme.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@auth/digest/$(DEPDIR)/digestScheme.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@auth/negotiate/$(DEPDIR)/negotiateScheme.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@auth/ntlm/$(DEPDIR)/ntlmScheme.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@fs/aufs/$(DEPDIR)/StoreFSaufs.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@fs/coss/$(DEPDIR)/StoreFScoss.Po@am__quote@ @@ -2777,6 +2790,8 @@ distclean-generic: -rm -f auth/basic/$(am__dirstamp) -rm -f auth/digest/$(DEPDIR)/$(am__dirstamp) -rm -f auth/digest/$(am__dirstamp) + -rm -f auth/negotiate/$(DEPDIR)/$(am__dirstamp) + -rm -f auth/negotiate/$(am__dirstamp) -rm -f auth/ntlm/$(DEPDIR)/$(am__dirstamp) -rm -f auth/ntlm/$(am__dirstamp) -rm -f fs/aufs/$(DEPDIR)/$(am__dirstamp) @@ -2804,7 +2819,7 @@ clean-am: clean-binPROGRAMS clean-checkPROGRAMS clean-generic \ clean-noinstPROGRAMS clean-sbinPROGRAMS mostlyclean-am distclean: distclean-recursive - -rm -rf ../test-suite/$(DEPDIR) ./$(DEPDIR) DiskIO/$(DEPDIR) DiskIO/AIO/$(DEPDIR) DiskIO/Blocking/$(DEPDIR) DiskIO/DiskDaemon/$(DEPDIR) DiskIO/DiskThreads/$(DEPDIR) auth/basic/$(DEPDIR) auth/digest/$(DEPDIR) auth/ntlm/$(DEPDIR) fs/aufs/$(DEPDIR) fs/coss/$(DEPDIR) fs/diskd/$(DEPDIR) fs/null/$(DEPDIR) fs/ufs/$(DEPDIR) tests/$(DEPDIR) + -rm -rf ../test-suite/$(DEPDIR) ./$(DEPDIR) DiskIO/$(DEPDIR) DiskIO/AIO/$(DEPDIR) DiskIO/Blocking/$(DEPDIR) DiskIO/DiskDaemon/$(DEPDIR) DiskIO/DiskThreads/$(DEPDIR) auth/basic/$(DEPDIR) auth/digest/$(DEPDIR) auth/negotiate/$(DEPDIR) auth/ntlm/$(DEPDIR) fs/aufs/$(DEPDIR) fs/coss/$(DEPDIR) fs/diskd/$(DEPDIR) fs/null/$(DEPDIR) fs/ufs/$(DEPDIR) tests/$(DEPDIR) -rm -f Makefile distclean-am: clean-am distclean-compile distclean-generic \ distclean-libtool distclean-tags @@ -2831,7 +2846,7 @@ install-man: installcheck-am: maintainer-clean: maintainer-clean-recursive - -rm -rf ../test-suite/$(DEPDIR) ./$(DEPDIR) DiskIO/$(DEPDIR) DiskIO/AIO/$(DEPDIR) DiskIO/Blocking/$(DEPDIR) DiskIO/DiskDaemon/$(DEPDIR) DiskIO/DiskThreads/$(DEPDIR) auth/basic/$(DEPDIR) auth/digest/$(DEPDIR) auth/ntlm/$(DEPDIR) fs/aufs/$(DEPDIR) fs/coss/$(DEPDIR) fs/diskd/$(DEPDIR) fs/null/$(DEPDIR) fs/ufs/$(DEPDIR) tests/$(DEPDIR) + -rm -rf ../test-suite/$(DEPDIR) ./$(DEPDIR) DiskIO/$(DEPDIR) DiskIO/AIO/$(DEPDIR) DiskIO/Blocking/$(DEPDIR) DiskIO/DiskDaemon/$(DEPDIR) DiskIO/DiskThreads/$(DEPDIR) auth/basic/$(DEPDIR) auth/digest/$(DEPDIR) auth/negotiate/$(DEPDIR) auth/ntlm/$(DEPDIR) fs/aufs/$(DEPDIR) fs/coss/$(DEPDIR) fs/diskd/$(DEPDIR) fs/null/$(DEPDIR) fs/ufs/$(DEPDIR) tests/$(DEPDIR) -rm -f Makefile maintainer-clean-am: distclean-am maintainer-clean-generic diff --git a/src/auth/Makefile.in b/src/auth/Makefile.in index 1ed3c0fc18..76f76b4ff7 100644 --- a/src/auth/Makefile.in +++ b/src/auth/Makefile.in @@ -57,6 +57,11 @@ libdigest_a_AR = $(AR) $(ARFLAGS) libdigest_a_LIBADD = am_libdigest_a_OBJECTS = digest/auth_digest.$(OBJEXT) libdigest_a_OBJECTS = $(am_libdigest_a_OBJECTS) +libnegotiate_a_AR = $(AR) $(ARFLAGS) +libnegotiate_a_LIBADD = +am_libnegotiate_a_OBJECTS = negotiate/auth_negotiate.$(OBJEXT) \ + negotiate/negotiateScheme.$(OBJEXT) +libnegotiate_a_OBJECTS = $(am_libnegotiate_a_OBJECTS) libntlm_a_AR = $(AR) $(ARFLAGS) libntlm_a_LIBADD = am_libntlm_a_OBJECTS = ntlm/auth_ntlm.$(OBJEXT) @@ -81,9 +86,9 @@ CCLD = $(CC) LINK = $(LIBTOOL) --tag=CC --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ $(AM_LDFLAGS) $(LDFLAGS) -o $@ SOURCES = $(libbasic_a_SOURCES) $(libdigest_a_SOURCES) \ - $(libntlm_a_SOURCES) + $(libnegotiate_a_SOURCES) $(libntlm_a_SOURCES) DIST_SOURCES = $(libbasic_a_SOURCES) $(libdigest_a_SOURCES) \ - $(libntlm_a_SOURCES) + $(libnegotiate_a_SOURCES) $(libntlm_a_SOURCES) ETAGS = etags CTAGS = ctags DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) @@ -274,16 +279,17 @@ target_alias = @target_alias@ # Makefile for authentication modules in the Squid Object Cache server # -# $Id: Makefile.in,v 1.56 2005/10/17 00:11:35 hno Exp $ +# $Id: Makefile.in,v 1.57 2005/10/23 13:22:25 hno Exp $ # AUTOMAKE_OPTIONS = subdir-objects AM_CFLAGS = @SQUID_CFLAGS@ AM_CXXFLAGS = @SQUID_CXXFLAGS@ -EXTRA_LIBRARIES = libbasic.a libdigest.a libntlm.a +EXTRA_LIBRARIES = libbasic.a libdigest.a libntlm.a libnegotiate.a noinst_LIBRARIES = @AUTH_LIBS@ libbasic_a_SOURCES = basic/auth_basic.cc basic/auth_basic.h libdigest_a_SOURCES = digest/auth_digest.cc digest/auth_digest.h libntlm_a_SOURCES = ntlm/auth_ntlm.cc ntlm/auth_ntlm.h +libnegotiate_a_SOURCES = negotiate/auth_negotiate.cc negotiate/auth_negotiate.h negotiate/negotiateScheme.cc negotiate/negotiateScheme.h INCLUDES = -I. -I$(top_builddir)/include -I$(top_srcdir)/include \ -I$(top_srcdir)/src @@ -347,6 +353,20 @@ libdigest.a: $(libdigest_a_OBJECTS) $(libdigest_a_DEPENDENCIES) -rm -f libdigest.a $(libdigest_a_AR) libdigest.a $(libdigest_a_OBJECTS) $(libdigest_a_LIBADD) $(RANLIB) libdigest.a +negotiate/$(am__dirstamp): + @$(mkdir_p) negotiate + @: > negotiate/$(am__dirstamp) +negotiate/$(DEPDIR)/$(am__dirstamp): + @$(mkdir_p) negotiate/$(DEPDIR) + @: > negotiate/$(DEPDIR)/$(am__dirstamp) +negotiate/auth_negotiate.$(OBJEXT): negotiate/$(am__dirstamp) \ + negotiate/$(DEPDIR)/$(am__dirstamp) +negotiate/negotiateScheme.$(OBJEXT): negotiate/$(am__dirstamp) \ + negotiate/$(DEPDIR)/$(am__dirstamp) +libnegotiate.a: $(libnegotiate_a_OBJECTS) $(libnegotiate_a_DEPENDENCIES) + -rm -f libnegotiate.a + $(libnegotiate_a_AR) libnegotiate.a $(libnegotiate_a_OBJECTS) $(libnegotiate_a_LIBADD) + $(RANLIB) libnegotiate.a ntlm/$(am__dirstamp): @$(mkdir_p) ntlm @: > ntlm/$(am__dirstamp) @@ -364,6 +384,8 @@ mostlyclean-compile: -rm -f *.$(OBJEXT) -rm -f basic/auth_basic.$(OBJEXT) -rm -f digest/auth_digest.$(OBJEXT) + -rm -f negotiate/auth_negotiate.$(OBJEXT) + -rm -f negotiate/negotiateScheme.$(OBJEXT) -rm -f ntlm/auth_ntlm.$(OBJEXT) distclean-compile: @@ -371,6 +393,8 @@ distclean-compile: @AMDEP_TRUE@@am__include@ @am__quote@basic/$(DEPDIR)/auth_basic.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@digest/$(DEPDIR)/auth_digest.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@negotiate/$(DEPDIR)/auth_negotiate.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@negotiate/$(DEPDIR)/negotiateScheme.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@ntlm/$(DEPDIR)/auth_ntlm.Po@am__quote@ .cc.o: @@ -510,6 +534,8 @@ distclean-generic: -rm -f basic/$(am__dirstamp) -rm -f digest/$(DEPDIR)/$(am__dirstamp) -rm -f digest/$(am__dirstamp) + -rm -f negotiate/$(DEPDIR)/$(am__dirstamp) + -rm -f negotiate/$(am__dirstamp) -rm -f ntlm/$(DEPDIR)/$(am__dirstamp) -rm -f ntlm/$(am__dirstamp) @@ -522,7 +548,7 @@ clean-am: clean-generic clean-libtool clean-noinstLIBRARIES \ mostlyclean-am distclean: distclean-am - -rm -rf basic/$(DEPDIR) digest/$(DEPDIR) ntlm/$(DEPDIR) + -rm -rf basic/$(DEPDIR) digest/$(DEPDIR) negotiate/$(DEPDIR) ntlm/$(DEPDIR) -rm -f Makefile distclean-am: clean-am distclean-compile distclean-generic \ distclean-libtool distclean-tags @@ -548,7 +574,7 @@ install-man: installcheck-am: maintainer-clean: maintainer-clean-am - -rm -rf basic/$(DEPDIR) digest/$(DEPDIR) ntlm/$(DEPDIR) + -rm -rf basic/$(DEPDIR) digest/$(DEPDIR) negotiate/$(DEPDIR) ntlm/$(DEPDIR) -rm -f Makefile maintainer-clean-am: distclean-am maintainer-clean-generic