------------------------------------------------------------
revno: 13061
revision-id: kinkie@squid-cache.org-20131025091133-hmu443azckujjcog
parent: squidadm@squid-cache.org-20131025001346-7mmetcbiaqjme95t
committer: Francesco Chemolli <kinkie@squid-cache.org>
branch nick: trunk
timestamp: Fri 2013-10-25 11:11:33 +0200
message:
  Moved snmplib to lib/
------------------------------------------------------------
# Bazaar merge directive format 2 (Bazaar 0.90)
# revision_id: kinkie@squid-cache.org-20131025091133-hmu443azckujjcog
# target_branch: http://bzr.squid-cache.org/bzr/squid3/trunk/
# testament_sha1: 22e7a8916897efcc9c049fe00b32ef9992cff3b4
# timestamp: 2013-10-25 10:03:08 +0000
# source_branch: http://bzr.squid-cache.org/bzr/squid3/trunk/
# base_revision_id: squidadm@squid-cache.org-20131025001346-\
#   7mmetcbiaqjme95t
# 
# Begin patch
=== modified file 'CREDITS'
--- CREDITS	2013-04-28 10:58:35 +0000
+++ CREDITS	2013-10-25 09:11:33 +0000
@@ -115,7 +115,7 @@
 
 ==============================================================================
 
-snmplib/*:
+lib/snmplib/*:
 include/{asn1.h,parse.h,snmp*}:
 
 The SNMP library code is developed by Carnegie Mellon University.

=== modified file 'Makefile.am'
--- Makefile.am	2012-08-05 11:11:02 +0000
+++ Makefile.am	2013-10-25 09:11:33 +0000
@@ -2,8 +2,8 @@
 #
 
 AUTOMAKE_OPTIONS = dist-bzip2 subdir-objects 1.5 foreign
-DIST_SUBDIRS	= compat lib libltdl snmplib scripts icons errors contrib doc helpers src test-suite tools
-SUBDIRS		= compat lib $(makesnmplib)
+DIST_SUBDIRS	= compat lib libltdl scripts icons errors contrib doc helpers src test-suite tools
+SUBDIRS		= compat lib
 if USE_LOADABLE_MODULES
 SUBDIRS += libltdl
 endif

=== modified file 'configure.ac'
--- configure.ac	2013-10-24 16:01:56 +0000
+++ configure.ac	2013-10-25 09:11:33 +0000
@@ -1126,7 +1126,7 @@
    [Define to enable SNMP monitoring of Squid])
 AM_CONDITIONAL(ENABLE_SNMP, [test "x$enable_snmp" = "xyes"])
 if test "x$enable_snmp" = "xyes"; then
-    SNMPLIB='../snmplib/libsnmplib.a'
+    SNMPLIB='../lib/snmplib/libsnmplib.a'
     makesnmplib=snmplib
 fi
 AC_MSG_NOTICE([SNMP support enabled: $enable_snmp])
@@ -3401,6 +3401,7 @@
 	lib/profiler/Makefile \
 	lib/rfcnb/Makefile \
 	lib/smblib/Makefile \
+	lib/snmplib/Makefile \
 	scripts/Makefile \
 	src/Makefile \
 	src/anyp/Makefile \
@@ -3430,7 +3431,6 @@
 	src/mgr/Makefile \
 	src/snmp/Makefile \
 	contrib/Makefile \
-	snmplib/Makefile \
 	icons/Makefile \
 	errors/Makefile \
 	test-suite/Makefile \

=== modified file 'lib/Makefile.am'
--- lib/Makefile.am	2013-05-04 11:50:26 +0000
+++ lib/Makefile.am	2013-10-25 09:11:33 +0000
@@ -1,7 +1,7 @@
 include $(top_srcdir)/src/Common.am
 
-DIST_SUBDIRS = ntlmauth profiler rfcnb smblib libTrie
-SUBDIRS=
+DIST_SUBDIRS = ntlmauth profiler rfcnb smblib libTrie snmplib
+SUBDIRS=$(makesnmplib)
 EXTRA_DIST=
 
 if USE_ESI

=== renamed directory 'snmplib' => 'lib/snmplib'
=== modified file 'src/Makefile.am'
--- src/Makefile.am	2013-10-22 21:04:38 +0000
+++ src/Makefile.am	2013-10-25 09:11:33 +0000
@@ -925,7 +925,7 @@
 # Make location configure settings available to the code
 DEFS += -DDEFAULT_CONFIG_FILE=\"$(DEFAULT_CONFIG_FILE)\" -DDEFAULT_SQUID_DATA_DIR=\"$(datadir)\" -DDEFAULT_SQUID_CONFIG_DIR=\"$(sysconfdir)\"
 
-snmp_core.o snmp_agent.o: ../snmplib/libsnmplib.a $(top_srcdir)/include/cache_snmp.h
+snmp_core.o snmp_agent.o: ../lib/snmplib/libsnmplib.a $(top_srcdir)/include/cache_snmp.h
 
 globals.cc: globals.h mk-globals-c.awk
 	$(AWK) -f $(srcdir)/mk-globals-c.awk < $(srcdir)/globals.h > $@ || ($(RM) -f $@ && exit 1)