|
 |
643dd3 |
diff --git a/configure b/configure
|
|
|
643dd3 |
index 752a86d..fa0f0e3 100755
|
|
|
643dd3 |
--- a/configure
|
|
|
643dd3 |
+++ b/configure
|
|
|
643dd3 |
@@ -40311,7 +40311,7 @@ $as_echo "$as_me: BUILD Tools C++ FLAGS: $BUILDCXXFLAGS" >&6;}
|
|
|
643dd3 |
|
|
|
643dd3 |
rm -f core
|
|
|
643dd3 |
|
|
|
643dd3 |
-ac_config_files="$ac_config_files Makefile compat/Makefile lib/Makefile lib/ntlmauth/Makefile lib/libTrie/Makefile lib/libTrie/test/Makefile lib/profiler/Makefile lib/rfcnb/Makefile lib/smblib/Makefile lib/snmplib/Makefile scripts/Makefile src/Makefile src/anyp/Makefile src/ftp/Makefile src/base/Makefile src/acl/Makefile src/clients/Makefile src/servers/Makefile src/fs/Makefile src/repl/Makefile src/auth/Makefile src/auth/basic/Makefile src/auth/digest/Makefile src/auth/negotiate/Makefile src/auth/ntlm/Makefile src/adaptation/Makefile src/adaptation/icap/Makefile src/adaptation/ecap/Makefile src/comm/Makefile src/esi/Makefile src/eui/Makefile src/format/Makefile src/helper/Makefile src/http/Makefile src/icmp/Makefile src/ident/Makefile src/ip/Makefile src/log/Makefile src/ipc/Makefile src/ssl/Makefile src/mgr/Makefile src/parser/Makefile src/snmp/Makefile contrib/Makefile icons/Makefile errors/Makefile test-suite/Makefile doc/Makefile doc/manuals/Makefile doc/release-notes/Makefile helpers/Makefile helpers/basic_auth/Makefile helpers/basic_auth/DB/Makefile helpers/basic_auth/fake/Makefile helpers/basic_auth/getpwnam/Makefile helpers/basic_auth/LDAP/Makefile helpers/basic_auth/MSNT-multi-domain/Makefile helpers/basic_auth/NCSA/Makefile helpers/basic_auth/NIS/Makefile helpers/basic_auth/PAM/Makefile helpers/basic_auth/POP3/Makefile helpers/basic_auth/RADIUS/Makefile helpers/basic_auth/SASL/Makefile helpers/basic_auth/SMB/Makefile helpers/basic_auth/SMB_LM/Makefile helpers/basic_auth/SSPI/Makefile helpers/digest_auth/Makefile helpers/digest_auth/eDirectory/Makefile helpers/digest_auth/file/Makefile helpers/digest_auth/LDAP/Makefile helpers/ntlm_auth/Makefile helpers/ntlm_auth/fake/Makefile helpers/ntlm_auth/smb_lm/Makefile helpers/ntlm_auth/SSPI/Makefile helpers/negotiate_auth/Makefile helpers/negotiate_auth/kerberos/Makefile helpers/negotiate_auth/SSPI/Makefile helpers/negotiate_auth/wrapper/Makefile helpers/external_acl/Makefile helpers/external_acl/AD_group/Makefile helpers/external_acl/delayer/Makefile helpers/external_acl/eDirectory_userip/Makefile helpers/external_acl/file_userip/Makefile helpers/external_acl/kerberos_ldap_group/Makefile helpers/external_acl/LDAP_group/Makefile helpers/external_acl/LM_group/Makefile helpers/external_acl/session/Makefile helpers/external_acl/SQL_session/Makefile helpers/external_acl/unix_group/Makefile helpers/external_acl/wbinfo_group/Makefile helpers/external_acl/time_quota/Makefile helpers/log_daemon/Makefile helpers/log_daemon/DB/Makefile helpers/log_daemon/file/Makefile helpers/url_rewrite/Makefile helpers/url_rewrite/fake/Makefile helpers/ssl/Makefile helpers/storeid_rewrite/Makefile helpers/storeid_rewrite/file/Makefile tools/Makefile tools/purge/Makefile tools/squidclient/Makefile tools/systemd/Makefile tools/sysvinit/Makefile"
|
|
|
643dd3 |
+ac_config_files="$ac_config_files Makefile compat/Makefile lib/Makefile lib/ntlmauth/Makefile lib/libTrie/Makefile lib/libTrie/test/Makefile lib/profiler/Makefile lib/rfcnb/Makefile lib/smblib/Makefile lib/snmplib/Makefile scripts/Makefile src/Makefile src/anyp/Makefile src/ftp/Makefile src/base/Makefile src/acl/Makefile src/clients/Makefile src/servers/Makefile src/fs/Makefile src/repl/Makefile src/auth/Makefile src/auth/basic/Makefile src/auth/digest/Makefile src/auth/negotiate/Makefile src/auth/ntlm/Makefile src/adaptation/Makefile src/adaptation/icap/Makefile src/adaptation/ecap/Makefile src/comm/Makefile src/esi/Makefile src/eui/Makefile src/format/Makefile src/helper/Makefile src/http/Makefile src/icmp/Makefile src/ident/Makefile src/ip/Makefile src/log/Makefile src/ipc/Makefile src/ssl/Makefile src/mgr/Makefile src/parser/Makefile src/snmp/Makefile contrib/Makefile icons/Makefile errors/Makefile test-suite/Makefile doc/Makefile doc/manuals/Makefile doc/release-notes/Makefile helpers/Makefile helpers/basic_auth/Makefile helpers/basic_auth/DB/Makefile helpers/basic_auth/fake/Makefile helpers/basic_auth/getpwnam/Makefile helpers/basic_auth/LDAP/Makefile helpers/basic_auth/MSNT-multi-domain/Makefile helpers/basic_auth/NCSA/Makefile helpers/basic_auth/NIS/Makefile helpers/basic_auth/PAM/Makefile helpers/basic_auth/POP3/Makefile helpers/basic_auth/RADIUS/Makefile helpers/basic_auth/SASL/Makefile helpers/basic_auth/SMB/Makefile helpers/basic_auth/SMB_LM/Makefile helpers/basic_auth/SSPI/Makefile helpers/digest_auth/Makefile helpers/digest_auth/eDirectory/Makefile helpers/digest_auth/file/Makefile helpers/digest_auth/LDAP/Makefile helpers/ntlm_auth/Makefile helpers/ntlm_auth/fake/Makefile helpers/ntlm_auth/smb_lm/Makefile helpers/ntlm_auth/SSPI/Makefile helpers/negotiate_auth/Makefile helpers/negotiate_auth/kerberos/Makefile helpers/negotiate_auth/SSPI/Makefile helpers/negotiate_auth/wrapper/Makefile helpers/external_acl/Makefile helpers/external_acl/AD_group/Makefile helpers/external_acl/delayer/Makefile helpers/external_acl/eDirectory_userip/Makefile helpers/external_acl/file_userip/Makefile helpers/external_acl/kerberos_ldap_group/Makefile helpers/external_acl/LDAP_group/Makefile helpers/external_acl/LM_group/Makefile helpers/external_acl/session/Makefile helpers/external_acl/SQL_session/Makefile helpers/external_acl/unix_group/Makefile helpers/external_acl/wbinfo_group/Makefile helpers/external_acl/time_quota/Makefile helpers/log_daemon/Makefile helpers/log_daemon/DB/Makefile helpers/log_daemon/file/Makefile helpers/url_rewrite/Makefile helpers/url_rewrite/fake/Makefile helpers/storeid_rewrite/Makefile helpers/storeid_rewrite/file/Makefile tools/Makefile tools/purge/Makefile tools/squidclient/Makefile tools/systemd/Makefile tools/sysvinit/Makefile"
|
|
|
643dd3 |
|
|
|
643dd3 |
|
|
|
643dd3 |
# must configure libltdl subdir unconditionally for "make distcheck" to work
|
|
|
643dd3 |
@@ -41710,7 +41710,6 @@ do
|
|
|
643dd3 |
"helpers/log_daemon/file/Makefile") CONFIG_FILES="$CONFIG_FILES helpers/log_daemon/file/Makefile" ;;
|
|
|
643dd3 |
"helpers/url_rewrite/Makefile") CONFIG_FILES="$CONFIG_FILES helpers/url_rewrite/Makefile" ;;
|
|
|
643dd3 |
"helpers/url_rewrite/fake/Makefile") CONFIG_FILES="$CONFIG_FILES helpers/url_rewrite/fake/Makefile" ;;
|
|
|
643dd3 |
- "helpers/ssl/Makefile") CONFIG_FILES="$CONFIG_FILES helpers/ssl/Makefile" ;;
|
|
|
643dd3 |
"helpers/storeid_rewrite/Makefile") CONFIG_FILES="$CONFIG_FILES helpers/storeid_rewrite/Makefile" ;;
|
|
|
643dd3 |
"helpers/storeid_rewrite/file/Makefile") CONFIG_FILES="$CONFIG_FILES helpers/storeid_rewrite/file/Makefile" ;;
|
|
|
643dd3 |
"tools/Makefile") CONFIG_FILES="$CONFIG_FILES tools/Makefile" ;;
|
|
|
643dd3 |
diff --git a/configure.ac b/configure.ac
|
|
|
643dd3 |
index 6054369..0728672 100644
|
|
|
643dd3 |
--- a/configure.ac
|
|
|
643dd3 |
+++ b/configure.ac
|
|
|
643dd3 |
@@ -3885,7 +3885,6 @@ AC_CONFIG_FILES([
|
|
|
643dd3 |
helpers/log_daemon/file/Makefile
|
|
|
643dd3 |
helpers/url_rewrite/Makefile
|
|
|
643dd3 |
helpers/url_rewrite/fake/Makefile
|
|
|
643dd3 |
- helpers/ssl/Makefile
|
|
|
643dd3 |
helpers/storeid_rewrite/Makefile
|
|
|
643dd3 |
helpers/storeid_rewrite/file/Makefile
|
|
|
643dd3 |
tools/Makefile
|
|
|
643dd3 |
diff --git a/helpers/Makefile.am b/helpers/Makefile.am
|
|
|
643dd3 |
index 043ec10..d835535 100644
|
|
|
643dd3 |
--- a/helpers/Makefile.am
|
|
|
643dd3 |
+++ b/helpers/Makefile.am
|
|
|
643dd3 |
@@ -15,7 +15,6 @@ DIST_SUBDIRS = \
|
|
|
643dd3 |
negotiate_auth \
|
|
|
643dd3 |
ntlm_auth \
|
|
|
643dd3 |
url_rewrite \
|
|
|
643dd3 |
- ssl \
|
|
|
643dd3 |
storeid_rewrite
|
|
|
643dd3 |
|
|
|
643dd3 |
SUBDIRS = \
|
|
|
643dd3 |
@@ -31,7 +30,4 @@ if ENABLE_AUTH_NTLM
|
|
|
643dd3 |
SUBDIRS += ntlm_auth
|
|
|
643dd3 |
endif
|
|
|
643dd3 |
|
|
|
643dd3 |
-if ENABLE_SSL
|
|
|
643dd3 |
-SUBDIRS += ssl
|
|
|
643dd3 |
-endif
|
|
|
643dd3 |
|
|
|
643dd3 |
diff --git a/helpers/Makefile.in b/helpers/Makefile.in
|
|
|
643dd3 |
index cf47dd2..9c53427 100644
|
|
|
643dd3 |
--- a/helpers/Makefile.in
|
|
|
643dd3 |
+++ b/helpers/Makefile.in
|
|
|
643dd3 |
@@ -88,7 +88,6 @@ POST_UNINSTALL = :
|
|
|
643dd3 |
build_triplet = @build@
|
|
|
643dd3 |
host_triplet = @host@
|
|
|
643dd3 |
@ENABLE_AUTH_NTLM_TRUE@am__append_1 = ntlm_auth
|
|
|
643dd3 |
-@ENABLE_SSL_TRUE@am__append_2 = ssl
|
|
|
643dd3 |
subdir = helpers
|
|
|
643dd3 |
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
|
|
|
643dd3 |
am__aclocal_m4_deps = $(top_srcdir)/acinclude/ax_with_prog.m4 \
|
|
|
643dd3 |
@@ -473,7 +472,6 @@ DIST_SUBDIRS = \
|
|
|
643dd3 |
negotiate_auth \
|
|
|
643dd3 |
ntlm_auth \
|
|
|
643dd3 |
url_rewrite \
|
|
|
643dd3 |
- ssl \
|
|
|
643dd3 |
storeid_rewrite
|
|
|
643dd3 |
|
|
|
643dd3 |
SUBDIRS = basic_auth digest_auth external_acl log_daemon \
|