From 4d5dd85a6c94dae8be49bc4a0ac61ec90d28e260 Mon Sep 17 00:00:00 2001 From: Amos Jeffries Date: Sat, 30 Jan 2016 06:10:20 +1300 Subject: [PATCH] SourceLayout: move log daemon helpers to src/log/ --- configure.ac | 13 ++++++------- helpers/Makefile.am | 2 -- helpers/log_daemon/Makefile.am | 14 -------------- {helpers/log_daemon => src/log}/DB/Makefile.am | 0 .../log}/DB/doc/date_day_column.sql | 0 {helpers/log_daemon => src/log}/DB/doc/views.sql | 0 .../log_daemon => src/log}/DB/log_db_daemon.pl.in | 0 {helpers/log_daemon => src/log}/DB/required.m4 | 0 src/log/Makefile.am | 4 ++++ {helpers/log_daemon => src/log}/file/Makefile.am | 2 +- .../log_daemon => src/log}/file/log_file_daemon.cc | 2 +- {helpers/log_daemon => src/log}/file/required.m4 | 0 .../log_daemon/modules.m4 => src/log/helpers.m4 | 10 +++++----- src/security/cert_validators/Makefile.am | 2 +- .../cert_validators/{modules.m4 => helpers.m4} | 0 15 files changed, 18 insertions(+), 31 deletions(-) delete mode 100644 helpers/log_daemon/Makefile.am rename {helpers/log_daemon => src/log}/DB/Makefile.am (100%) rename {helpers/log_daemon => src/log}/DB/doc/date_day_column.sql (100%) rename {helpers/log_daemon => src/log}/DB/doc/views.sql (100%) rename {helpers/log_daemon => src/log}/DB/log_db_daemon.pl.in (100%) rename {helpers/log_daemon => src/log}/DB/required.m4 (100%) rename {helpers/log_daemon => src/log}/file/Makefile.am (92%) rename {helpers/log_daemon => src/log}/file/log_file_daemon.cc (99%) rename {helpers/log_daemon => src/log}/file/required.m4 (100%) rename helpers/log_daemon/modules.m4 => src/log/helpers.m4 (86%) rename src/security/cert_validators/{modules.m4 => helpers.m4} (100%) diff --git a/configure.ac b/configure.ac index 4700a7de14..e06a94e09f 100644 --- a/configure.ac +++ b/configure.ac @@ -2554,13 +2554,13 @@ AC_SUBST(AUTH_LIBS_TO_BUILD) dnl Select logging daemon helpers to build AC_ARG_ENABLE(log-daemon-helpers, AS_HELP_STRING([--enable-log-daemon-helpers="list of helpers"], - [This option selects which logging daemon helpers to + [This option selects which logging daemon helpers to build and install as part of the normal build process - For a list of available helpers see the helpers/log_daemon + For a list of available helpers see the src/log/ directory.]),[ #nothing to do, really ]) -m4_include([helpers/log_daemon/modules.m4]) +m4_include([src/log/helpers.m4]) AC_ARG_ENABLE(external-acl-helpers, AS_HELP_STRING([--enable-external-acl-helpers="list of helpers"], @@ -2596,7 +2596,7 @@ AC_ARG_ENABLE(security-cert-validator-helpers, build none. For a list of available helpers see the src/security/cert_validators/ directory.]),[ ]) -m4_include([src/security/cert_validators/modules.m4]) +m4_include([src/security/cert_validators/helpers.m4]) dnl Select storeid_rewrite helpers to build AC_ARG_ENABLE(storeid-rewrite-helpers, @@ -3828,9 +3828,6 @@ AC_CONFIG_FILES([ 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/negotiate_auth/Makefile helpers/negotiate_auth/kerberos/Makefile helpers/negotiate_auth/SSPI/Makefile @@ -3889,6 +3886,8 @@ AC_CONFIG_FILES([ src/ip/Makefile src/ipc/Makefile src/log/Makefile + src/log/DB/Makefile + src/log/file/Makefile src/mem/Makefile src/mgr/Makefile src/parser/Makefile diff --git a/helpers/Makefile.am b/helpers/Makefile.am index 671a75d0e0..24922aa270 100644 --- a/helpers/Makefile.am +++ b/helpers/Makefile.am @@ -11,7 +11,6 @@ DIST_SUBDIRS = \ basic_auth \ digest_auth \ external_acl \ - log_daemon \ negotiate_auth \ ntlm_auth \ url_rewrite \ @@ -21,7 +20,6 @@ SUBDIRS = \ basic_auth \ digest_auth \ external_acl \ - log_daemon \ negotiate_auth \ url_rewrite \ storeid_rewrite diff --git a/helpers/log_daemon/Makefile.am b/helpers/log_daemon/Makefile.am deleted file mode 100644 index 89c9bf9f45..0000000000 --- a/helpers/log_daemon/Makefile.am +++ /dev/null @@ -1,14 +0,0 @@ -## Copyright (C) 1996-2016 The Squid Software Foundation and contributors -## -## Squid software is distributed under GPLv2+ license and includes -## contributions from numerous individuals and organizations. -## Please see the COPYING and CONTRIBUTORS files for details. -## - -## Alphabetical list of sub-directories to distribute with Squid: -DIST_SUBDIRS = \ - DB \ - file - -SUBDIRS = $(LOG_DAEMON_HELPERS) -EXTRA_DIST = modules.m4 diff --git a/helpers/log_daemon/DB/Makefile.am b/src/log/DB/Makefile.am similarity index 100% rename from helpers/log_daemon/DB/Makefile.am rename to src/log/DB/Makefile.am diff --git a/helpers/log_daemon/DB/doc/date_day_column.sql b/src/log/DB/doc/date_day_column.sql similarity index 100% rename from helpers/log_daemon/DB/doc/date_day_column.sql rename to src/log/DB/doc/date_day_column.sql diff --git a/helpers/log_daemon/DB/doc/views.sql b/src/log/DB/doc/views.sql similarity index 100% rename from helpers/log_daemon/DB/doc/views.sql rename to src/log/DB/doc/views.sql diff --git a/helpers/log_daemon/DB/log_db_daemon.pl.in b/src/log/DB/log_db_daemon.pl.in similarity index 100% rename from helpers/log_daemon/DB/log_db_daemon.pl.in rename to src/log/DB/log_db_daemon.pl.in diff --git a/helpers/log_daemon/DB/required.m4 b/src/log/DB/required.m4 similarity index 100% rename from helpers/log_daemon/DB/required.m4 rename to src/log/DB/required.m4 diff --git a/src/log/Makefile.am b/src/log/Makefile.am index 47b6470ed4..3b7aa2c744 100644 --- a/src/log/Makefile.am +++ b/src/log/Makefile.am @@ -8,6 +8,10 @@ include $(top_srcdir)/src/Common.am include $(top_srcdir)/src/TestHeaders.am +DIST_SUBDIRS= DB file +SUBDIRS= $(LOG_DAEMON_HELPERS) +EXTRA_DIST= helpers.m4 + noinst_LTLIBRARIES = liblog.la liblog_la_SOURCES = \ diff --git a/helpers/log_daemon/file/Makefile.am b/src/log/file/Makefile.am similarity index 92% rename from helpers/log_daemon/file/Makefile.am rename to src/log/file/Makefile.am index 037b0a6b97..78b8c43098 100644 --- a/helpers/log_daemon/file/Makefile.am +++ b/src/log/file/Makefile.am @@ -10,6 +10,6 @@ include $(top_srcdir)/src/Common.am libexec_PROGRAMS = log_file_daemon log_file_daemon_SOURCES = log_file_daemon.cc log_file_daemon_LDADD = \ - -L$(top_builddir)/lib $(COMPAT_LIB) \ + $(COMPAT_LIB) \ $(XTRA_LIBS) EXTRA_DIST = required.m4 diff --git a/helpers/log_daemon/file/log_file_daemon.cc b/src/log/file/log_file_daemon.cc similarity index 99% rename from helpers/log_daemon/file/log_file_daemon.cc rename to src/log/file/log_file_daemon.cc index 9652cb922d..b8057f23da 100644 --- a/helpers/log_daemon/file/log_file_daemon.cc +++ b/src/log/file/log_file_daemon.cc @@ -28,7 +28,7 @@ #include #endif -#include "defines.h" +#include "helpers/defines.h" /* parse buffer - ie, length of longest expected line */ #define LOGFILE_BUF_LEN 65536 diff --git a/helpers/log_daemon/file/required.m4 b/src/log/file/required.m4 similarity index 100% rename from helpers/log_daemon/file/required.m4 rename to src/log/file/required.m4 diff --git a/helpers/log_daemon/modules.m4 b/src/log/helpers.m4 similarity index 86% rename from helpers/log_daemon/modules.m4 rename to src/log/helpers.m4 index dd0a565599..ff37662025 100644 --- a/helpers/log_daemon/modules.m4 +++ b/src/log/helpers.m4 @@ -14,7 +14,7 @@ auto_logdaemon_modules=no if test "x${enable_log_daemon_helpers:=yes}" = "xyes" ;then enable_log_daemon_helpers="" - SQUID_LOOK_FOR_MODULES([$srcdir/helpers/log_daemon],[enable_log_daemon_helpers]) + SQUID_LOOK_FOR_MODULES([$srcdir/src/log],[enable_log_daemon_helpers]) auto_logdaemon_modules=yes fi if test "x$enable_log_daemon_helpers" = "xnone" ; then @@ -25,22 +25,22 @@ LOG_DAEMON_HELPERS="" enable_log_daemon_helpers="`echo $enable_log_daemon_helpers| sed -e 's/,/ /g;s/ */ /g'`" if test "x$enable_log_daemon_helpers" != "xno"; then for helper in $enable_log_daemon_helpers ; do - dir="$srcdir/helpers/log_daemon/$helper" + dir="$srcdir/src/log/$helper" # modules converted to autoconf macros already # NP: we only need this list because m4_include() does not accept variables if test "x$helper" = "xDB" ; then - m4_include([helpers/log_daemon/DB/required.m4]) + m4_include([src/log/DB/required.m4]) elif test "x$helper" = "xfile" ; then - m4_include([helpers/log_daemon/file/required.m4]) + m4_include([src/log/file/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/log_daemon/$helper"; then + if test -d "$srcdir/src/log/$helper"; then if test "$BUILD_HELPER" != "$helper"; then if test "x$auto_logdaemon_modules" = "xyes"; then AC_MSG_NOTICE([Log daemon helper $helper ... found but cannot be built]) diff --git a/src/security/cert_validators/Makefile.am b/src/security/cert_validators/Makefile.am index 3f94cd87b4..225733a7bd 100644 --- a/src/security/cert_validators/Makefile.am +++ b/src/security/cert_validators/Makefile.am @@ -7,4 +7,4 @@ DIST_SUBDIRS= fake SUBDIRS= $(SECURITY_CERTV_HELPERS) - +EXTRA_DIST= helpers.m4 diff --git a/src/security/cert_validators/modules.m4 b/src/security/cert_validators/helpers.m4 similarity index 100% rename from src/security/cert_validators/modules.m4 rename to src/security/cert_validators/helpers.m4 -- 2.47.3