From: Amos Jeffries <squid3@treenet.co.nz>
Date: Wed, 8 Jan 2014 04:29:04 +0000 (-0700)
Subject: Cleanup: remove useless makesnmplib variable from build
X-Git-Tag: SQUID_3_5_0_1~434
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=ae64d121d5bb402a8cad508146f813d1629e75b7;p=thirdparty%2Fsquid.git

Cleanup: remove useless makesnmplib variable from build

Squid coding guidelines require automake variables to use naming pattern
ENABLE_* and there is already ENABLE_SNMP defined with intended overlap
of usage. We can drop this unusual variable completely.
---

diff --git a/configure.ac b/configure.ac
index 4fd8209975..dd18fe3662 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1127,11 +1127,9 @@ SQUID_DEFINE_BOOL(SQUID_SNMP,${enable_snmp:=yes},
 AM_CONDITIONAL(ENABLE_SNMP, [test "x$enable_snmp" = "xyes"])
 if test "x$enable_snmp" = "xyes"; then
     SNMPLIB='../lib/snmplib/libsnmplib.la'
-    makesnmplib=snmplib
 fi
 AC_MSG_NOTICE([SNMP support enabled: $enable_snmp])
 AC_SUBST(SNMPLIB)
-AC_SUBST(makesnmplib)
 
 AC_ARG_ENABLE(cachemgr-hostname,
   AS_HELP_STRING([--enable-cachemgr-hostname=hostname],
diff --git a/lib/Makefile.am b/lib/Makefile.am
index 3398a5dc33..8e3a58a259 100644
--- a/lib/Makefile.am
+++ b/lib/Makefile.am
@@ -1,12 +1,15 @@
 include $(top_srcdir)/src/Common.am
 
 DIST_SUBDIRS = ntlmauth profiler rfcnb smblib libTrie snmplib
-SUBDIRS=$(makesnmplib)
+SUBDIRS=
 EXTRA_DIST=
 
 if USE_ESI
 SUBDIRS += libTrie
 endif
+if ENABLE_SNMP
+SUBDIRS += snmplib
+endif
 if ENABLE_XPROF_STATS
 SUBDIRS += profiler
 endif