From: hno <> Date: Thu, 29 Dec 2005 09:20:17 +0000 (+0000) Subject: Bootstrapped X-Git-Tag: SQUID_3_0_PRE4~418 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=2ea126b201dafab6904b222ff5c3ef9011a4ac4a;p=thirdparty%2Fsquid.git Bootstrapped --- diff --git a/configure b/configure index 7689680b7c..c76d1a8f10 100755 --- a/configure +++ b/configure @@ -1,5 +1,5 @@ #! /bin/sh -# From configure.in Revision: 1.393 . +# From configure.in Revision: 1.394 . # Guess values for system-dependent variables and create Makefiles. # Generated by GNU Autoconf 2.59. # @@ -35179,7 +35179,7 @@ fi rm -f core - ac_config_files="$ac_config_files Makefile lib/Makefile scripts/Makefile scripts/RunCache scripts/RunAccel src/Makefile src/fs/Makefile src/repl/Makefile src/auth/Makefile src/ICAP/Makefile contrib/Makefile snmplib/Makefile icons/Makefile errors/Makefile test-suite/Makefile doc/Makefile helpers/Makefile helpers/basic_auth/Makefile helpers/basic_auth/LDAP/Makefile helpers/basic_auth/MSNT/Makefile helpers/basic_auth/NCSA/Makefile helpers/basic_auth/PAM/Makefile helpers/basic_auth/SMB/Makefile helpers/basic_auth/mswin_sspi/Makefile helpers/basic_auth/YP/Makefile helpers/basic_auth/getpwnam/Makefile helpers/basic_auth/multi-domain-NTLM/Makefile helpers/basic_auth/SASL/Makefile helpers/digest_auth/Makefile helpers/digest_auth/password/Makefile helpers/ntlm_auth/Makefile helpers/ntlm_auth/fakeauth/Makefile helpers/ntlm_auth/no_check/Makefile helpers/ntlm_auth/SMB/Makefile helpers/ntlm_auth/SMB/smbval/Makefile helpers/ntlm_auth/mswin_sspi/Makefile helpers/negotiate_auth/Makefile helpers/negotiate_auth/mswin_sspi/Makefile helpers/external_acl/Makefile helpers/external_acl/ip_user/Makefile helpers/external_acl/ldap_group/Makefile helpers/external_acl/unix_group/Makefile helpers/external_acl/wbinfo_group/Makefile helpers/external_acl/mswin_lm_group/Makefile" + ac_config_files="$ac_config_files Makefile lib/Makefile scripts/Makefile scripts/RunCache scripts/RunAccel src/Makefile src/fs/Makefile src/repl/Makefile src/auth/Makefile src/ICAP/Makefile contrib/Makefile snmplib/Makefile icons/Makefile errors/Makefile test-suite/Makefile doc/Makefile helpers/Makefile helpers/basic_auth/Makefile helpers/basic_auth/LDAP/Makefile helpers/basic_auth/MSNT/Makefile helpers/basic_auth/NCSA/Makefile helpers/basic_auth/PAM/Makefile helpers/basic_auth/SMB/Makefile helpers/basic_auth/mswin_sspi/Makefile helpers/basic_auth/YP/Makefile helpers/basic_auth/getpwnam/Makefile helpers/basic_auth/multi-domain-NTLM/Makefile helpers/basic_auth/SASL/Makefile helpers/digest_auth/Makefile helpers/digest_auth/password/Makefile helpers/digest_auth/ldap/Makefile helpers/ntlm_auth/Makefile helpers/ntlm_auth/fakeauth/Makefile helpers/ntlm_auth/no_check/Makefile helpers/ntlm_auth/SMB/Makefile helpers/ntlm_auth/SMB/smbval/Makefile helpers/ntlm_auth/mswin_sspi/Makefile helpers/negotiate_auth/Makefile helpers/negotiate_auth/mswin_sspi/Makefile helpers/external_acl/Makefile helpers/external_acl/ip_user/Makefile helpers/external_acl/ldap_group/Makefile helpers/external_acl/unix_group/Makefile helpers/external_acl/wbinfo_group/Makefile helpers/external_acl/mswin_lm_group/Makefile" @@ -36015,6 +36015,7 @@ do "helpers/basic_auth/SASL/Makefile" ) CONFIG_FILES="$CONFIG_FILES helpers/basic_auth/SASL/Makefile" ;; "helpers/digest_auth/Makefile" ) CONFIG_FILES="$CONFIG_FILES helpers/digest_auth/Makefile" ;; "helpers/digest_auth/password/Makefile" ) CONFIG_FILES="$CONFIG_FILES helpers/digest_auth/password/Makefile" ;; + "helpers/digest_auth/ldap/Makefile" ) CONFIG_FILES="$CONFIG_FILES helpers/digest_auth/ldap/Makefile" ;; "helpers/ntlm_auth/Makefile" ) CONFIG_FILES="$CONFIG_FILES helpers/ntlm_auth/Makefile" ;; "helpers/ntlm_auth/fakeauth/Makefile" ) CONFIG_FILES="$CONFIG_FILES helpers/ntlm_auth/fakeauth/Makefile" ;; "helpers/ntlm_auth/no_check/Makefile" ) CONFIG_FILES="$CONFIG_FILES helpers/ntlm_auth/no_check/Makefile" ;; diff --git a/helpers/digest_auth/Makefile.in b/helpers/digest_auth/Makefile.in index 316028d282..20c950b632 100644 --- a/helpers/digest_auth/Makefile.in +++ b/helpers/digest_auth/Makefile.in @@ -16,7 +16,7 @@ # Makefile for digest auth helpers in the Squid Object Cache server # -# $Id: Makefile.in,v 1.57 2005/11/21 23:55:12 wessels Exp $ +# $Id: Makefile.in,v 1.58 2005/12/29 02:22:27 hno Exp $ # srcdir = @srcdir@ top_srcdir = @top_srcdir@ @@ -249,7 +249,7 @@ sharedstatedir = @sharedstatedir@ subdirs = @subdirs@ sysconfdir = @sysconfdir@ target_alias = @target_alias@ -DIST_SUBDIRS = password +DIST_SUBDIRS = password ldap SUBDIRS = @DIGEST_AUTH_HELPERS@ all: all-recursive diff --git a/helpers/digest_auth/ldap/Makefile.in b/helpers/digest_auth/ldap/Makefile.in index 8177a39e53..dc42218f8b 100644 --- a/helpers/digest_auth/ldap/Makefile.in +++ b/helpers/digest_auth/ldap/Makefile.in @@ -17,7 +17,7 @@ # # Makefile for the Squid Object Cache server # -# $Id: Makefile.in,v 1.1 2005/12/29 02:11:00 hno Exp $ +# $Id: Makefile.in,v 1.2 2005/12/29 02:22:27 hno Exp $ # # Uncomment and customize the following to suit your needs: # @@ -44,8 +44,8 @@ PRE_UNINSTALL = : POST_UNINSTALL = : build_triplet = @build@ host_triplet = @host@ -libexec_PROGRAMS = digest_pw_auth$(EXEEXT) -subdir = helpers/digest_auth/password +libexec_PROGRAMS = digest_ldap_auth$(EXEEXT) +subdir = helpers/digest_auth/ldap DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \ @@ -58,12 +58,11 @@ CONFIG_CLEAN_FILES = am__installdirs = "$(DESTDIR)$(libexecdir)" libexecPROGRAMS_INSTALL = $(INSTALL_PROGRAM) PROGRAMS = $(libexec_PROGRAMS) -am_digest_pw_auth_OBJECTS = digest_pw_auth.$(OBJEXT) \ - text_backend.$(OBJEXT) ldap_backend.$(OBJEXT) -digest_pw_auth_OBJECTS = $(am_digest_pw_auth_OBJECTS) -digest_pw_auth_LDADD = $(LDADD) +digest_ldap_auth_SOURCES = digest_ldap_auth.c +digest_ldap_auth_OBJECTS = digest_ldap_auth.$(OBJEXT) +digest_ldap_auth_LDADD = $(LDADD) am__DEPENDENCIES_1 = -digest_pw_auth_DEPENDENCIES = $(am__DEPENDENCIES_1) \ +digest_ldap_auth_DEPENDENCIES = $(am__DEPENDENCIES_1) \ $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \ $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)/include @@ -77,8 +76,8 @@ LTCOMPILE = $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) \ CCLD = $(CC) LINK = $(LIBTOOL) --tag=CC --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ $(AM_LDFLAGS) $(LDFLAGS) -o $@ -SOURCES = $(digest_pw_auth_SOURCES) -DIST_SOURCES = $(digest_pw_auth_SOURCES) +SOURCES = digest_ldap_auth.c +DIST_SOURCES = digest_ldap_auth.c ETAGS = etags CTAGS = ctags DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) @@ -272,8 +271,6 @@ sysconfdir = @sysconfdir@ target_alias = @target_alias@ digest_pw_auth_SOURCES = digest_pw_auth.c \ digest_common.h \ - text_backend.c \ - text_backend.h \ ldap_backend.c \ ldap_backend.h @@ -294,9 +291,9 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__confi exit 1;; \ esac; \ done; \ - echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign helpers/digest_auth/password/Makefile'; \ + echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign helpers/digest_auth/ldap/Makefile'; \ cd $(top_srcdir) && \ - $(AUTOMAKE) --foreign helpers/digest_auth/password/Makefile + $(AUTOMAKE) --foreign helpers/digest_auth/ldap/Makefile .PRECIOUS: Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @case '$?' in \ @@ -342,9 +339,9 @@ clean-libexecPROGRAMS: echo " rm -f $$p $$f"; \ rm -f $$p $$f ; \ done -digest_pw_auth$(EXEEXT): $(digest_pw_auth_OBJECTS) $(digest_pw_auth_DEPENDENCIES) - @rm -f digest_pw_auth$(EXEEXT) - $(LINK) $(digest_pw_auth_LDFLAGS) $(digest_pw_auth_OBJECTS) $(digest_pw_auth_LDADD) $(LIBS) +digest_ldap_auth$(EXEEXT): $(digest_ldap_auth_OBJECTS) $(digest_ldap_auth_DEPENDENCIES) + @rm -f digest_ldap_auth$(EXEEXT) + $(LINK) $(digest_ldap_auth_LDFLAGS) $(digest_ldap_auth_OBJECTS) $(digest_ldap_auth_LDADD) $(LIBS) mostlyclean-compile: -rm -f *.$(OBJEXT) @@ -352,9 +349,7 @@ mostlyclean-compile: distclean-compile: -rm -f *.tab.c -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/digest_pw_auth.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ldap_backend.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/text_backend.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/digest_ldap_auth.Po@am__quote@ .c.o: @am__fastdepCC_TRUE@ if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \ diff --git a/helpers/digest_auth/password/Makefile.in b/helpers/digest_auth/password/Makefile.in index d3ea4f559f..2142b47e40 100644 --- a/helpers/digest_auth/password/Makefile.in +++ b/helpers/digest_auth/password/Makefile.in @@ -17,7 +17,7 @@ # # Makefile for the Squid Object Cache server # -# $Id: Makefile.in,v 1.61 2005/11/21 23:55:14 wessels Exp $ +# $Id: Makefile.in,v 1.62 2005/12/29 02:20:17 hno Exp $ # # Uncomment and customize the following to suit your needs: # @@ -59,7 +59,7 @@ am__installdirs = "$(DESTDIR)$(libexecdir)" libexecPROGRAMS_INSTALL = $(INSTALL_PROGRAM) PROGRAMS = $(libexec_PROGRAMS) am_digest_pw_auth_OBJECTS = digest_pw_auth.$(OBJEXT) \ - text_backend.$(OBJEXT) ldap_backend.$(OBJEXT) + text_backend.$(OBJEXT) digest_pw_auth_OBJECTS = $(am_digest_pw_auth_OBJECTS) digest_pw_auth_LDADD = $(LDADD) am__DEPENDENCIES_1 = @@ -273,9 +273,7 @@ target_alias = @target_alias@ digest_pw_auth_SOURCES = digest_pw_auth.c \ digest_common.h \ text_backend.c \ - text_backend.h \ - ldap_backend.c \ - ldap_backend.h + text_backend.h INCLUDES = -I. -I$(top_builddir)/include -I$(top_srcdir)/include \ -I$(top_srcdir)/src/ @@ -353,7 +351,6 @@ distclean-compile: -rm -f *.tab.c @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/digest_pw_auth.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ldap_backend.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/text_backend.Po@am__quote@ .c.o: