Moved snmplib to lib/

diff --git a/CREDITS b/CREDITS
index cf99ccce234bb4129cf5bfc00202a43a2de882a1..6535df159dc606c767072e498ef2daae22907845 100644 (file)
--- a/CREDITS
+++ b/CREDITS
@@ -115,7 +115,7 @@ Modified to work with strings instead of files.
 
 ==============================================================================
 
-snmplib/*:
+lib/snmplib/*:
 include/{asn1.h,parse.h,snmp*}:
 
 The SNMP library code is developed by Carnegie Mellon University.

diff --git a/Makefile.am b/Makefile.am
index ca9910928410800ecdb5788ba0158fbc4bc45068..af8dea245f6461b210987965115c79ffeebbd5bd 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -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

diff --git a/configure.ac b/configure.ac
index 1f14f6c3a74e7ab91a6fe92684cb88562f57254b..202f30b67594d8b00f8faefb9dc57552975fce6b 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -1126,7 +1126,7 @@ SQUID_DEFINE_BOOL(SQUID_SNMP,${enable_snmp:=yes},
    [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 @@ AC_CONFIG_FILES([\
        lib/profiler/Makefile \
        lib/rfcnb/Makefile \
        lib/smblib/Makefile \
+       lib/snmplib/Makefile \
        scripts/Makefile \
        src/Makefile \
        src/anyp/Makefile \
@@ -3430,7 +3431,6 @@ AC_CONFIG_FILES([\
        src/mgr/Makefile \
        src/snmp/Makefile \
        contrib/Makefile \
-       snmplib/Makefile \
        icons/Makefile \
        errors/Makefile \
        test-suite/Makefile \

diff --git a/lib/Makefile.am b/lib/Makefile.am
index 5b7d72cc70cbc8fa13af5001ef1833099d1880d9..3398a5dc3323b48f9bde58430abb4b09fe4a900a 100644 (file)
--- a/lib/Makefile.am
+++ b/lib/Makefile.am
@@ -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

diff --git a/snmplib/CMU-SNMP-ReleaseNotes.txt b/lib/snmplib/CMU-SNMP-ReleaseNotes.txt
similarity index 100%
rename from snmplib/CMU-SNMP-ReleaseNotes.txt
rename to lib/snmplib/CMU-SNMP-ReleaseNotes.txt

diff --git a/snmplib/Makefile.am b/lib/snmplib/Makefile.am
similarity index 100%
rename from snmplib/Makefile.am
rename to lib/snmplib/Makefile.am

diff --git a/snmplib/asn1.c b/lib/snmplib/asn1.c
similarity index 100%
rename from snmplib/asn1.c
rename to lib/snmplib/asn1.c

diff --git a/snmplib/coexistance.c b/lib/snmplib/coexistance.c
similarity index 100%
rename from snmplib/coexistance.c
rename to lib/snmplib/coexistance.c

diff --git a/snmplib/mib.c b/lib/snmplib/mib.c
similarity index 100%
rename from snmplib/mib.c
rename to lib/snmplib/mib.c

diff --git a/snmplib/parse.c b/lib/snmplib/parse.c
similarity index 100%
rename from snmplib/parse.c
rename to lib/snmplib/parse.c

diff --git a/snmplib/snmp_api.c b/lib/snmplib/snmp_api.c
similarity index 100%
rename from snmplib/snmp_api.c
rename to lib/snmplib/snmp_api.c

diff --git a/snmplib/snmp_api_error.c b/lib/snmplib/snmp_api_error.c
similarity index 100%
rename from snmplib/snmp_api_error.c
rename to lib/snmplib/snmp_api_error.c

diff --git a/snmplib/snmp_error.c b/lib/snmplib/snmp_error.c
similarity index 100%
rename from snmplib/snmp_error.c
rename to lib/snmplib/snmp_error.c

diff --git a/snmplib/snmp_msg.c b/lib/snmplib/snmp_msg.c
similarity index 100%
rename from snmplib/snmp_msg.c
rename to lib/snmplib/snmp_msg.c

diff --git a/snmplib/snmp_pdu.c b/lib/snmplib/snmp_pdu.c
similarity index 100%
rename from snmplib/snmp_pdu.c
rename to lib/snmplib/snmp_pdu.c

diff --git a/snmplib/snmp_vars.c b/lib/snmplib/snmp_vars.c
similarity index 100%
rename from snmplib/snmp_vars.c
rename to lib/snmplib/snmp_vars.c

diff --git a/snmplib/snmplib_debug.c b/lib/snmplib/snmplib_debug.c
similarity index 100%
rename from snmplib/snmplib_debug.c
rename to lib/snmplib/snmplib_debug.c

diff --git a/src/Makefile.am b/src/Makefile.am
index a883992c98332f80abbcc8fed63aa3e40819966c..8daabe6e19fe34a394fd7449f1247e3558b95298 100644 (file)
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -925,7 +925,7 @@ DEFAULT_ERROR_DIR   = $(datadir)/errors
 # 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)