From: Amos Jeffries Date: Sat, 30 Jan 2016 05:13:24 +0000 (+1300) Subject: SourceLayout: move external ACL helpers to src/acl/external/ X-Git-Tag: SQUID_4_0_5~16^2~5 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=e046643f71a9cea639e808947e25f14c0ecbbb62;p=thirdparty%2Fsquid.git SourceLayout: move external ACL helpers to src/acl/external/ --- diff --git a/configure.ac b/configure.ac index 4aca152c4a..ab5c0fdefd 100644 --- a/configure.ac +++ b/configure.ac @@ -2564,15 +2564,15 @@ m4_include([src/log/helpers.m4]) 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, @@ -3797,19 +3797,6 @@ AC_CONFIG_FILES([ 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 @@ -3827,6 +3814,19 @@ AC_CONFIG_FILES([ 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 diff --git a/helpers/Makefile.am b/helpers/Makefile.am index fbd7cd7366..c458745af5 100644 --- a/helpers/Makefile.am +++ b/helpers/Makefile.am @@ -8,6 +8,5 @@ EXTRA_DIST = defines.h SUBDIRS = \ - external_acl \ url_rewrite \ storeid_rewrite diff --git a/src/acl/Makefile.am b/src/acl/Makefile.am index 0f6b6c7a97..de625ad742 100644 --- a/src/acl/Makefile.am +++ b/src/acl/Makefile.am @@ -8,6 +8,8 @@ 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 @@ -142,7 +144,7 @@ libacls_la_SOURCES = \ 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 = @@ -167,22 +169,22 @@ SSL_ACLS = \ 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) diff --git a/helpers/external_acl/AD_group/Makefile.am b/src/acl/external/AD_group/Makefile.am similarity index 96% rename from helpers/external_acl/AD_group/Makefile.am rename to src/acl/external/AD_group/Makefile.am index 04823b6bad..b2b19db649 100644 --- a/helpers/external_acl/AD_group/Makefile.am +++ b/src/acl/external/AD_group/Makefile.am @@ -8,16 +8,17 @@ 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 \ diff --git a/helpers/external_acl/AD_group/ext_ad_group_acl.8 b/src/acl/external/AD_group/ext_ad_group_acl.8 similarity index 100% rename from helpers/external_acl/AD_group/ext_ad_group_acl.8 rename to src/acl/external/AD_group/ext_ad_group_acl.8 diff --git a/helpers/external_acl/AD_group/ext_ad_group_acl.cc b/src/acl/external/AD_group/ext_ad_group_acl.cc similarity index 100% rename from helpers/external_acl/AD_group/ext_ad_group_acl.cc rename to src/acl/external/AD_group/ext_ad_group_acl.cc diff --git a/helpers/external_acl/AD_group/required.m4 b/src/acl/external/AD_group/required.m4 similarity index 100% rename from helpers/external_acl/AD_group/required.m4 rename to src/acl/external/AD_group/required.m4 diff --git a/helpers/external_acl/LDAP_group/ChangeLog b/src/acl/external/LDAP_group/ChangeLog similarity index 100% rename from helpers/external_acl/LDAP_group/ChangeLog rename to src/acl/external/LDAP_group/ChangeLog diff --git a/helpers/external_acl/LDAP_group/Makefile.am b/src/acl/external/LDAP_group/Makefile.am similarity index 67% rename from helpers/external_acl/LDAP_group/Makefile.am rename to src/acl/external/LDAP_group/Makefile.am index 8957d973bd..393dd1ca7d 100644 --- a/helpers/external_acl/LDAP_group/Makefile.am +++ b/src/acl/external/LDAP_group/Makefile.am @@ -7,15 +7,18 @@ 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 diff --git a/helpers/external_acl/LDAP_group/ext_ldap_group_acl.8 b/src/acl/external/LDAP_group/ext_ldap_group_acl.8 similarity index 100% rename from helpers/external_acl/LDAP_group/ext_ldap_group_acl.8 rename to src/acl/external/LDAP_group/ext_ldap_group_acl.8 diff --git a/helpers/external_acl/LDAP_group/ext_ldap_group_acl.cc b/src/acl/external/LDAP_group/ext_ldap_group_acl.cc similarity index 100% rename from helpers/external_acl/LDAP_group/ext_ldap_group_acl.cc rename to src/acl/external/LDAP_group/ext_ldap_group_acl.cc diff --git a/helpers/external_acl/LDAP_group/required.m4 b/src/acl/external/LDAP_group/required.m4 similarity index 100% rename from helpers/external_acl/LDAP_group/required.m4 rename to src/acl/external/LDAP_group/required.m4 diff --git a/helpers/external_acl/LM_group/Makefile.am b/src/acl/external/LM_group/Makefile.am similarity index 69% rename from helpers/external_acl/LM_group/Makefile.am rename to src/acl/external/LM_group/Makefile.am index 6bcf085480..269e1b8f60 100644 --- a/helpers/external_acl/LM_group/Makefile.am +++ b/src/acl/external/LM_group/Makefile.am @@ -7,10 +7,11 @@ 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 \ @@ -18,6 +19,6 @@ LDADD = \ -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 diff --git a/helpers/external_acl/LM_group/ext_lm_group_acl.8 b/src/acl/external/LM_group/ext_lm_group_acl.8 similarity index 100% rename from helpers/external_acl/LM_group/ext_lm_group_acl.8 rename to src/acl/external/LM_group/ext_lm_group_acl.8 diff --git a/helpers/external_acl/LM_group/ext_lm_group_acl.cc b/src/acl/external/LM_group/ext_lm_group_acl.cc similarity index 100% rename from helpers/external_acl/LM_group/ext_lm_group_acl.cc rename to src/acl/external/LM_group/ext_lm_group_acl.cc diff --git a/helpers/external_acl/LM_group/required.m4 b/src/acl/external/LM_group/required.m4 similarity index 100% rename from helpers/external_acl/LM_group/required.m4 rename to src/acl/external/LM_group/required.m4 diff --git a/helpers/external_acl/Makefile.am b/src/acl/external/Makefile.am similarity index 100% rename from helpers/external_acl/Makefile.am rename to src/acl/external/Makefile.am diff --git a/helpers/external_acl/SQL_session/Makefile.am b/src/acl/external/SQL_session/Makefile.am similarity index 100% rename from helpers/external_acl/SQL_session/Makefile.am rename to src/acl/external/SQL_session/Makefile.am diff --git a/helpers/external_acl/SQL_session/ext_sql_session_acl.pl.in b/src/acl/external/SQL_session/ext_sql_session_acl.pl.in similarity index 100% rename from helpers/external_acl/SQL_session/ext_sql_session_acl.pl.in rename to src/acl/external/SQL_session/ext_sql_session_acl.pl.in diff --git a/helpers/external_acl/SQL_session/required.m4 b/src/acl/external/SQL_session/required.m4 similarity index 100% rename from helpers/external_acl/SQL_session/required.m4 rename to src/acl/external/SQL_session/required.m4 diff --git a/helpers/external_acl/delayer/Makefile.am b/src/acl/external/delayer/Makefile.am similarity index 100% rename from helpers/external_acl/delayer/Makefile.am rename to src/acl/external/delayer/Makefile.am diff --git a/helpers/external_acl/delayer/ext_delayer_acl.pl.in b/src/acl/external/delayer/ext_delayer_acl.pl.in similarity index 100% rename from helpers/external_acl/delayer/ext_delayer_acl.pl.in rename to src/acl/external/delayer/ext_delayer_acl.pl.in diff --git a/helpers/external_acl/delayer/required.m4 b/src/acl/external/delayer/required.m4 similarity index 100% rename from helpers/external_acl/delayer/required.m4 rename to src/acl/external/delayer/required.m4 diff --git a/helpers/external_acl/eDirectory_userip/Makefile.am b/src/acl/external/eDirectory_userip/Makefile.am similarity index 100% rename from helpers/external_acl/eDirectory_userip/Makefile.am rename to src/acl/external/eDirectory_userip/Makefile.am diff --git a/helpers/external_acl/eDirectory_userip/ext_edirectory_userip_acl.8 b/src/acl/external/eDirectory_userip/ext_edirectory_userip_acl.8 similarity index 100% rename from helpers/external_acl/eDirectory_userip/ext_edirectory_userip_acl.8 rename to src/acl/external/eDirectory_userip/ext_edirectory_userip_acl.8 diff --git a/helpers/external_acl/eDirectory_userip/ext_edirectory_userip_acl.cc b/src/acl/external/eDirectory_userip/ext_edirectory_userip_acl.cc similarity index 100% rename from helpers/external_acl/eDirectory_userip/ext_edirectory_userip_acl.cc rename to src/acl/external/eDirectory_userip/ext_edirectory_userip_acl.cc diff --git a/helpers/external_acl/eDirectory_userip/required.m4 b/src/acl/external/eDirectory_userip/required.m4 similarity index 100% rename from helpers/external_acl/eDirectory_userip/required.m4 rename to src/acl/external/eDirectory_userip/required.m4 diff --git a/helpers/external_acl/file_userip/Makefile.am b/src/acl/external/file_userip/Makefile.am similarity index 86% rename from helpers/external_acl/file_userip/Makefile.am rename to src/acl/external/file_userip/Makefile.am index a151114241..e6a5baa038 100644 --- a/helpers/external_acl/file_userip/Makefile.am +++ b/src/acl/external/file_userip/Makefile.am @@ -8,16 +8,17 @@ 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) diff --git a/helpers/external_acl/file_userip/example-deny_all_but.conf b/src/acl/external/file_userip/example-deny_all_but.conf similarity index 100% rename from helpers/external_acl/file_userip/example-deny_all_but.conf rename to src/acl/external/file_userip/example-deny_all_but.conf diff --git a/helpers/external_acl/file_userip/example.conf b/src/acl/external/file_userip/example.conf similarity index 100% rename from helpers/external_acl/file_userip/example.conf rename to src/acl/external/file_userip/example.conf diff --git a/helpers/external_acl/file_userip/ext_file_userip_acl.8 b/src/acl/external/file_userip/ext_file_userip_acl.8 similarity index 100% rename from helpers/external_acl/file_userip/ext_file_userip_acl.8 rename to src/acl/external/file_userip/ext_file_userip_acl.8 diff --git a/helpers/external_acl/file_userip/ext_file_userip_acl.cc b/src/acl/external/file_userip/ext_file_userip_acl.cc similarity index 100% rename from helpers/external_acl/file_userip/ext_file_userip_acl.cc rename to src/acl/external/file_userip/ext_file_userip_acl.cc diff --git a/helpers/external_acl/file_userip/required.m4 b/src/acl/external/file_userip/required.m4 similarity index 100% rename from helpers/external_acl/file_userip/required.m4 rename to src/acl/external/file_userip/required.m4 diff --git a/helpers/external_acl/modules.m4 b/src/acl/external/helpers.m4 similarity index 71% rename from helpers/external_acl/modules.m4 rename to src/acl/external/helpers.m4 index e0373f265a..32626e059a 100644 --- a/helpers/external_acl/modules.m4 +++ b/src/acl/external/helpers.m4 @@ -13,7 +13,7 @@ #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 @@ -23,52 +23,52 @@ EXTERNAL_ACL_HELPERS="" 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]) diff --git a/helpers/external_acl/kerberos_ldap_group/Makefile.am b/src/acl/external/kerberos_ldap_group/Makefile.am similarity index 91% rename from helpers/external_acl/kerberos_ldap_group/Makefile.am rename to src/acl/external/kerberos_ldap_group/Makefile.am index 51769ce06d..63c0dc1e81 100644 --- a/helpers/external_acl/kerberos_ldap_group/Makefile.am +++ b/src/acl/external/kerberos_ldap_group/Makefile.am @@ -7,8 +7,11 @@ 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) diff --git a/helpers/external_acl/kerberos_ldap_group/README b/src/acl/external/kerberos_ldap_group/README similarity index 100% rename from helpers/external_acl/kerberos_ldap_group/README rename to src/acl/external/kerberos_ldap_group/README diff --git a/helpers/external_acl/kerberos_ldap_group/cert_tool b/src/acl/external/kerberos_ldap_group/cert_tool similarity index 100% rename from helpers/external_acl/kerberos_ldap_group/cert_tool rename to src/acl/external/kerberos_ldap_group/cert_tool diff --git a/helpers/external_acl/kerberos_ldap_group/ext_kerberos_ldap_group_acl.8 b/src/acl/external/kerberos_ldap_group/ext_kerberos_ldap_group_acl.8 similarity index 100% rename from helpers/external_acl/kerberos_ldap_group/ext_kerberos_ldap_group_acl.8 rename to src/acl/external/kerberos_ldap_group/ext_kerberos_ldap_group_acl.8 diff --git a/helpers/external_acl/kerberos_ldap_group/kerberos_ldap_group.cc b/src/acl/external/kerberos_ldap_group/kerberos_ldap_group.cc similarity index 100% rename from helpers/external_acl/kerberos_ldap_group/kerberos_ldap_group.cc rename to src/acl/external/kerberos_ldap_group/kerberos_ldap_group.cc diff --git a/helpers/external_acl/kerberos_ldap_group/required.m4 b/src/acl/external/kerberos_ldap_group/required.m4 similarity index 100% rename from helpers/external_acl/kerberos_ldap_group/required.m4 rename to src/acl/external/kerberos_ldap_group/required.m4 diff --git a/helpers/external_acl/kerberos_ldap_group/support.h b/src/acl/external/kerberos_ldap_group/support.h similarity index 100% rename from helpers/external_acl/kerberos_ldap_group/support.h rename to src/acl/external/kerberos_ldap_group/support.h diff --git a/helpers/external_acl/kerberos_ldap_group/support_group.cc b/src/acl/external/kerberos_ldap_group/support_group.cc similarity index 100% rename from helpers/external_acl/kerberos_ldap_group/support_group.cc rename to src/acl/external/kerberos_ldap_group/support_group.cc diff --git a/helpers/external_acl/kerberos_ldap_group/support_krb5.cc b/src/acl/external/kerberos_ldap_group/support_krb5.cc similarity index 100% rename from helpers/external_acl/kerberos_ldap_group/support_krb5.cc rename to src/acl/external/kerberos_ldap_group/support_krb5.cc diff --git a/helpers/external_acl/kerberos_ldap_group/support_ldap.cc b/src/acl/external/kerberos_ldap_group/support_ldap.cc similarity index 100% rename from helpers/external_acl/kerberos_ldap_group/support_ldap.cc rename to src/acl/external/kerberos_ldap_group/support_ldap.cc diff --git a/helpers/external_acl/kerberos_ldap_group/support_log.cc b/src/acl/external/kerberos_ldap_group/support_log.cc similarity index 100% rename from helpers/external_acl/kerberos_ldap_group/support_log.cc rename to src/acl/external/kerberos_ldap_group/support_log.cc diff --git a/helpers/external_acl/kerberos_ldap_group/support_lserver.cc b/src/acl/external/kerberos_ldap_group/support_lserver.cc similarity index 100% rename from helpers/external_acl/kerberos_ldap_group/support_lserver.cc rename to src/acl/external/kerberos_ldap_group/support_lserver.cc diff --git a/helpers/external_acl/kerberos_ldap_group/support_member.cc b/src/acl/external/kerberos_ldap_group/support_member.cc similarity index 100% rename from helpers/external_acl/kerberos_ldap_group/support_member.cc rename to src/acl/external/kerberos_ldap_group/support_member.cc diff --git a/helpers/external_acl/kerberos_ldap_group/support_netbios.cc b/src/acl/external/kerberos_ldap_group/support_netbios.cc similarity index 100% rename from helpers/external_acl/kerberos_ldap_group/support_netbios.cc rename to src/acl/external/kerberos_ldap_group/support_netbios.cc diff --git a/helpers/external_acl/kerberos_ldap_group/support_resolv.cc b/src/acl/external/kerberos_ldap_group/support_resolv.cc similarity index 100% rename from helpers/external_acl/kerberos_ldap_group/support_resolv.cc rename to src/acl/external/kerberos_ldap_group/support_resolv.cc diff --git a/helpers/external_acl/kerberos_ldap_group/support_sasl.cc b/src/acl/external/kerberos_ldap_group/support_sasl.cc similarity index 100% rename from helpers/external_acl/kerberos_ldap_group/support_sasl.cc rename to src/acl/external/kerberos_ldap_group/support_sasl.cc diff --git a/helpers/external_acl/session/Makefile.am b/src/acl/external/session/Makefile.am similarity index 65% rename from helpers/external_acl/session/Makefile.am rename to src/acl/external/session/Makefile.am index df52d27cbd..2a3c025f0f 100644 --- a/helpers/external_acl/session/Makefile.am +++ b/src/acl/external/session/Makefile.am @@ -7,11 +7,13 @@ 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 diff --git a/helpers/external_acl/session/ext_session_acl.8 b/src/acl/external/session/ext_session_acl.8 similarity index 100% rename from helpers/external_acl/session/ext_session_acl.8 rename to src/acl/external/session/ext_session_acl.8 diff --git a/helpers/external_acl/session/ext_session_acl.cc b/src/acl/external/session/ext_session_acl.cc similarity index 100% rename from helpers/external_acl/session/ext_session_acl.cc rename to src/acl/external/session/ext_session_acl.cc diff --git a/helpers/external_acl/session/required.m4 b/src/acl/external/session/required.m4 similarity index 100% rename from helpers/external_acl/session/required.m4 rename to src/acl/external/session/required.m4 diff --git a/helpers/external_acl/time_quota/Makefile.am b/src/acl/external/time_quota/Makefile.am similarity index 67% rename from helpers/external_acl/time_quota/Makefile.am rename to src/acl/external/time_quota/Makefile.am index bd81064ee4..773cc33aa8 100644 --- a/helpers/external_acl/time_quota/Makefile.am +++ b/src/acl/external/time_quota/Makefile.am @@ -7,13 +7,15 @@ 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 diff --git a/helpers/external_acl/time_quota/ext_time_quota_acl.8 b/src/acl/external/time_quota/ext_time_quota_acl.8 similarity index 100% rename from helpers/external_acl/time_quota/ext_time_quota_acl.8 rename to src/acl/external/time_quota/ext_time_quota_acl.8 diff --git a/helpers/external_acl/time_quota/ext_time_quota_acl.cc b/src/acl/external/time_quota/ext_time_quota_acl.cc similarity index 100% rename from helpers/external_acl/time_quota/ext_time_quota_acl.cc rename to src/acl/external/time_quota/ext_time_quota_acl.cc diff --git a/helpers/external_acl/time_quota/required.m4 b/src/acl/external/time_quota/required.m4 similarity index 100% rename from helpers/external_acl/time_quota/required.m4 rename to src/acl/external/time_quota/required.m4 diff --git a/helpers/external_acl/unix_group/Makefile.am b/src/acl/external/unix_group/Makefile.am similarity index 87% rename from helpers/external_acl/unix_group/Makefile.am rename to src/acl/external/unix_group/Makefile.am index 7f40fabb78..9a83bf26ed 100644 --- a/helpers/external_acl/unix_group/Makefile.am +++ b/src/acl/external/unix_group/Makefile.am @@ -10,9 +10,10 @@ include $(top_srcdir)/src/Common.am 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) diff --git a/helpers/external_acl/unix_group/check_group.cc b/src/acl/external/unix_group/check_group.cc similarity index 100% rename from helpers/external_acl/unix_group/check_group.cc rename to src/acl/external/unix_group/check_group.cc diff --git a/helpers/external_acl/unix_group/ext_unix_group_acl.8 b/src/acl/external/unix_group/ext_unix_group_acl.8 similarity index 100% rename from helpers/external_acl/unix_group/ext_unix_group_acl.8 rename to src/acl/external/unix_group/ext_unix_group_acl.8 diff --git a/helpers/external_acl/unix_group/required.m4 b/src/acl/external/unix_group/required.m4 similarity index 100% rename from helpers/external_acl/unix_group/required.m4 rename to src/acl/external/unix_group/required.m4 diff --git a/helpers/external_acl/wbinfo_group/Makefile.am b/src/acl/external/wbinfo_group/Makefile.am similarity index 100% rename from helpers/external_acl/wbinfo_group/Makefile.am rename to src/acl/external/wbinfo_group/Makefile.am diff --git a/helpers/external_acl/wbinfo_group/ext_wbinfo_group_acl.pl.in b/src/acl/external/wbinfo_group/ext_wbinfo_group_acl.pl.in similarity index 100% rename from helpers/external_acl/wbinfo_group/ext_wbinfo_group_acl.pl.in rename to src/acl/external/wbinfo_group/ext_wbinfo_group_acl.pl.in diff --git a/helpers/external_acl/wbinfo_group/required.m4 b/src/acl/external/wbinfo_group/required.m4 similarity index 100% rename from helpers/external_acl/wbinfo_group/required.m4 rename to src/acl/external/wbinfo_group/required.m4