From: Amos Jeffries <squid3@treenet.co.nz>
Date: Mon, 31 Mar 2014 04:46:50 +0000 (-0700)
Subject: Cleanup: make loadable modules build variables follow Squid3 coding guidelines
X-Git-Tag: SQUID_3_5_0_1~309
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=cb5569cd63ff6d70e9f8c345f903ccc1ed88ff83;p=thirdparty%2Fsquid.git

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 af8dea245f..2bbc8b063c 100644
--- 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 1383cfcadc..dbab19a974 100644
--- 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 c78fe2bd9a..11c03c3513 100644
--- 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 8ceb54937a..a02d2bcf7c 100644
--- 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