diff options
author | Sergey Poznyakoff <gray@gnu.org> | 2015-09-25 02:20:55 +0300 |
---|---|---|
committer | Sergey Poznyakoff <gray@gnu.org> | 2015-09-25 02:20:55 +0300 |
commit | 34436febd6259f78ceb573d5c7e8d7642523d811 (patch) | |
tree | d8f37779dc0d1b4c8e44ea8daa6db896cbd3de60 | |
parent | 146dbdb524bbf3f164c39e0f16184feb73aa1e7c (diff) | |
download | varnish-mib-34436febd6259f78ceb573d5c7e8d7642523d811.tar.gz varnish-mib-34436febd6259f78ceb573d5c7e8d7642523d811.tar.bz2 |
Minor changes.
* configure.ac (MIBDIR): Change default value
* src/Makefile.am (mib_DATA): Set to VARNISH-MIB.txt
* src/VARNISH-MIB.txt
-rw-r--r-- | configure.ac | 2 | ||||
-rw-r--r-- | src/Makefile.am | 2 | ||||
-rw-r--r-- | src/VARNISH-MIB.txt | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/configure.ac b/configure.ac index 297f8a7..d571518 100644 --- a/configure.ac +++ b/configure.ac @@ -64,13 +64,13 @@ AC_ARG_WITH([dlmoddir], [installation directory for net-snmp loadable agents])], [case $withval in /*) DLMODDIR=$withval;; *) AC_MSG_ERROR([argument to --with-dlmoddir must be absolute pathname]) esac]) -AC_SUBST([MIBDIR],['$(datarootdir)/snmp']) +AC_SUBST([MIBDIR],['$(datarootdir)/snmp/mibs']) AC_ARG_WITH([mibdir], [AC_HELP_STRING([--with-mibdir=DIR], [installation directory for MIB files])], [case $withval in /*) MIBDIR=$withval;; *) AC_MSG_ERROR([argument to --with-mibdir must be absolute pathname]) diff --git a/src/Makefile.am b/src/Makefile.am index 3c066f1..48c786b 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -52,11 +52,11 @@ AM_LDFLAGS = \ $(NET_SNMP_LIBS)\ $(NET_SNMP_EXLIBS) AM_CPPFLAGS=-I. ${VARNISHAPI_CFLAGS} mibdir=@MIBDIR@ -mib_DATA = varnish_mib.mib2c +mib_DATA = VARNISH-MIB.txt dist_man_MANS = varnish-mib.8 EXTRA_DIST = VARNISH-MIB.txt varnish_mib.mib2c diff --git a/src/VARNISH-MIB.txt b/src/VARNISH-MIB.txt index 71556c4..5686ee0 100644 --- a/src/VARNISH-MIB.txt +++ b/src/VARNISH-MIB.txt @@ -11,13 +11,13 @@ VARNISH-MIB DEFINITIONS ::= BEGIN IMPORTS MODULE-IDENTITY, OBJECT-TYPE, enterprises, Counter64, TimeTicks, Unsigned32 FROM SNMPv2-SMI DateAndTime FROM SNMPv2-TC - InetAddressIPv4, InetAddressIPv6, InetPortNumber, + InetAddressIPv4, InetAddressIPv6, InetPortNumber FROM INET-ADDRESS-MIB OBJECT-GROUP, MODULE-COMPLIANCE FROM SNMPv2-CONF; varnishMIB MODULE-IDENTITY LAST-UPDATED "201411280837Z" |