SourceLayout: move URL rewriters to src/http/url_rewriters/

diff --git a/configure.ac b/configure.ac
index 627baa69c9e0083180bc538ed232ebebbb3eb6dc..b91cf976e3422b879028c39f0a8a42e0f3926e3b 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -2582,9 +2582,9 @@ AC_ARG_ENABLE(url-rewrite-helpers,
                   process. The default is to attempt the build of all possible
                   helpers. Use --disable-url-rewrite-helpers to build none.
                   For a list of available helpers see the
-                  helpers/url_rewrite directory.]),[
+                  src/http/url_rewriters/ directory.]),[
 ])
-m4_include([helpers/url_rewrite/modules.m4])
+m4_include([src/http/url_rewriters/helpers.m4])
 
 dnl Select security helpers to build
 AC_ARG_ENABLE(security-cert-validator-helpers,
@@ -3797,9 +3797,6 @@ AC_CONFIG_FILES([
        doc/release-notes/Makefile
        errors/Makefile
        helpers/Makefile
-       helpers/url_rewrite/Makefile
-       helpers/url_rewrite/fake/Makefile
-       helpers/url_rewrite/LFS/Makefile
        icons/Makefile
        lib/Makefile
        lib/libTrie/Makefile
@@ -3875,6 +3872,9 @@ AC_CONFIG_FILES([
        src/helper/Makefile
        src/http/Makefile
        src/http/one/Makefile
+       src/http/url_rewriters/Makefile
+       src/http/url_rewriters/fake/Makefile
+       src/http/url_rewriters/LFS/Makefile
        src/icmp/Makefile
        src/ident/Makefile
        src/ip/Makefile

diff --git a/helpers/Makefile.am b/helpers/Makefile.am
index a7e25a67a318dc4e011bae2455d7c1e576c6a9ea..5051f96ebc95a83481b0d374b65dccd238042c9c 100644 (file)
--- a/helpers/Makefile.am
+++ b/helpers/Makefile.am
@@ -6,5 +6,3 @@
 ##
 
 EXTRA_DIST = defines.h
-
-SUBDIRS = url_rewrite

diff --git a/src/http/Makefile.am b/src/http/Makefile.am
index 5fc24803da4fe8263a4a00239373b78b68a8fc08..9dac47f38d9213ddd19ed986a08e2ed06fcc3665 100644 (file)
--- a/src/http/Makefile.am
+++ b/src/http/Makefile.am
@@ -8,8 +8,8 @@
 include $(top_srcdir)/src/Common.am
 include $(top_srcdir)/src/TestHeaders.am
 
-SUBDIRS = one
-DIST_SUBDIRS = one
+SUBDIRS = one url_rewriters
+DIST_SUBDIRS = one url_rewriters
 
 noinst_LTLIBRARIES = libsquid-http.la
 

diff --git a/helpers/url_rewrite/LFS/Makefile.am b/src/http/url_rewriters/LFS/Makefile.am
similarity index 100%
rename from helpers/url_rewrite/LFS/Makefile.am
rename to src/http/url_rewriters/LFS/Makefile.am

diff --git a/helpers/url_rewrite/LFS/required.m4 b/src/http/url_rewriters/LFS/required.m4
similarity index 100%
rename from helpers/url_rewrite/LFS/required.m4
rename to src/http/url_rewriters/LFS/required.m4

diff --git a/helpers/url_rewrite/LFS/rredir.cc b/src/http/url_rewriters/LFS/rredir.cc
similarity index 100%
rename from helpers/url_rewrite/LFS/rredir.cc
rename to src/http/url_rewriters/LFS/rredir.cc

diff --git a/helpers/url_rewrite/LFS/url_lfs_rewrite.pl.in b/src/http/url_rewriters/LFS/url_lfs_rewrite.pl.in
similarity index 100%
rename from helpers/url_rewrite/LFS/url_lfs_rewrite.pl.in
rename to src/http/url_rewriters/LFS/url_lfs_rewrite.pl.in

diff --git a/helpers/url_rewrite/Makefile.am b/src/http/url_rewriters/Makefile.am
similarity index 82%
rename from helpers/url_rewrite/Makefile.am
rename to src/http/url_rewriters/Makefile.am
index a0cdf68d0277a075177edb7f853b30efee2749c5..cead83cce2039f25b4f941822f65bae29c379cb5 100644 (file)
--- a/helpers/url_rewrite/Makefile.am
+++ b/src/http/url_rewriters/Makefile.am
@@ -5,5 +5,5 @@
 ## Please see the COPYING and CONTRIBUTORS files for details.
 ##
 
-DIST_SUBDIRS   = fake LFS
-SUBDIRS                = $(URL_REWRITE_HELPERS)
+DIST_SUBDIRS= fake LFS
+SUBDIRS= $(URL_REWRITE_HELPERS)

diff --git a/helpers/url_rewrite/fake/Makefile.am b/src/http/url_rewriters/fake/Makefile.am
similarity index 99%
rename from helpers/url_rewrite/fake/Makefile.am
rename to src/http/url_rewriters/fake/Makefile.am
index 5e7a44541690f3634c4ee9993104de29ed362a5a..31dd6a1dc87cee1b9022dbad9565d1a3f547c5c7 100644 (file)
--- a/helpers/url_rewrite/fake/Makefile.am
+++ b/src/http/url_rewriters/fake/Makefile.am
@@ -6,12 +6,11 @@
 ##
 
 include $(top_srcdir)/src/Common.am
- 
+
 libexec_PROGRAMS = url_fake_rewrite
-url_fake_rewrite_SOURCES = fake.cc
+libexec_SCRIPTS = url_fake_rewrite.sh
 
+url_fake_rewrite_SOURCES = fake.cc
 url_fake_rewrite_LDADD = $(COMPAT_LIB)
 
-libexec_SCRIPTS = url_fake_rewrite.sh
-
 EXTRA_DIST = url_fake_rewrite.sh required.m4

diff --git a/helpers/url_rewrite/fake/fake.cc b/src/http/url_rewriters/fake/fake.cc
similarity index 100%
rename from helpers/url_rewrite/fake/fake.cc
rename to src/http/url_rewriters/fake/fake.cc

diff --git a/helpers/url_rewrite/fake/required.m4 b/src/http/url_rewriters/fake/required.m4
similarity index 100%
rename from helpers/url_rewrite/fake/required.m4
rename to src/http/url_rewriters/fake/required.m4

diff --git a/helpers/url_rewrite/fake/url_fake_rewrite.sh b/src/http/url_rewriters/fake/url_fake_rewrite.sh
similarity index 100%
rename from helpers/url_rewrite/fake/url_fake_rewrite.sh
rename to src/http/url_rewriters/fake/url_fake_rewrite.sh

diff --git a/helpers/url_rewrite/modules.m4 b/src/http/url_rewriters/helpers.m4
similarity index 85%
rename from helpers/url_rewrite/modules.m4
rename to src/http/url_rewriters/helpers.m4
index 05bb529fa5327b733b7b3d19162ec497a372bc90..2269fcedc64680c38c35f28fb54160df286a1530 100644 (file)
--- a/helpers/url_rewrite/modules.m4
+++ b/src/http/url_rewriters/helpers.m4
@@ -13,7 +13,7 @@
 #define list of modules to build
 auto_urlrewrite_modules=no
 if test "x${enable_url_rewrite_helpers:=yes}" = "xyes" ; then
-    SQUID_LOOK_FOR_MODULES([$srcdir/helpers/url_rewrite],[enable_url_rewrite_helpers])
+    SQUID_LOOK_FOR_MODULES([$srcdir/src/http/url_rewriters],[enable_url_rewrite_helpers])
   auto_urlrewrite_modules=yes
 fi
 
@@ -22,22 +22,22 @@ AC_MSG_NOTICE([URL rewrite helper candidates: $enable_url_rewrite_helpers])
 URL_REWRITE_HELPERS=""
 if test "x$enable_url_rewrite_helpers" != "xno" ; then
   for helper in $enable_url_rewrite_helpers; do
-    dir="$srcdir/helpers/url_rewrite/$helper"
+    dir="$srcdir/src/http/url_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" = "xfake" ; then
-      m4_include([helpers/url_rewrite/fake/required.m4])
+      m4_include([src/http/url_rewriters/fake/required.m4])
 
     elif test "x$helper" = "xLFS" ; then
-      m4_include([helpers/url_rewrite/LFS/required.m4])
+      m4_include([src/http/url_rewriters/LFS/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/url_rewrite/$helper"; then
+    if test -d "$srcdir/src/http/url_rewriters/$helper"; then
       if test "$BUILD_HELPER" != "$helper"; then
         if test "x$auto_urlrewrite_modules" = "xyes"; then
           AC_MSG_NOTICE([URL rewrite helper $helper ... found but cannot be built])