Install the mibs in <prefix>/share/snmp/mibs

diff --git a/Make.inc.in b/Make.inc.in
index cdb60d40222112cf8dd9928d9c2bedee51a0e25b..0e3edb8cb37c8427e9305502dff72fc3a4352d7d 100644 (file)
--- a/Make.inc.in
+++ b/Make.inc.in
@@ -16,6 +16,7 @@ docdir                = @docdir@
 mandir         = @mandir@
 datadir                = @datadir@
 dictdir                = @dictdir@
+mibdir         = @mibdir@
 logdir         = @logdir@
 includedir     = @includedir@
 

diff --git a/Makefile b/Makefile
index 15a97dba04d49c91e6c211ed25f8c7a9df9b4625..e762b96f402d9eec0bf9dbfc61b917ab977ed2f4 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -171,13 +171,20 @@ export DESTDIR := $(R)
 endif
 
 DICTIONARIES := $(wildcard $(addsuffix /dictionary*,$(addprefix share/dictionary/,$(PROTOCOLS))))
+MIBS = $(wildcard share/snmp/mibs/*.mib)
 
-install.share: $(addprefix $(R)$(dictdir)/,$(patsubst share/dictionary/%,%,$(DICTIONARIES)))
+install.share: \
+       $(addprefix $(R)$(dictdir)/,$(patsubst share/dictionary/%,%,$(DICTIONARIES))) \
+       $(addprefix $(R)$(mibdir)/,$(patsubst share/snmp/mibs/%,%,$(MIBS)))
 
 $(R)$(dictdir)/%: share/dictionary/%
        @echo INSTALL $(patsubst share/dictionary/%,%,$<)
        @$(INSTALL) -m 644 $< $@
 
+$(R)$(mibdir)/%: share/snmp/mibs/%
+       @echo INSTALL $(patsubst share/snmp/mibs/%,%,$<)
+       @$(INSTALL) -m 644 $< $@
+
 .PHONY: dictionary.format
 dictionary.format: $(DICTIONARIES)
        @./scripts/dict/format.pl $(DICTIONARIES)

diff --git a/configure b/configure
index 4b72bb594d8e5abaae99599719a204366e94b24a..aee0df68cff069c003544a98f104274f54cc577c 100755 (executable)
--- a/configure
+++ b/configure
@@ -683,6 +683,7 @@ RUSERS
 SNMPWALK
 SNMPGET
 modconfdir
+mibdir
 dictdir
 raddbdir
 radacctdir
@@ -792,6 +793,7 @@ with_logdir
 with_radacctdir
 with_raddbdir
 with_dictdir
+with_mibdir
 with_cap
 with_cap_lib_dir
 with_cap_include_dir
@@ -1498,6 +1500,7 @@ Optional Packages:
   --with-radacctdir=DIR   directory for detail files LOGDIR/radacct
   --with-raddbdir=DIR     directory for config files SYSCONFDIR/raddb
   --with-dictdir=DIR      directory for dictionary files DATAROOTDIR/freeradius
+  --with-mibdir=DIR      directory for dictionary files DATAROOTDIR/snmp
   --with-cap              build with cap if available (default=yes)
   --with-cap-lib-dir=DIR  directory in which to look for cap library files
   --with-cap-include-dir=DIR
@@ -7095,6 +7098,33 @@ fi
 { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $dictdir" >&5
 printf "%s\n" "$dictdir" >&6; }
 
+mibdir='${datarootdir}/snmp/mibs'
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking mibdir" >&5
+printf %s "checking mibdir... " >&6; }
+
+# Check whether --with-mibdir was given.
+if test ${with_mibdir+y}
+then :
+  withval=$with_mibdir;  case "$withval" in
+  no)
+    as_fn_error $? "Need mibdir" "$LINENO" 5
+    ;;
+  yes)
+    ;;
+  [\\/$]* | ?:[\\/]* )
+    mibdir="$withval"
+    ;;
+  *)
+    as_fn_error $? "expected an absolute directory name for --with-mibdir: $withval" "$LINENO" 5
+    ;;
+  esac
+
+fi
+
+
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $mibdir" >&5
+printf "%s\n" "$mibdir" >&6; }
+
 modconfdir='${raddbdir}/mods-config'
 
 

diff --git a/configure.ac b/configure.ac
index 56e9600e2cbcbd1cd183778cbc7c417bed8c73cd..142774b86d615fc04dc694bbd3706435eaee74cf 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -677,6 +677,30 @@ AC_ARG_WITH(dictdir,
 AC_SUBST(dictdir)
 AC_MSG_RESULT($dictdir)
 
+dnl #
+dnl #  extra argument: --with-mibdir
+dnl #
+mibdir='${datarootdir}/snmp/mibs'
+AC_MSG_CHECKING(mibdir)
+AC_ARG_WITH(mibdir,
+[  --with-mibdir=DIR      directory for dictionary files [DATAROOTDIR/snmp] ],
+[ case "$withval" in
+  no)
+    AC_MSG_ERROR([Need mibdir])
+    ;;
+  yes)
+    ;;
+  [[\\/$]]* | ?:[[\\/]]* )
+    mibdir="$withval"
+    ;;
+  *)
+    AC_MSG_ERROR([expected an absolute directory name for --with-mibdir: $withval])
+    ;;
+  esac ]
+)
+AC_SUBST(mibdir)
+AC_MSG_RESULT($mibdir)
+
 modconfdir='${raddbdir}/mods-config'
 AC_SUBST(modconfdir)
 

diff --git a/mibs/FREERADIUS-MGMT-MIB.mib b/share/snmp/mibs/FREERADIUS-MGMT-MIB.mib
similarity index 100%
rename from mibs/FREERADIUS-MGMT-MIB.mib
rename to share/snmp/mibs/FREERADIUS-MGMT-MIB.mib

diff --git a/mibs/FREERADIUS-NOTIFICATION-MIB.mib b/share/snmp/mibs/FREERADIUS-NOTIFICATION-MIB.mib
similarity index 100%
rename from mibs/FREERADIUS-NOTIFICATION-MIB.mib
rename to share/snmp/mibs/FREERADIUS-NOTIFICATION-MIB.mib

diff --git a/mibs/FREERADIUS-PRODUCT-RADIUSD-MIB.mib b/share/snmp/mibs/FREERADIUS-PRODUCT-RADIUSD-MIB.mib
similarity index 100%
rename from mibs/FREERADIUS-PRODUCT-RADIUSD-MIB.mib
rename to share/snmp/mibs/FREERADIUS-PRODUCT-RADIUSD-MIB.mib

diff --git a/mibs/FREERADIUS-SMI.mib b/share/snmp/mibs/FREERADIUS-SMI.mib
similarity index 100%
rename from mibs/FREERADIUS-SMI.mib
rename to share/snmp/mibs/FREERADIUS-SMI.mib

diff --git a/mibs/RADIUS-ACC-CLIENT-MIB.mib b/share/snmp/mibs/RADIUS-ACC-CLIENT-MIB.mib
similarity index 100%
rename from mibs/RADIUS-ACC-CLIENT-MIB.mib
rename to share/snmp/mibs/RADIUS-ACC-CLIENT-MIB.mib

diff --git a/mibs/RADIUS-ACC-SERVER-MIB.mib b/share/snmp/mibs/RADIUS-ACC-SERVER-MIB.mib
similarity index 100%
rename from mibs/RADIUS-ACC-SERVER-MIB.mib
rename to share/snmp/mibs/RADIUS-ACC-SERVER-MIB.mib

diff --git a/mibs/RADIUS-AUTH-CLIENT-MIB.mib b/share/snmp/mibs/RADIUS-AUTH-CLIENT-MIB.mib
similarity index 100%
rename from mibs/RADIUS-AUTH-CLIENT-MIB.mib
rename to share/snmp/mibs/RADIUS-AUTH-CLIENT-MIB.mib

diff --git a/mibs/RADIUS-AUTH-SERVER-MIB.mib b/share/snmp/mibs/RADIUS-AUTH-SERVER-MIB.mib
similarity index 100%
rename from mibs/RADIUS-AUTH-SERVER-MIB.mib
rename to share/snmp/mibs/RADIUS-AUTH-SERVER-MIB.mib

diff --git a/mibs/RADIUS-STAT-MIB.mib b/share/snmp/mibs/RADIUS-STAT-MIB.mib
similarity index 100%
rename from mibs/RADIUS-STAT-MIB.mib
rename to share/snmp/mibs/RADIUS-STAT-MIB.mib

diff --git a/mibs/README b/share/snmp/mibs/README
similarity index 100%
rename from mibs/README
rename to share/snmp/mibs/README