Changeset e0a807ca49747f3403a280d5255b11e6ef26ad02

Timestamp:

09/29/11 00:50:55 (8 months ago)

Author:

Neutron Soutmun <neo.neutron@…>

Children:

928656f5b79b62a860c982ffd2989b6f9a40c4d3

Parents:

042b4814fa2a8b03499cb161d26f42807a2a2217

git-committer:

Neutron Soutmun <neo.neutron@…> (09/29/11 00:50:55)

Message:

Add netsnmp-module

• configure.ac:
  • Add AC_CONFIG_MACRO_DIR.
  • Add AC_PROG_LIBTOOL, LT_INIT.
  • Drop AC_PROG_RANLIB as superseded by AC_PROG_LIBTOOL.
  • Add --enable-netsnmp-module and check for "net-snmp-config" on enabled.
  • Add netsnmp-module/Makefile to AC_CONFIG_FILES.
• Makefile.am:
  • Add netsnmp-module to SUBDIRS.
• autogen.sh:
  • Add libtoolize.
• config.h.in:
  • Updated.
• netsnmp-module/*:
  • Add netsnmp-module and drafted RAHUNAS-MIB.

Files:

• Makefile.am (modified) (1 diff)
• autogen.sh (modified) (1 diff)
• config.h.in (modified) (1 diff)
• configure.ac (modified) (4 diffs)
• netsnmp-module/Makefile.am (added)
• netsnmp-module/mibs/RAHUNAS-MIB (added)
• netsnmp-module/rhsnmp.c (added)
• netsnmp-module/rhsnmp.h (added)

Makefile.am

@@ +1 @@
+ACLOCAL_AMFLAGS = -I m4
 EXTRA_DIST = weblogin
-SUBDIRS = xmlrpc lcfg src data tools example
+SUBDIRS = xmlrpc lcfg src data tools netsnmp-module example

autogen.sh

@@ -1 +1 @@
 #!/bin/sh
 
+libtoolize --force
 aclocal
 automake --add-missing

config.h.in

@@ -81 +81 @@
 #undef PACKAGE_TARNAME
 
+/* Define to the home page for this package. */
+#undef PACKAGE_URL
+
 /* Define to the version of this package. */
 #undef PACKAGE_VERSION

configure.ac

@@ -12 +12 @@
 AC_CONFIG_SRCDIR([src/rahunasd.h])
 AC_CONFIG_HEADER([config.h])
+AC_CONFIG_MACRO_DIR([m4])
 
 AC_SUBST(RAHUNAS_VERSION, major.minor.micro)
@@ -18 +19 @@
 # Checks for programs.
 AC_PROG_CC
-AC_PROG_RANLIB
 AC_PROG_INSTALL
+AC_PROG_LIBTOOL
+
+# Libtool init
+LT_INIT
 
 # Checks for libraries.
@@ -35 +39 @@
 AC_SUBST(LIBSQLITE3_CFLAGS)
 AC_SUBST(LIBSQLITE3_LIBS)
+
+dnl Disable snmp-module build
+AC_ARG_ENABLE(netsnmp-module,
+              [AC_HELP_STRING([--enable-netsnmp-module],
+                              [enable netsnmp-module build])],
+              enable_netsnmp_module="yes")
+
+if test "x$enable_netsnmp_module" = "xyes"; then
+  AC_CHECK_PROG(NETSNMP_CONFIG, net-snmp-config, net-snmp-config, no)
+  if test "x$NETSNMP_CONFIG" = "xno"; then
+    enable_netsnmp_module="no"
+  fi
+fi
+
+AM_CONDITIONAL(ENABLE_NETSNMP_MODULE,test "x$enable_netsnmp_module" = "xyes")
 
 # Checks for header files.
@@ -63 +82 @@
   tools/rahunas-bandwidth
   tools/rahunas-weblogin-config-update
+  netsnmp-module/Makefile
   example/Makefile
   example/rahunas.default