AC_ARG_ENABLE(external-acl-helpers,
AS_HELP_STRING([--enable-external-acl-helpers="list of helpers"],
- [Enable external_acl helpers support and thelpers themselves.
+ [Enable external_acl helpers support and the helpers themselves.
Default is to build all buildable helpers and enable support.
To disable support, use --disable-external-acl-helpers.
To build no helpers, specify "none".
- To see available helpers, see the helpers/external_acl
+ To see available helpers, see the src/acl/external/
directory]), [
#nothing to do, really
])
-m4_include([helpers/external_acl/modules.m4])
+m4_include([src/acl/external/helpers.m4])
dnl Select url_rewrite helpers to build
AC_ARG_ENABLE(url-rewrite-helpers,
doc/release-notes/Makefile
errors/Makefile
helpers/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/storeid_rewrite/Makefile
helpers/storeid_rewrite/file/Makefile
helpers/url_rewrite/Makefile
scripts/Makefile
src/Makefile
src/acl/Makefile
+ src/acl/external/Makefile
+ src/acl/external/AD_group/Makefile
+ src/acl/external/delayer/Makefile
+ src/acl/external/eDirectory_userip/Makefile
+ src/acl/external/file_userip/Makefile
+ src/acl/external/kerberos_ldap_group/Makefile
+ src/acl/external/LDAP_group/Makefile
+ src/acl/external/LM_group/Makefile
+ src/acl/external/session/Makefile
+ src/acl/external/SQL_session/Makefile
+ src/acl/external/unix_group/Makefile
+ src/acl/external/wbinfo_group/Makefile
+ src/acl/external/time_quota/Makefile
src/adaptation/Makefile
src/adaptation/icap/Makefile
src/adaptation/ecap/Makefile
EXTRA_DIST = defines.h
SUBDIRS = \
- external_acl \
url_rewrite \
storeid_rewrite
include $(top_srcdir)/src/Common.am
include $(top_srcdir)/src/TestHeaders.am
+SUBDIRS= external
+
noinst_LTLIBRARIES = libapi.la libstate.la libacls.la
## General data-independent ACL API
AclSizeLimit.h
## Add conditional sources
-## TODO: move these to their respectful dirs when those dirs are created
+## TODO: move these to their respective dirs when those dirs are created
EXTRA_libacls_la_SOURCES =
if ENABLE_SSL
libacls_la_SOURCES += $(SSL_ACLS)
endif
+EXTRA_libacls_la_SOURCES += $(SSL_ACLS)
-if USE_ADAPTATION
-libacls_la_SOURCES += AdaptationService.h \
+ADAPT_ACLS= \
+ AdaptationService.h \
AdaptationService.cc \
AdaptationServiceData.h \
AdaptationServiceData.cc
-endif
-
-
-EXTRA_libacls_la_SOURCES += $(SSL_ACLS)
+if USE_ADAPTATION
+libacls_la_SOURCES += $(ADAPT_ACLS)
+endif
+EXTRA_libacls_la_SOURCES += $(ADAPT_ACLS)
ARP_ACLS = Arp.cc Arp.h Eui64.cc Eui64.h
if USE_SQUID_EUI
libacls_la_SOURCES += $(ARP_ACLS)
endif
-
EXTRA_libacls_la_SOURCES += $(ARP_ACLS)
include $(top_srcdir)/src/Common.am
libexec_PROGRAMS = ext_ad_group_acl
-ext_ad_group_acl_SOURCES = ext_ad_group_acl.cc
man_MANS = ext_ad_group_acl.8
+ext_ad_group_acl_SOURCES = ext_ad_group_acl.cc
+
#
# Currently activeds and adsiid libraries are not available on MinGW or Cygwin,
# so the following library list is just a placeholder for future MinGW/Cygwin releases.
# This helper can be compiled only using Microsoft Visual Studio.
# TODO: test for these libraries in required.m4
#
-LDADD = \
+ext_ad_group_acl_LDADD = \
$(COMPAT_LIB) \
-lnetapi32 \
-ladvapi32 \
include $(top_srcdir)/src/Common.am
-libexec_PROGRAMS = ext_ldap_group_acl
-ext_ldap_group_acl_SOURCES = ext_ldap_group_acl.cc
+libexec_PROGRAMS= ext_ldap_group_acl
+man_MANS= ext_ldap_group_acl.8
-man_MANS = ext_ldap_group_acl.8
-EXTRA_DIST = ext_ldap_group_acl.8 required.m4
-
-LDADD = \
+ext_ldap_group_acl_SOURCES= \
+ ext_ldap_group_acl.cc
+ext_ldap_group_acl_LDADD= \
$(top_builddir)/lib/libmiscencoding.la \
$(COMPAT_LIB) \
$(LDAPLIB) \
$(LBERLIB) \
$(XTRA_LIBS)
+
+EXTRA_DIST= \
+ ext_ldap_group_acl.8 \
+ required.m4
include $(top_srcdir)/src/Common.am
-libexec_PROGRAMS = ext_lm_group_acl
-ext_lm_group_acl_SOURCES = ext_lm_group_acl.cc
+libexec_PROGRAMS= ext_lm_group_acl
+man_MANS= ext_lm_group_acl.8
-LDADD = \
+ext_lm_group_acl_SOURCES= ext_lm_group_acl.cc
+ext_lm_group_acl_LDADD= \
$(top_builddir)/lib/libmiscencoding.la \
$(COMPAT_LIB) \
-lnetapi32 \
-lntdll \
$(XTRA_LIBS)
-man_MANS = ext_lm_group_acl.8
-
-EXTRA_DIST = required.m4 ext_lm_group_acl.8
+EXTRA_DIST= \
+ required.m4 \
+ ext_lm_group_acl.8
include $(top_srcdir)/src/Common.am
libexec_PROGRAMS = ext_file_userip_acl
-ext_file_userip_acl_SOURCES = ext_file_userip_acl.cc
man_MANS = ext_file_userip_acl.8
+ext_file_userip_acl_SOURCES= \
+ ext_file_userip_acl.cc
+ext_file_userip_acl_LDADD= \
+ $(top_builddir)/lib/libmiscencoding.la \
+ $(COMPAT_LIB) \
+ $(XTRA_LIBS)
+
EXTRA_DIST = \
example.conf \
example-deny_all_but.conf \
ext_file_userip_acl.8 \
required.m4
-
-LDADD = \
- $(top_builddir)/lib/libmiscencoding.la \
- $(COMPAT_LIB) \
- $(XTRA_LIBS)
#define list of modules to build
auto_ext_acl_modules=no
if test "x${enable_external_acl_helpers:=yes}" = "xyes" ;then
- SQUID_LOOK_FOR_MODULES([$srcdir/helpers/external_acl],[enable_external_acl_helpers])
+ SQUID_LOOK_FOR_MODULES([$srcdir/src/acl/external],[enable_external_acl_helpers])
auto_ext_acl_modules=yes
fi
if test "x$enable_external_acl_helpers" = "xnone" ; then
enable_external_acl_helpers="`echo $enable_external_acl_helpers| sed -e 's/,/ /g;s/ */ /g'`"
if test "x$enable_external_acl_helpers" != "xno" ; then
for helper in $enable_external_acl_helpers ; do
- dir="$srcdir/helpers/external_acl/$helper"
+ dir="$srcdir/src/acl/external/$helper"
# modules converted to autoconf macros already
# NP: we only need this list because m4_include() does not accept variables
if test "x$helper" = "xAD_group" ; then
- m4_include([helpers/external_acl/AD_group/required.m4])
+ m4_include([src/acl/external/AD_group/required.m4])
elif test "x$helper" = "xLDAP_group" ; then
- m4_include([helpers/external_acl/LDAP_group/required.m4])
+ m4_include([src/acl/external/LDAP_group/required.m4])
elif test "x$helper" = "xLM_group" ; then
- m4_include([helpers/external_acl/LM_group/required.m4])
+ m4_include([src/acl/external/LM_group/required.m4])
elif test "x$helper" = "xdelayer" ; then
- m4_include([helpers/external_acl/delayer/required.m4])
+ m4_include([src/acl/external/delayer/required.m4])
elif test "x$helper" = "xSQL_session" ; then
- m4_include([helpers/external_acl/SQL_session/required.m4])
+ m4_include([src/acl/external/SQL_session/required.m4])
elif test "x$helper" = "xeDirectory_userip" ; then
- m4_include([helpers/external_acl/eDirectory_userip/required.m4])
+ m4_include([src/acl/external/eDirectory_userip/required.m4])
elif test "x$helper" = "xfile_userip" ; then
- m4_include([helpers/external_acl/file_userip/required.m4])
+ m4_include([src/acl/external/file_userip/required.m4])
elif test "x$helper" = "xkerberos_ldap_group" ; then
- m4_include([helpers/external_acl/kerberos_ldap_group/required.m4])
+ m4_include([src/acl/external/kerberos_ldap_group/required.m4])
elif test "x$helper" = "xsession" ; then
- m4_include([helpers/external_acl/session/required.m4])
+ m4_include([src/acl/external/session/required.m4])
elif test "x$helper" = "xtime_quota" ; then
- m4_include([helpers/external_acl/time_quota/required.m4])
+ m4_include([src/acl/external/time_quota/required.m4])
elif test "x$helper" = "xunix_group" ; then
- m4_include([helpers/external_acl/unix_group/required.m4])
+ m4_include([src/acl/external/unix_group/required.m4])
elif test "x$helper" = "xwbinfo_group" ; then
- m4_include([helpers/external_acl/wbinfo_group/required.m4])
+ m4_include([src/acl/external/wbinfo_group/required.m4])
# modules not yet converted to autoconf macros (or third party drop-in's)
elif test -f "$dir/config.test" && sh "$dir/config.test" "$squid_host_os"; then
BUILD_HELPER="$helper"
fi
- if test -d "$srcdir/helpers/external_acl/$helper"; then
+ if test -d "$srcdir/src/acl/external/$helper"; then
if test "$BUILD_HELPER" != "$helper"; then
if test "x$auto_ext_acl_modules" = "xyes"; then
AC_MSG_NOTICE([external acl helper $helper ... found but cannot be built])
include $(top_srcdir)/src/Common.am
-EXTRA_DIST = README required.m4 cert_tool ext_kerberos_ldap_group_acl.8
-SUBDIRS =
+EXTRA_DIST= \
+ cert_tool \
+ ext_kerberos_ldap_group_acl.8 \
+ README \
+ required.m4
AM_CPPFLAGS += -I$(srcdir)
include $(top_srcdir)/src/Common.am
-libexec_PROGRAMS = ext_session_acl
-man_MANS = ext_session_acl.8
-EXTRA_DIST = ext_session_acl.8 required.m4
-ext_session_acl_SOURCES = ext_session_acl.cc
+libexec_PROGRAMS= ext_session_acl
+man_MANS= ext_session_acl.8
-LDADD = \
+ext_session_acl_SOURCES= \
+ ext_session_acl.cc
+ext_session_acl_LDADD = \
$(COMPAT_LIB) \
$(LIB_DB)
+
+EXTRA_DIST= ext_session_acl.8 required.m4
include $(top_srcdir)/src/Common.am
-libexec_PROGRAMS = ext_time_quota_acl
-man_MANS = ext_time_quota_acl.8
-EXTRA_DIST = ext_time_quota_acl.8 required.m4
-ext_time_quota_acl_SOURCES = ext_time_quota_acl.cc
+libexec_PROGRAMS= ext_time_quota_acl
+man_MANS= ext_time_quota_acl.8
-DEFS += -DDEFAULT_QUOTA_DB=\"$(localstatedir)/ext_time_quota.db\"
+DEFS += -DDEFAULT_QUOTA_DB=\"$(localstatedir)/ext_time_quota.db\"
-LDADD = \
+ext_time_quota_acl_SOURCES= \
+ ext_time_quota_acl.cc
+ext_time_quota_acl_LDADD = \
$(COMPAT_LIB) \
$(LIB_DB)
+
+EXTRA_DIST= ext_time_quota_acl.8 required.m4
libexec_PROGRAMS = ext_unix_group_acl
man_MANS = ext_unix_group_acl.8
EXTRA_DIST = ext_unix_group_acl.8 required.m4
-ext_unix_group_acl_SOURCES = check_group.cc
-LDADD = \
+ext_unix_group_acl_SOURCES= \
+ check_group.cc
+ext_unix_group_acl_LDADD= \
$(top_builddir)/lib/libmiscencoding.la \
$(COMPAT_LIB) \
$(XTRA_LIBS)
projects / thirdparty / squid.git / commitdiff
