Cleanup: make loadable modules build variables follow Squid3 coding guidelines

Squid-3 coding guidelines mandate that AM_CONDITIONAL variables begin
with ENABLE_* and AC_DEFINE macros begin with USE_* to resolve confusion
over which is relevant.

diff --git a/Makefile.am b/Makefile.am
index af8dea245f6461b210987965115c79ffeebbd5bd..2bbc8b063c3a4d5c4e8945ac93b4e2f349fc4e60 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -4,7 +4,7 @@
 AUTOMAKE_OPTIONS = dist-bzip2 subdir-objects 1.5 foreign
 DIST_SUBDIRS   = compat lib libltdl scripts icons errors contrib doc helpers src test-suite tools
 SUBDIRS                = compat lib
-if USE_LOADABLE_MODULES
+if ENABLE_LOADABLE_MODULES
 SUBDIRS += libltdl
 endif
 SUBDIRS += scripts icons errors doc helpers src tools test-suite

diff --git a/configure.ac b/configure.ac
index 1383cfcadc96fcad340c204d46d1ed32d236be78..dbab19a974bc9d93b15483a565b9ac150dd2f0df 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -150,7 +150,7 @@ AC_ARG_ENABLE(loadable-modules,
   SQUID_YESNO([$enableval],
     [Unrecognized argument to --disable-loadable-modules: $enableval])
 ])
-AM_CONDITIONAL(USE_LOADABLE_MODULES, test "x${enable_loadable_modules:=yes}" = "xyes")
+AM_CONDITIONAL(ENABLE_LOADABLE_MODULES, test "x${enable_loadable_modules:=yes}" = "xyes")
 AC_MSG_RESULT([$enable_loadable_modules])
 
 if test "x$enable_loadable_modules" = "xyes";

diff --git a/src/Common.am b/src/Common.am
index c78fe2bd9a6f1a2c0621231800a0cee0c421bba7..11c03c35131bd08121019e84c403f28d8c25866c 100644 (file)
--- a/src/Common.am
+++ b/src/Common.am
@@ -27,7 +27,7 @@ INCLUDES += $(KRB5INCS)
 
 ## Loadable Modules requires LTDL include paths.
 ## Because we need this to use the libray linking headers...
-if USE_LOADABLE_MODULES
+if ENABLE_LOADABLE_MODULES
 INCLUDES += $(INCLTDL)
 endif
 

diff --git a/src/Makefile.am b/src/Makefile.am
index 8ceb54937ab555c06a72ad3f30d14dffe72078f6..a02d2bcf7cf2b191e54363da282d02f0c8d2e088 100644 (file)
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -676,7 +676,7 @@ squid_DEPENDENCIES = \
        ipc/libipc.la \
        mgr/libmgr.la
 
-if USE_LOADABLE_MODULES
+if ENABLE_LOADABLE_MODULES
 squid_SOURCES += $(LOADABLE_MODULES_SOURCES)
 squid_LDADD += -L$(top_builddir) $(LIBLTDL)
 squid_LDFLAGS = -export-dynamic -dlopen force