------------------------------------------------------------
revno: 13211
revision-id: squid3@treenet.co.nz-20140108042904-4o3ap1i1y096zxmb
parent: rousskov@measurement-factory.com-20140106205513-pak1e1425tblja4n
committer: Amos Jeffries <squid3@treenet.co.nz>
branch nick: trunk
timestamp: Tue 2014-01-07 21:29:04 -0700
message:
  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.
------------------------------------------------------------
# Bazaar merge directive format 2 (Bazaar 0.90)
# revision_id: squid3@treenet.co.nz-20140108042904-4o3ap1i1y096zxmb
# target_branch: http://bzr.squid-cache.org/bzr/squid3/trunk/
# testament_sha1: 0c9bd080136d4d43d7f6efabe504a03d6613f3eb
# timestamp: 2014-01-08 04:55:56 +0000
# source_branch: http://bzr.squid-cache.org/bzr/squid3/trunk/
# base_revision_id: rousskov@measurement-factory.com-20140106205513-\
#   pak1e1425tblja4n
# 
# Begin patch
=== modified file 'configure.ac'
--- configure.ac	2013-12-12 09:41:39 +0000
+++ configure.ac	2014-01-08 04:29:04 +0000
@@ -1127,11 +1127,9 @@
 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],

=== modified file 'lib/Makefile.am'
--- lib/Makefile.am	2013-10-25 09:11:33 +0000
+++ lib/Makefile.am	2014-01-08 04:29:04 +0000
@@ -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