SourceLayout: move Store-ID helpers to src/store/id_rewriters/

diff --git a/configure.ac b/configure.ac
index ab5c0fdefd39e96475e3c3cb416509cfdb21f7de..627baa69c9e0083180bc538ed232ebebbb3eb6dc 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -2606,9 +2606,9 @@ AC_ARG_ENABLE(storeid-rewrite-helpers,
                   process. The default is to attempt the build of all possible
                   helpers. Use --disable-storeid-rewrite-helpers to build none.
                   For a list of available helpers see the
-                  helpers/storeid_rewrite directory.]),[
+                  src/store/id_rewriters/ directory.]),[
 ])
-m4_include([helpers/storeid_rewrite/modules.m4])
+m4_include([src/store/id_rewriters/helpers.m4])
 
 AC_ARG_WITH(valgrind-debug,
   AS_HELP_STRING([--with-valgrind-debug],
@@ -3797,8 +3797,6 @@ AC_CONFIG_FILES([
        doc/release-notes/Makefile
        errors/Makefile
        helpers/Makefile
-       helpers/storeid_rewrite/Makefile
-       helpers/storeid_rewrite/file/Makefile
        helpers/url_rewrite/Makefile
        helpers/url_rewrite/fake/Makefile
        helpers/url_rewrite/LFS/Makefile
@@ -3895,6 +3893,8 @@ AC_CONFIG_FILES([
        src/snmp/Makefile
        src/ssl/Makefile
        src/store/Makefile
+       src/store/id_rewriters/Makefile
+       src/store/id_rewriters/file/Makefile
        test-suite/Makefile
        tools/Makefile
        tools/helper-mux/Makefile

diff --git a/helpers/Makefile.am b/helpers/Makefile.am
index c458745af5d5e1bc8e74d7d05137005ca0d61a92..a7e25a67a318dc4e011bae2455d7c1e576c6a9ea 100644 (file)
--- a/helpers/Makefile.am
+++ b/helpers/Makefile.am
@@ -7,6 +7,4 @@
 
 EXTRA_DIST = defines.h
 
-SUBDIRS = \
-       url_rewrite \
-       storeid_rewrite
+SUBDIRS = url_rewrite

diff --git a/src/store/Makefile.am b/src/store/Makefile.am
index 2b86a830cf81a967b43ef760842e0ec0c4ecb3b1..721cf1da2b5743fe2bc46205ed15ff68caf47c7f 100644 (file)
--- a/src/store/Makefile.am
+++ b/src/store/Makefile.am
@@ -8,6 +8,8 @@
 include $(top_srcdir)/src/Common.am
 include $(top_srcdir)/src/TestHeaders.am
 
+SUBDIRS= id_rewriters
+
 noinst_LTLIBRARIES = libstore.la
 
 libstore_la_SOURCES= \

diff --git a/helpers/storeid_rewrite/Makefile.am b/src/store/id_rewriters/Makefile.am
similarity index 77%
rename from helpers/storeid_rewrite/Makefile.am
rename to src/store/id_rewriters/Makefile.am
index 0661a24a5adff4c0a554763f7ca5782aa0989d92..0ece8881f2fb4a09f900f38fdfa58115b964e5c8 100644 (file)
--- a/helpers/storeid_rewrite/Makefile.am
+++ b/src/store/id_rewriters/Makefile.am
@@ -5,5 +5,6 @@
 ## Please see the COPYING and CONTRIBUTORS files for details.
 ##
 
-DIST_SUBDIRS   = file
-SUBDIRS                = $(STOREID_REWRITE_HELPERS)
+DIST_SUBDIRS= file
+SUBDIRS= $(STOREID_REWRITE_HELPERS)
+EXTRA_DIST= helpers.m4

diff --git a/helpers/storeid_rewrite/file/Makefile.am b/src/store/id_rewriters/file/Makefile.am
similarity index 100%
rename from helpers/storeid_rewrite/file/Makefile.am
rename to src/store/id_rewriters/file/Makefile.am

diff --git a/helpers/storeid_rewrite/file/required.m4 b/src/store/id_rewriters/file/required.m4
similarity index 100%
rename from helpers/storeid_rewrite/file/required.m4
rename to src/store/id_rewriters/file/required.m4

diff --git a/helpers/storeid_rewrite/file/storeid_file_rewrite.pl.in b/src/store/id_rewriters/file/storeid_file_rewrite.pl.in
similarity index 100%
rename from helpers/storeid_rewrite/file/storeid_file_rewrite.pl.in
rename to src/store/id_rewriters/file/storeid_file_rewrite.pl.in

diff --git a/helpers/storeid_rewrite/modules.m4 b/src/store/id_rewriters/helpers.m4
similarity index 89%
rename from helpers/storeid_rewrite/modules.m4
rename to src/store/id_rewriters/helpers.m4
index 00890b3f0cc6da094e3a98b871a1afc42f3ea149..487df1ee4274fafd4fc1d86cff7eee6f30cfe624 100644 (file)
--- a/helpers/storeid_rewrite/modules.m4
+++ b/src/store/id_rewriters/helpers.m4
@@ -13,7 +13,7 @@
 #define list of modules to build
 auto_storeid_modules=no
 if test "x${enable_storeid_rewrite_helpers:=yes}" = "xyes" ; then
-    SQUID_LOOK_FOR_MODULES([$srcdir/helpers/storeid_rewrite],[enable_storeid_rewrite_helpers])
+    SQUID_LOOK_FOR_MODULES([$srcdir/src/store/id_rewriters],[enable_storeid_rewrite_helpers])
   auto_storeid_modules=yes
 fi
 
@@ -22,19 +22,19 @@ AC_MSG_NOTICE([Store-ID rewrite helper candidates: $enable_storeid_rewrite_helpe
 STOREID_REWRITE_HELPERS=""
 if test "x$enable_storeid_rewrite_helpers" != "xno" ; then
   for helper in $enable_storeid_rewrite_helpers; do
-    dir="$srcdir/helpers/storeid_rewrite/$helper"
+    dir="$srcdir/src/store/id_rewriters/$helper"
 
     # modules converted to autoconf macros already
     # NP: we only need this list because m4_include() does not accept variables
     if test "x$helper" = "xfile" ; then
-      m4_include([helpers/storeid_rewrite/file/required.m4])
+      m4_include([src/store/id_rewriters/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/storeid_rewrite/$helper"; then
+    if test -d "$srcdir/src/store/id_rewriters/$helper"; then
       if test "$BUILD_HELPER" != "$helper"; then
         if test "x$auto_storeid_modules" = "xyes"; then
           AC_MSG_NOTICE([Store-ID rewrite helper $helper ... found but cannot be built])