--- /dev/null
+--- net-snmp-5.0.7/local/Makefile.in.DESTDIR Wed Feb 12 16:28:42 2003
++++ net-snmp-5.0.7/local/Makefile.in Wed Feb 12 16:29:27 2003
+@@ -90,9 +90,9 @@
+
+ localinstall:
+ @if test "x$(PERLPROG)" != "x" ; then \
+- for i in $(PERLSCRIPTS) ; do $(INSTALL) $$i.made $(bindir)/$$i ; echo "install: installed $$i in $(bindir)" ; done ; \
+- $(SHELL) $(srcdir)/../mkinstalldirs $(snmplibdir) ; \
+- for i in $(DATASRCS) ; do $(INSTALL) $(srcdir)/$$i $(snmplibdir)/$$i ; echo "install: installed $$i in $(snmplibdir)" ; done ; \
+- for i in $(CONFDIRS); do $(SHELL) $(srcdir)/../mkinstalldirs $(CONFINSTALLDIR)/$$i ; done ; \
+- for i in $(CONFFILES); do $(INSTALL) $(srcdir)/$(CONFDATASRC)/$$i $(CONFINSTALLDIR)/$$i; echo "install: installed $$i in $(CONFINSTALLDIR)"; done \
++ for i in $(PERLSCRIPTS) ; do $(INSTALL) $$i.made $(DESTDIR)$(bindir)/$$i ; echo "install: installed $$i in $(DESTDIR)$(bindir)" ; done ; \
++ $(SHELL) $(srcdir)/../mkinstalldirs $(DESTDIR)$(snmplibdir) ; \
++ for i in $(DATASRCS) ; do $(INSTALL) $(srcdir)/$$i $(DESTDIR)$(snmplibdir)/$$i ; echo "install: installed $$i in $(DESTDIR)$(snmplibdir)" ; done ; \
++ for i in $(CONFDIRS); do $(SHELL) $(srcdir)/../mkinstalldirs $(DESTDIR)$(CONFINSTALLDIR)/$$i ; done ; \
++ for i in $(CONFFILES); do $(INSTALL) $(srcdir)/$(CONFDATASRC)/$$i $(DESTDIR)$(CONFINSTALLDIR)/$$i; echo "install: installed $$i in $(DESTDIR)$(CONFINSTALLDIR)"; done \
+ fi
+--- net-snmp-5.0.7/man/Makefile.in.DESTDIR Wed Feb 12 16:29:44 2003
++++ net-snmp-5.0.7/man/Makefile.in Wed Feb 12 16:30:53 2003
+@@ -143,19 +143,19 @@
+ cat default_store.3.h $(srcdir)/default_store.3.bot >> default_store.3
+
+ maninstall: maninstalldirs $(MAN1) $(MAN1G) $(MAN3) $(MAN5G) $(MAN8)
+- @for i in $(MAN1) ; do $(INSTALL) $(srcdir)/$$i $(man1dir) ; echo "install: installed $$i in $(man1dir)" ; done
+- @$(INSTALL) $(MAN1G) $(man1dir)
+- @for i in $(MAN1G) ; do echo "install: installed $$i in $(man1dir)" ; done
+- @for i in $(MAN3) ; do $(INSTALL) $(srcdir)/$$i $(man3dir) ; echo "install: installed $$i in $(man3dir)" ; done
+- @$(INSTALL) $(MAN3G) $(man3dir)
+- @for i in $(MAN3G) ; do echo "install: installed $$i in $(man3dir)" ; done
+- @$(INSTALL) $(MAN5G) $(man5dir)
+- @for i in $(MAN5G) ; do echo "install: installed $$i in $(man5dir)" ; done
+- @$(INSTALL) $(MAN8G) $(man8dir)
+- @for i in $(MAN8G) ; do echo "install: installed $$i in $(man8dir)" ; done
++ @for i in $(MAN1) ; do $(INSTALL) $(srcdir)/$$i $(DESTDIR)$(man1dir) ; echo "install: installed $$i in $(DESTDIR)$(man1dir)" ; done
++ @$(INSTALL) $(MAN1G) $(DESTDIR)$(man1dir)
++ @for i in $(MAN1G) ; do echo "install: installed $$i in $(DESTDIR)$(man1dir)" ; done
++ @for i in $(MAN3) ; do $(INSTALL) $(srcdir)/$$i $(DESTDIR)$(man3dir) ; echo "install: installed $$i in $(DESTDIR)$(man3dir)" ; done
++ @$(INSTALL) $(MAN3G) $(DESTDIR)$(man3dir)
++ @for i in $(MAN3G) ; do echo "install: installed $$i in $(DESTDIR)$(man3dir)" ; done
++ @$(INSTALL) $(MAN5G) $(DESTDIR)$(man5dir)
++ @for i in $(MAN5G) ; do echo "install: installed $$i in $(DESTDIR)$(man5dir)" ; done
++ @$(INSTALL) $(MAN8G) $(DESTDIR)$(man8dir)
++ @for i in $(MAN8G) ; do echo "install: installed $$i in $(DESTDIR)$(man8dir)" ; done
+
+ maninstalldirs:
+- @$(SHELL) $(srcdir)/../mkinstalldirs $(man1dir) $(man3dir) $(man5dir) $(man8dir)
++ @$(SHELL) $(srcdir)/../mkinstalldirs $(DESTDIR)$(man1dir) $(DESTDIR)$(man3dir) $(DESTDIR)$(man5dir) $(DESTDIR)$(man8dir)
+
+
+ #
+--- net-snmp-5.0.7/mibs/Makefile.in.DESTDIR Wed Feb 12 16:26:08 2003
++++ net-snmp-5.0.7/mibs/Makefile.in Wed Feb 12 16:25:53 2003
+@@ -51,9 +51,9 @@
+
+ mibsinstall: installdirs
+ @for i in $(MIBS) ; do \
+- $(INSTALL) $(srcdir)/$$i $(mibdir) ; \
+- echo "install: installed $$i in $(mibdir)" ; \
++ $(INSTALL) $(srcdir)/$$i $(DESTDIR)$(mibdir) ; \
++ echo "install: installed $$i in $(DESTDIR)$(mibdir)" ; \
+ done
+
+ installdirs:
+- @$(SHELL) $(srcdir)/../mkinstalldirs $(mibdir)
++ @$(SHELL) $(srcdir)/../mkinstalldirs $(DESTDIR)$(mibdir)
+--- net-snmp-5.0.7/Makefile.rules.DESTDIR Wed Feb 12 16:21:36 2003
++++ net-snmp-5.0.7/Makefile.rules Wed Feb 12 16:25:17 2003
+@@ -44,48 +44,48 @@
+
+ installlocalheaders:
+ @if test "$(INSTALLHEADERS)" != "" ; then \
+- echo creating directory $(includedir) ; \
++ echo creating directory $(DESTDIR)$(includedir) ; \
+ it="$(INSTALLHEADERS)" ; \
+- $(SHELL) $(top_srcdir)/mkinstalldirs $(includedir) ; \
++ $(SHELL) $(top_srcdir)/mkinstalldirs $(DESTDIR)$(includedir) ; \
+ for i in $$it ; do \
+- $(INSTALL) $(top_srcdir)/include/net-snmp/$$i $(includedir) ; \
+- echo "installing $$i in $(includedir)" ; \
++ $(INSTALL) $(top_srcdir)/include/net-snmp/$$i $(DESTDIR)$(includedir) ; \
++ echo "installing $$i in $(DESTDIR)$(includedir)" ; \
+ done \
+ fi
+ @if test "$(INSTALLBUILTHEADERS)" != "" ; then \
+- echo creating directory $(includedir) ; \
++ echo creating directory $(DESTDIR)$(includedir) ; \
+ it="$(INSTALLBUILTHEADERS)" ; \
+- $(SHELL) $(top_srcdir)/mkinstalldirs $(includedir) ; \
++ $(SHELL) $(top_srcdir)/mkinstalldirs $(DESTDIR)$(includedir) ; \
+ for i in $$it ; do \
+- $(INSTALL) $$i $(includedir) ; \
+- echo "installing $$i in $(includedir)" ; \
++ $(INSTALL) $$i $(DESTDIR)$(includedir) ; \
++ echo "installing $$i in $(DESTDIR)$(includedir)" ; \
+ done \
+ fi
+ @if test "$(INCLUDESUBDIRHEADERS)" != "" ; then \
+- echo creating directory $(includedir)/$(INCLUDESUBDIR) ; \
++ echo creating directory $(DESTDIR)$(includedir)/$(INCLUDESUBDIR) ; \
+ it="$(INCLUDESUBDIRHEADERS)" ; \
+- $(SHELL) $(top_srcdir)/mkinstalldirs $(includedir)/$(INCLUDESUBDIR) ; \
++ $(SHELL) $(top_srcdir)/mkinstalldirs $(DESTDIR)$(includedir)/$(INCLUDESUBDIR) ; \
+ for i in $$it ; do \
+- $(INSTALL) $(top_srcdir)/include/net-snmp/$(INCLUDESUBDIR)/$$i $(includedir)/$(INCLUDESUBDIR) ; \
+- echo "installing $$i in $(includedir)/$(INCLUDESUBDIR)" ; \
++ $(INSTALL) $(top_srcdir)/include/net-snmp/$(INCLUDESUBDIR)/$$i $(DESTDIR)$(includedir)/$(INCLUDESUBDIR) ; \
++ echo "installing $$i in $(DESTDIR)$(includedir)/$(INCLUDESUBDIR)" ; \
+ done \
+ fi
+ @if test "$(INCLUDESUBDIRHEADERS2)" != "" ; then \
+- echo creating directory $(includedir)/$(INCLUDESUBDIR2) ; \
++ echo creating directory $(DESTDIR)$(includedir)/$(INCLUDESUBDIR2) ; \
+ it="$(INCLUDESUBDIRHEADERS2)" ; \
+- $(SHELL) $(top_srcdir)/mkinstalldirs $(includedir)/$(INCLUDESUBDIR2) ; \
++ $(SHELL) $(top_srcdir)/mkinstalldirs $(DESTDIR)$(includedir)/$(INCLUDESUBDIR2) ; \
+ for i in $$it ; do \
+- $(INSTALL) $(top_srcdir)/include/net-snmp/$(INCLUDESUBDIR2)/$$i $(includedir)/$(INCLUDESUBDIR2) ; \
+- echo "installing $$i in $(includedir)/$(INCLUDESUBDIR2)" ; \
++ $(INSTALL) $(top_srcdir)/include/net-snmp/$(INCLUDESUBDIR2)/$$i $(DESTDIR)$(includedir)/$(INCLUDESUBDIR2) ; \
++ echo "installing $$i in $(DESTDIR)$(includedir)/$(INCLUDESUBDIR2)" ; \
+ done \
+ fi
+ @if test "$(INSTALLBUILTSUBDIRHEADERS)" != "" ; then \
+- echo creating directory $(includedir)/$(INSTALLBUILTSUBDIR) ; \
++ echo creating directory $(DESTDIR)$(includedir)/$(INSTALLBUILTSUBDIR) ; \
+ it="$(INSTALLBUILTSUBDIRHEADERS)" ; \
+- $(SHELL) $(top_srcdir)/mkinstalldirs $(includedir)/$(INSTALLBUILTSUBDIR) ; \
++ $(SHELL) $(top_srcdir)/mkinstalldirs $(DESTDIR)$(includedir)/$(INSTALLBUILTSUBDIR) ; \
+ for i in $$it ; do \
+- $(INSTALL) $$i $(includedir)/$(INSTALLBUILTSUBDIR) ; \
+- echo "installing $$i in $(includedir)/$(INSTALLBUILTSUBDIR)" ; \
++ $(INSTALL) $$i $(DESTDIR)$(includedir)/$(INSTALLBUILTSUBDIR) ; \
++ echo "installing $$i in $(DESTDIR)$(includedir)/$(INSTALLBUILTSUBDIR)" ; \
+ done \
+ fi
+
+@@ -103,12 +103,12 @@
+
+ installucdheaders:
+ @if test "$(INSTALLUCDHEADERS)" != "" ; then \
+- echo creating directory $(ucdincludedir) ; \
++ echo creating directory $(DESTDIR)$(ucdincludedir) ; \
+ it="$(INSTALLUCDHEADERS)" ; \
+- $(SHELL) $(top_srcdir)/mkinstalldirs $(ucdincludedir) ; \
++ $(SHELL) $(top_srcdir)/mkinstalldirs $(DESTDIR)$(ucdincludedir) ; \
+ for i in $$it ; do \
+- $(INSTALL) $(top_srcdir)/include/ucd-snmp/$$i $(ucdincludedir) ; \
+- echo "installing $$i in $(ucdincludedir)" ; \
++ $(INSTALL) $(top_srcdir)/include/ucd-snmp/$$i $(DESTDIR)$(ucdincludedir) ; \
++ echo "installing $$i in $(DESTDIR)$(ucdincludedir)" ; \
+ done \
+ fi
+
+@@ -122,11 +122,11 @@
+ installlocallibs: $(INSTALLLIBS)
+ @if test "$(INSTALLLIBS)" != ""; then \
+ it="$(INSTALLLIBS)" ; \
+- $(SHELL) $(top_srcdir)/mkinstalldirs $(libdir) ; \
+- $(INSTALL) $(INSTALLLIBS) $(libdir) ; \
++ $(SHELL) $(top_srcdir)/mkinstalldirs $(DESTDIR)$(libdir) ; \
++ $(INSTALL) $(INSTALLLIBS) $(DESTDIR)$(libdir) ; \
+ for i in $$it ; do \
+- echo "installing $$i in $(libdir)"; \
+- $(RANLIB) $(libdir)/$$i ; \
++ echo "installing $$i in $(DESTDIR)$(libdir)"; \
++ $(RANLIB) $(DESTDIR)$(libdir)/$$i ; \
+ done ; \
+ $(LIB_LDCONFIG_CMD) ; \
+ fi
+@@ -134,11 +134,11 @@
+ installucdlibs: $(INSTALLUCDLIBS)
+ @if test "$(INSTALLUCDLIBS)" != ""; then \
+ it="$(INSTALLUCDLIBS)" ; \
+- $(SHELL) $(top_srcdir)/mkinstalldirs $(libdir) ; \
+- $(INSTALL) $(INSTALLUCDLIBS) $(libdir) ; \
++ $(SHELL) $(top_srcdir)/mkinstalldirs $(DESTDIR)$(libdir) ; \
++ $(INSTALL) $(INSTALLUCDLIBS) $(DESTDIR)$(libdir) ; \
+ for i in $$it ; do \
+- echo "installing $$i in $(libdir)"; \
+- $(RANLIB) $(libdir)/$$i ; \
++ echo "installing $$i in $(DESTDIR)$(libdir)"; \
++ $(RANLIB) $(DESTDIR)$(libdir)/$$i ; \
+ done ; \
+ $(LIB_LDCONFIG_CMD) ; \
+ fi
+@@ -164,11 +164,11 @@
+
+ installlocalbin: $(INSTALLBINPROGS)
+ @if test "$(INSTALLBINPROGS) $(INSTALLBINSCRIPTS)" != " "; then \
+- $(SHELL) $(top_srcdir)/mkinstalldirs $(bindir) ; \
++ $(SHELL) $(top_srcdir)/mkinstalldirs $(DESTDIR)$(bindir) ; \
+ it="$(INSTALLBINPROGS) $(INSTALLBINSCRIPTS)" ; \
+- $(INSTALL) $(INSTALLBINPROGS) $(INSTALLBINSCRIPTS) $(bindir) ; \
++ $(INSTALL) $(INSTALLBINPROGS) $(INSTALLBINSCRIPTS) $(DESTDIR)$(bindir) ; \
+ for i in $$it ; do \
+- echo "installing $$i in $(bindir)"; \
++ echo "installing $$i in $(DESTDIR)$(bindir)"; \
+ done \
+ fi
+
+@@ -194,10 +194,10 @@
+ installlocalsbin: $(INSTALLSBINPROGS)
+ @if test "$(INSTALLSBINPROGS)" != ""; then \
+ it="$(INSTALLSBINPROGS)" ; \
+- $(SHELL) $(top_srcdir)/mkinstalldirs $(sbindir) ; \
+- $(INSTALL) $(INSTALLSBINPROGS) $(sbindir) ; \
++ $(SHELL) $(top_srcdir)/mkinstalldirs $(DESTDIR)$(sbindir) ; \
++ $(INSTALL) $(INSTALLSBINPROGS) $(DESTDIR)$(sbindir) ; \
+ for i in $$it ; do \
+- echo "installing $$i in $(sbindir)"; \
++ echo "installing $$i in $(DESTDIR)$(sbindir)"; \
+ done \
+ fi
+
+--- net-snmp-5.0.7/apps/Makefile.in.DESTDIR Wed Feb 12 16:58:57 2003
++++ net-snmp-5.0.7/apps/Makefile.in Wed Feb 12 16:59:24 2003
+@@ -112,5 +112,5 @@
+ $(LINK) -o $@ snmpdf.$(OSUFFIX) $(LOCAL_LIBS) ${LDFLAGS} ${LIBS}
+
+ snmpinforminstall:
+- rm -f $(bindir)/snmpinform$(EXEEXT)
+- $(LN_S) snmptrap$(EXEEXT) $(bindir)/snmpinform$(EXEEXT)
++ rm -f $(DESTDIR)$(bindir)/snmpinform$(EXEEXT)
++ $(LN_S) snmptrap$(EXEEXT) $(DESTDIR)$(bindir)/snmpinform$(EXEEXT)
--- /dev/null
+--- net-snmp-5.0.7/configure.in.wiget Fri Jan 10 23:38:31 2003
++++ net-snmp-5.0.7/configure.in Wed Feb 12 14:24:36 2003
+@@ -7,8 +7,8 @@
+ dnl
+ dnl save the configure arguments
+ dnl
+-AC_DEFINE_UNQUOTED(CONFIGURE_OPTIONS,"\"$ac_configure_args\"")
+-CONFIGURE_OPTIONS="\"$ac_configure_args\""
++AC_DEFINE_UNQUOTED(CONFIGURE_OPTIONS,"$ac_configure_args")
++CONFIGURE_OPTIONS="$ac_configure_args"
+ AC_SUBST(CONFIGURE_OPTIONS)
+
+ dnl
+@@ -555,9 +555,7 @@
+ dnl get version number.
+ AC_MSG_CHECKING(for net-snmp version number)
+ VERSION=`grep NetSnmpVersionInfo.*= $srcdir/snmplib/snmp_version.c | sed 's/";.*//;s/.*"//;s/pre/0./;'`
+-changequote(, )
+-RELEASEVERSION=`echo $VERSION | sed 's/^\([0-9]\)\.\([0-9]\)/\1:\2:0/'`
+-changequote([, ])
++RELEASEVERSION=`echo $VERSION | sed ['s/^\([0-9]\)\.\([0-9]\)/\1:\2:0/']`
+ AC_SUBST(VERSION)
+ AC_SUBST(RELEASEVERSION)
+ AC_MSG_RESULT($VERSION)
+@@ -575,10 +573,8 @@
+
+ dnl system check
+ AC_CANONICAL_SYSTEM
+-changequote(, )
+-PARTIALTARGETOS=`echo $target_os | sed 's/[-._].*//'`
++PARTIALTARGETOS=`echo $target_os | sed ['s/[-._].*//']`
+ CFLAGS="$CFLAGS -D$PARTIALTARGETOS"
+-changequote([, ])
+ AC_MSG_CACHE_ADD(Building for: $PARTIALTARGETOS)
+
+ dnl
+@@ -586,7 +582,6 @@
+ dnl
+
+ AC_MSG_CHECKING(for system include file)
+-changequote(, )
+ filebase=$target_os
+ dnl ignore binary format indication
+ filebase=`echo $filebase | sed 's/elf//'`
+@@ -596,9 +591,9 @@
+ while test "x$filebase" != "x$last" -a ! -f $srcdir/include/net-snmp/system/$filebase.h
+ do
+ last=$filebase
+- filebase=`echo $filebase | sed 's/[-._][^-._]*$//'`
++ filebase=`echo $filebase | sed ['s/[-._][^-._]*$//']`
+ if test "x$filebase" = "x$last"; then
+- filebase=`echo $filebase | sed 's/[0-9]*$//'`
++ filebase=`echo $filebase | sed ['s/[0-9]*$//']`
+ fi
+ done
+
+@@ -607,19 +602,17 @@
+ fi
+ ac_cv_SYSTEM_INCLUDE_FILE="net-snmp/system/$filebase.h"
+
+-changequote([, ])
+ AC_MSG_RESULT($ac_cv_SYSTEM_INCLUDE_FILE)
+ AC_DEFINE_UNQUOTED(SYSTEM_INCLUDE_FILE, "$ac_cv_SYSTEM_INCLUDE_FILE")
+
+ dnl second part, the CPU type.
+
+ AC_MSG_CHECKING(for machine-type include file)
+-changequote(, )
+ filebase=$target_cpu
+ while test "x$filebase" != "x$last" -a ! -f $srcdir/include/net-snmp/machine/$filebase.h
+ do
+ last=$filebase
+- filebase=`echo $filebase | sed 's/[-._][^-._]*$//'`
++ filebase=`echo $filebase | sed ['s/[-._][^-._]*$//']`
+ done
+
+ if test "x$filebase" = "x$last"; then
+@@ -628,7 +621,6 @@
+ ac_cv_MACHINE_INCLUDE_FILE="net-snmp/machine/$filebase.h"
+ AC_MSG_RESULT($ac_cv_MACHINE_INCLUDE_FILE)
+
+-changequote([, ])
+ AC_DEFINE_UNQUOTED(MACHINE_INCLUDE_FILE, "$ac_cv_MACHINE_INCLUDE_FILE")
+
+ AC_PATH_PROG(CCPATH,$CC)
+@@ -738,7 +730,7 @@
+ for i in v6d toshiba kame inria zeta linux-glibc linux-inet6; do
+ case $i in
+ v6d)
+- AC_EGREP_CPP(yes, [dnl
++ AC_EGREP_CPP(yes, [
+ #include </usr/local/v6/include/sys/types.h>
+ #ifdef __V6D__
+ yes
+@@ -748,7 +740,7 @@
+ CFLAGS="-I/usr/local/v6/include $CFLAGS"])
+ ;;
+ toshiba)
+- AC_EGREP_CPP(yes, [dnl
++ AC_EGREP_CPP(yes, [
+ #include <sys/param.h>
+ #ifdef _TOSHIBA_INET6
+ yes
+@@ -758,7 +750,7 @@
+ CFLAGS="-DINET6 $CFLAGS"])
+ ;;
+ kame)
+- AC_EGREP_CPP(yes, [dnl
++ AC_EGREP_CPP(yes, [
+ #include <netinet/in.h>
+ #ifdef __KAME__
+ yes
+@@ -769,7 +761,7 @@
+ CFLAGS="-DINET6 $CFLAGS"])
+ ;;
+ inria)
+- AC_EGREP_CPP(yes, [dnl
++ AC_EGREP_CPP(yes, [
+ #include <netinet/in.h>
+ #ifdef IPV6_INRIA_VERSION
+ yes
+@@ -781,7 +773,7 @@
+ CFLAGS="-DINET6 $CFLAGS"])
+ ;;
+ zeta)
+- AC_EGREP_CPP(yes, [dnl
++ AC_EGREP_CPP(yes, [
+ #include <sys/param.h>
+ #ifdef _ZETA_MINAMI_INET6
+ A
+@@ -792,7 +784,7 @@
+ CFLAGS="-DINET6 $CFLAGS"])
+ ;;
+ linux-glibc)
+- AC_EGREP_CPP(yes, [dnl
++ AC_EGREP_CPP(yes, [
+ #include <features.h>
+ #if defined(__GLIBC__) && ((__GLIBC__ == 2 && __GLIBC_MINOR__ >= 1) || (__GLIBC_ > 2))
+ yes
+@@ -841,7 +833,6 @@
+
+ if test "x$with_res_locks" = "xyes"; then
+ AC_DEFINE(NS_REENTRANT)
+-EOF
+
+ case $target_os in
+
+@@ -1049,7 +1040,6 @@
+ dnl
+ dnl Do hairy agent module processing.
+ dnl
+-changequote(, )
+ AC_MSG_CHECKING(for and configuring mib modules to use)
+
+ mibdir="agent/mibgroup"
+@@ -1098,9 +1088,7 @@
+ done
+
+ AC_MSG_RESULT($new_module_list.)
+-changequote([, ])
+ AC_MSG_CACHE_ADD(Agent MIB code: $new_module_list)
+-changequote(, )
+
+ AC_MSG_CHECKING(for and configuring mib modules pieces to use)
+ while test "x$new_module_list" != "x"; do
+@@ -1170,7 +1158,7 @@
+ fi
+ fi
+ if test "x`echo $i | sed 's/\///g;'`" != "x$i"; then
+- mnd=`echo $i | sed 's/\/[^/]*$//;'`
++ mnd=`echo $i | sed ['s/\/[^/]*$//;']`
+ if test ! -d ./$mibdir/$mnd; then
+ module_directories="$module_directories ./$mibdir/$mnd"
+ fi
+@@ -1178,8 +1166,8 @@
+ if grep config_load_mib $srcdir/$mibdir/$i.h > /dev/null 2>&1; then
+ AC_MSG_WARN(mib module "$i" uses the "config_load_mib" directive, which is no longer supported. It probably won't work.)
+ fi
+- grep config_parse_dot_conf $srcdir/$mibdir/$i.h | sed 's@.*config_parse_dot_conf(\([^)]*\), *\([^),]*\), *\([^),]*\), *\([^),]*\)).*@register_config_handler("snmpd",\1, \2, \3, \4);@' >> $mibdir/mib_module_dot_conf.h
+- sym="`echo ${i} | sed 's/[^a-zA-Z0-9_]/_/g' | tr 'abcdefghijklmnopqrstuvwxyz' 'ABCDEFGHIJKLMNOPQRSTUVWXYZ'`"
++ grep config_parse_dot_conf $srcdir/$mibdir/$i.h | sed ['s@.*config_parse_dot_conf(\([^)]*\), *\([^),]*\), *\([^),]*\), *\([^),]*\)).*@register_config_handler("snmpd",\1, \2, \3, \4);@'] >> $mibdir/mib_module_dot_conf.h
++ sym="`echo ${i} | sed ['s/[^a-zA-Z0-9_]/_/g'] | tr 'abcdefghijklmnopqrstuvwxyz' 'ABCDEFGHIJKLMNOPQRSTUVWXYZ'`"
+ echo "/* Define if compiling with the ${i} module files. */" >> include/net-snmp/agent/mib_module_config.h
+ echo "#define USING_${sym}_MODULE 1" >> include/net-snmp/agent/mib_module_config.h
+ echo " " >> include/net-snmp/agent/mib_module_config.h
+@@ -1189,12 +1177,11 @@
+ new_module_list="$new_list_two"
+ new_list_two=""
+ done
+-module_list_o=`echo "$module_list_code " | sed 's/\([^ ]\) /\1.o /g'`
+-module_list_lo=`echo "$module_list_code " | sed 's/\([^ ]\) /\1.lo /g'`
+-module_list_c=`echo "$module_list_code " | sed 's/\([^ ]\) /\1.c /g'`
+-mibgroup_list_o=`echo " $module_list_o " | sed 's@ \([^ ]*\)\.o@ mibgroup/\1.o @g'`
+-mibgroup_list_lo=`echo " $module_list_lo " | sed 's@ \([^ ]*\)\.lo@ mibgroup/\1.lo @g'`
+-changequote([, ])
++module_list_o=`echo "$module_list_code " | sed ['s/\([^ ]\) /\1.o /g']`
++module_list_lo=`echo "$module_list_code " | sed ['s/\([^ ]\) /\1.lo /g']`
++module_list_c=`echo "$module_list_code " | sed ['s/\([^ ]\) /\1.c /g']`
++mibgroup_list_o=`echo " $module_list_o " | sed ['s@ \([^ ]*\)\.o@ mibgroup/\1.o @g']`
++mibgroup_list_lo=`echo " $module_list_lo " | sed ['s@ \([^ ]*\)\.lo@ mibgroup/\1.lo @g']`
+ MODULE_LIST=$module_list_code
+ AC_SUBST(MODULE_LIST)
+ AC_SUBST(module_list_c)
+@@ -1352,39 +1339,39 @@
+ fi
+
+ _libs=${LIBS}
+- AC_CHECK_HEADER(tcpd.h, ,
+- AC_MSG_ERROR(Asked to use libwrap but I couldn't find tcpd.h.))
++ AC_CHECK_HEADER(tcpd.h, ,[
++ AC_MSG_ERROR(Asked to use libwrap but I couldn't find tcpd.h.)])
+
+ LIBS="$LIBS -lwrap"
+ AC_MSG_CHECKING(for TCP wrappers library -lwrap)
+ AC_TRY_LINK([#include <tcpd.h>
+ int allow_severity = 0;
+ int deny_severity = 0;
+- ],[hosts_access((void *)0)],
++ ],[hosts_access((void *)0)],[
+
+ AC_MSG_RESULT(yes)
+ AC_DEFINE(USE_LIBWRAP)
+ test "$with_libwrap" != no -a "$with_libwrap" != yes && WRAPLIBS="-L$with_libwrap/lib"
+- WRAPLIBS="$WRAPLIBS -lwrap",
++ WRAPLIBS="$WRAPLIBS -lwrap"],[
+
+ AC_MSG_RESULT(no)
+ dnl Linux RedHat 6.1 won't link libwrap without libnsl
+- AC_CHECK_FUNC(yp_get_default_domain, ,
+- AC_CHECK_LIB(nsl, yp_get_default_domain))
++ AC_CHECK_FUNC(yp_get_default_domain, ,[
++ AC_CHECK_LIB(nsl, yp_get_default_domain)])
+ AC_MSG_CHECKING(for TCP wrappers library -lwrap linked with -lnsl)
+ AC_TRY_LINK([#include <tcpd.h>
+ int allow_severity = 0;
+ int deny_severity = 0;
+- ],[hosts_access((void *)0)],
++ ],[hosts_access((void *)0)],[
+
+ AC_MSG_RESULT(yes)
+ AC_DEFINE(USE_LIBWRAP)
+ test "$with_libwrap" != no -a "$with_libwrap" != yes && WRAPLIBS="-L$with_libwrap/lib"
+- WRAPLIBS="$WRAPLIBS -lwrap -lnsl",
++ WRAPLIBS="$WRAPLIBS -lwrap -lnsl"],[
+
+ AC_MSG_RESULT(no)
+- AC_MSG_ERROR(Asked to use libwrap but I couldn't find it.))
+- CPPFLAGS=${_cppflags})
++ AC_MSG_ERROR(Asked to use libwrap but I couldn't find it.)])
++ CPPFLAGS=${_cppflags}])
+ LDFLAGS=${_ldflags}
+ LIBS=${_libs}
+ fi
+@@ -1639,17 +1626,15 @@
+ dnl so we do it by hand.
+ AC_MSG_CHECKING(for socklen_t)
+ AC_CACHE_VAL(ac_cv_type_$1,
+-[AC_EGREP_CPP(dnl
+-changequote(<<,>>)dnl
+-<<socklen_t[^a-zA-Z_0-9]>>dnl
+-changequote([,]), [#include <sys/types.h>
++[AC_EGREP_CPP([socklen_t[^a-zA-Z_0-9]]
++, [#include <sys/types.h>
+ #if STDC_HEADERS
+ #include <stdlib.h>
+ #include <stddef.h>
+ #endif
+ #ifdef HAVE_SYS_SOCKET_H
+ #include <sys/socket.h>
+-#endif], ac_cv_type_socklen_t=yes, ac_cv_type_socklen_t=no)])dnl
++#endif], [ac_cv_type_socklen_t=yes], [ac_cv_type_socklen_t=no])])
+
+ AC_MSG_RESULT($ac_cv_type_socklen_t)
+ if test $ac_cv_type_socklen_t = yes; then
+@@ -1659,10 +1644,8 @@
+ dnl AIX keeps in_addr_t in /usr/include/netinet/in.h
+ AC_MSG_CHECKING(for in_addr_t)
+ AC_CACHE_VAL(ac_cv_type_$1,
+-[AC_EGREP_CPP(dnl
+-changequote(<<,>>)dnl
+-<<in_addr_t[^a-zA-Z_0-9]>>dnl
+-changequote([,]), [#include <sys/types.h>
++[AC_EGREP_CPP([in_addr_t[^a-zA-Z_0-9]]
++, [#include <sys/types.h>
+ #if STDC_HEADERS
+ #include <stdlib.h>
+ #include <stddef.h>
+--- ucd-snmp-4.2.4/acconfig.h.orig Thu Feb 7 16:39:26 2002
++++ ucd-snmp-4.2.4/acconfig.h Thu Apr 25 21:24:51 2002
+@@ -49,9 +49,11 @@
+ #undef _REENTRANT
+
+ /* debugging stuff */
+-#undef SNMP_NO_DEBUGGING /* if defined, we optimize the code
++#undef SNMP_NO_DEBUGGING
++ /* if defined, we optimize the code
+ to exclude all debugging calls. */
+-#define SNMP_ALWAYS_DEBUG 0 /* Always print debugging information and
++#define SNMP_ALWAYS_DEBUG 0
++ /* Always print debugging information and
+ ignore the -D flag passed to the cmds */
+
+ /* reverse encoding BER packets is both faster and more efficient in space. */
--- /dev/null
+diff -Nru ucd-snmp-4.2.1/acinclude.m4 ucd-snmp-4.2.1.new/acinclude.m4
+--- ucd-snmp-4.2.1/acinclude.m4 Thu Jan 1 01:00:00 1970
++++ ucd-snmp-4.2.1.new/acinclude.m4 Fri May 18 06:48:59 2001
+@@ -0,0 +1,192 @@
++dnl @synopsis AC_PROMPT_USER_NO_DEFINE(VARIABLENAME,QUESTION,[DEFAULT])
++dnl
++dnl Asks a QUESTION and puts the results in VARIABLENAME with an optional
++dnl DEFAULT value if the user merely hits return.
++dnl
++dnl @version 1.15
++dnl @author Wes Hardaker <hardaker@users.sourceforge.net>
++dnl
++AC_DEFUN([AC_PROMPT_USER_NO_DEFINE],
++dnl changequote(<<, >>) dnl
++dnl <<
++[
++if test "x$defaults" = "xno"; then
++echo $ac_n "$2 ($3): $ac_c"
++read tmpinput
++if test "$tmpinput" = "" -a "$3" != ""; then
++ tmpinput="$3"
++fi
++eval $1=\"$tmpinput\"
++else
++tmpinput="$3"
++eval $1=\"$tmpinput\"
++fi
++]
++dnl >>
++dnl changequote([, ])
++) dnl done AC_PROMPT_USER
++
++dnl @synopsis AC_PROMPT_USER(VARIABLENAME,QUESTION,[DEFAULT],QUOTED)
++dnl
++dnl Asks a QUESTION and puts the results in VARIABLENAME with an optional
++dnl DEFAULT value if the user merely hits return. Also calls
++dnl AC_DEFINE_UNQUOTED() on the VARIABLENAME for VARIABLENAMEs that should
++dnl be entered into the config.h file as well. If QUOTED is "quoted" then
++dnl the result will be defined within quotes.
++dnl
++dnl @version 1.15
++dnl @author Wes Hardaker <hardaker@users.sourceforge.net>
++dnl
++AC_DEFUN([AC_PROMPT_USER],
++[
++MSG_CHECK=`echo "$2" | tail -1`
++AC_CACHE_CHECK($MSG_CHECK, ac_cv_user_prompt_$1,
++[echo "" >&AC_FD_MSG
++AC_PROMPT_USER_NO_DEFINE($1,[$2],$3)
++eval ac_cv_user_prompt_$1=\$$1
++echo $ac_n "setting $MSG_CHECK to... $ac_c" >&AC_FD_MSG
++])
++if test "$ac_cv_user_prompt_$1" != "none"; then
++ if test "x$4" = "xquoted" -o "x$4" = "xQUOTED"; then
++ AC_DEFINE_UNQUOTED($1,"$ac_cv_user_prompt_$1")
++ else
++ AC_DEFINE_UNQUOTED($1,$ac_cv_user_prompt_$1)
++ fi
++fi
++]) dnl
++
++dnl @synopsis AC_CHECK_STRUCT_FOR(INCLUDES,STRUCT,MEMBER,DEFINE,[no])
++dnl
++dnl Checks STRUCT for MEMBER and defines DEFINE if found.
++dnl
++dnl @version 1.15
++dnl @author Wes Hardaker <hardaker@users.sourceforge.net>
++dnl
++AC_DEFUN(AC_CHECK_STRUCT_FOR,[
++
++ac_safe_struct=`echo "$2" | sed 'y%./+-%__p_%'`
++ac_safe_member=`echo "$3" | sed 'y%./+-%__p_%'`
++ac_safe_all="ac_cv_struct_${ac_safe_struct}_has_${ac_safe_member}"
++changequote(, )dnl
++ ac_uc_define=STRUCT_`echo "${ac_safe_struct}_HAS_${ac_safe_member}" | sed 'y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%'`
++changequote([, ])dnl
++
++AC_MSG_CHECKING([for $2.$3])
++AC_CACHE_VAL($ac_safe_all,
++[
++if test "x$4" = "x"; then
++ defineit="= 0"
++elif test "x$4" = "xno"; then
++ defineit=""
++else
++ defineit="$4"
++fi
++AC_TRY_COMPILE([
++$1
++],[
++struct $2 testit;
++testit.$3 $defineit;
++], eval "${ac_safe_all}=yes", eval "${ac_safe_all}=no" )
++])
++
++if eval "test \"x$`echo ${ac_safe_all}`\" = \"xyes\""; then
++ AC_MSG_RESULT(yes)
++ AC_DEFINE_UNQUOTED($ac_uc_define)
++else
++ AC_MSG_RESULT(no)
++fi
++
++])
++
++dnl AC_CHECK_IFNET_FOR(SUBSTRUCT,[no])
++AC_DEFUN(AC_CHECK_IFNET_FOR,[
++dnl check for $1 in struct ifnet
++AC_CHECK_STRUCT_FOR([
++#ifdef IFNET_NEEDS_KERNEL
++#define _KERNEL 1
++#endif
++#include <sys/types.h>
++#include <sys/socket.h>
++#ifdef HAVE_SYS_TIME_H
++#include <sys/time.h>
++#endif
++#include <net/if.h>
++#ifdef HAVE_NET_IF_VAR_H
++#include <net/if_var.h>
++#endif
++#ifdef HAVE_SYS_QUEUE_H
++#include <sys/queue.h>
++#endif
++#ifdef linux
++struct ifnet {
++ char *if_name; /* name, e.g. "en" or "lo" */
++ short if_unit; /* sub-unit for lower level driver */
++ short if_mtu; /* maximum transmission unit */
++ short if_flags; /* up/down, broadcast, etc. */
++ int if_metric; /* routing metric (external only) */
++ char if_hwaddr [6]; /* ethernet address */
++ int if_type; /* interface type: 1=generic,
++ 28=slip, ether=6, loopback=24 */
++ int if_speed; /* interface speed: in bits/sec */
++
++ struct sockaddr if_addr; /* interface's address */
++ struct sockaddr ifu_broadaddr; /* broadcast address */
++ struct sockaddr ia_subnetmask; /* interface's mask */
++
++ struct ifqueue {
++ int ifq_len;
++ int ifq_drops;
++ } if_snd; /* output queue */
++ int if_ibytes; /* octets received on interface */
++ int if_ipackets; /* packets received on interface */
++ int if_ierrors; /* input errors on interface */
++ int if_iqdrops; /* input queue overruns */
++ int if_obytes; /* octets sent on interface */
++ int if_opackets; /* packets sent on interface */
++ int if_oerrors; /* output errors on interface */
++ int if_collisions; /* collisions on csma interfaces */
++/* end statistics */
++ struct ifnet *if_next;
++};
++#endif
++], ifnet, $1, $2)
++])
++
++dnl
++dnl Add a search path to the LIBS and CFLAGS variables
++dnl
++AC_DEFUN(AC_ADD_SEARCH_PATH,[
++ if test "x$1" != x -a -d $1; then
++ if test -d $1/lib; then
++ LDFLAGS="-L$1/lib $LDFLAGS"
++ fi
++ if test -d $1/include; then
++ CPPFLAGS="-I$1/include $CPPFLAGS"
++ fi
++ fi
++])
++
++dnl
++dnl Store information for displaying later.
++dnl
++AC_DEFUN(AC_MSG_CACHE_INIT,[
++ rm -f configure-summary
++])
++
++AC_DEFUN(AC_MSG_CACHE_ADD,[
++ cat >> configure-summary << EOF
++ $1
++EOF
++])
++
++AC_DEFUN(AC_MSG_CACHE_DISPLAY,[
++ echo ""
++ echo "---------------------------------------------------------"
++ echo " Net-SNMP configuration summary:"
++ echo "---------------------------------------------------------"
++ echo ""
++ cat configure-summary
++ echo ""
++ echo "---------------------------------------------------------"
++ echo ""
++])
--- /dev/null
+--- net-snmp-5.0.7/configure.in.wiget Wed Feb 12 16:04:32 2003
++++ net-snmp-5.0.7/configure.in Wed Feb 12 16:08:36 2003
+@@ -1403,24 +1403,6 @@
+ AC_CHECK_LIB(z, gzread, , CPPFLAGS=${_cppflags} LDFLAGS=${_ldflags}),
+ CPPFLAGS=${_cppflags} LDFLAGS=${_ldflags})
+
+- dnl two variants of bzip2 need checking.
+- AC_CHECK_LIB(bz2, bzread, [_rpmlibs="$_rpmlibs -lbz2"],
+- AC_CHECK_LIB(bz2, BZ2_bzread, [_rpmlibs="$_rpmlibs -lbz2"],))
+-
+- dnl two variants of db1 need checking.
+- AC_CHECK_LIB(db1, dbopen, [_rpmlibs="-ldb1 $_rpmlibs"],
+- AC_CHECK_LIB(db, dbopen, [_rpmlibs="-ldb $_rpmlibs"]))
+-
+- dnl two variants of db3 need checking.
+- AC_CHECK_LIB(db-3.1, db_create, [_rpmlibs="-ldb-3.1 $_rpmlibs"],
+- AC_CHECK_LIB(db-3.0, db_create, [_rpmlibs="-ldb-3.0 $_rpmlibs"]))
+-
+- dnl rpm-3.0.5 and later needs popt.
+- AC_CHECK_LIB(popt, poptParseArgvString, [_rpmlibs="-lpopt $_rpmlibs"])
+-
+- dnl rpm-4.0.x needs rpmio.
+- AC_CHECK_LIB(rpmio, Fopen, [_rpmlibs="-lrpmio $_rpmlibs"],,$_rpmlibs)
+-
+ dnl now check for rpm using the appropriate libraries.
+ AC_CHECK_LIB(rpm, rpmGetFilesystemList,[
+ AC_DEFINE(HAVE_LIBRPM)
projects / packages / net-snmp.git / commitdiff