first step of snmp/smux patches from

	Jochen Friedrich <jochen+freeradius-devel@scram.de>

	- configuration settings, no source code changes

diff --git a/Make.inc.in b/Make.inc.in
index 8180893..3b29000 100644 (file)
--- a/Make.inc.in
+++ b/Make.inc.in
@@ -34,6 +34,9 @@ LCRYPT                = @CRYPTLIB@
 LDBM           = @DBMLIB@
 LIBS           = @LIBS@
 
+SNMPLIB                = @SNMPLIB@
+SNMPINC                = @SNMPINC@
+
 LOGDIR         = @logdir@
 RADDBDIR       = @raddbdir@
 RUNDIR         = @localstatedir@/run

diff --git a/acconfig.h b/acconfig.h
index e56285c..4af4805 100644 (file)
--- a/acconfig.h
+++ b/acconfig.h
@@ -77,4 +77,7 @@ config.h - created by autoconf; contains defines generated by autoconf
 /* use a pool of threads to handle requests, instead of spawning threads? */
 #undef WITH_THREAD_POOL
 
+/* Include SNMP subagent */
+#undef WITH_SNMP
+
 @BOTTOM@

diff --git a/configure.in b/configure.in
index ba5c969..c3ac071 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -261,6 +261,23 @@ AC_ARG_WITH(thread-pool,
   esac ]
 )
 
+dnl extra argument: --with-snmp
+AC_ARG_WITH(snmp,
+[  --with-snmp             Compile in SNMP support],
+[ case "$withval" in
+    no)
+       ;;
+    yes)
+       AC_DEFINE(WITH_SNMP)
+       SNMPLIB="-lsnmp -lcrypto"
+       SNMPINC=-I/usr/include/ucd-snmp
+  esac ]
+)
+
+AC_SUBST(SNMPLIB)
+AC_SUBST(SNMPINC)
+
+
 AC_ARG_ENABLE(ltdl-install,
 [  --disable-ltdl-install  do not install libltdl])
 if test x"${enable_ltdl_install+set}" != xset; then
@@ -426,7 +443,6 @@ AC_CHECK_HEADERS( \
        utmp.h \
        utmpx.h \
        sys/select.h \
-       dlfcn.h \
        regex.h \
        syslog.h \
        inttypes.h \

diff --git a/src/include/autoconf.h.in b/src/include/autoconf.h.in
index 6b3c96f..6c43d87 100644 (file)
--- a/src/include/autoconf.h.in
+++ b/src/include/autoconf.h.in
@@ -87,6 +87,9 @@ config.h - created by autoconf; contains defines generated by autoconf
 /* use a pool of threads to handle requests, instead of spawning threads? */
 #undef WITH_THREAD_POOL
 
+/* Include SNMP subagent */
+#undef WITH_SNMP
+
 /* The number of bytes in a unsigned int.  */
 #undef SIZEOF_UNSIGNED_INT
 
@@ -144,9 +147,6 @@ config.h - created by autoconf; contains defines generated by autoconf
 /* Define if you have the <dirent.h> header file.  */
 #undef HAVE_DIRENT_H
 
-/* Define if you have the <dlfcn.h> header file.  */
-#undef HAVE_DLFCN_H
-
 /* Define if you have the <errno.h> header file.  */
 #undef HAVE_ERRNO_H
 
@@ -162,6 +162,9 @@ config.h - created by autoconf; contains defines generated by autoconf
 /* Define if you have the <ndir.h> header file.  */
 #undef HAVE_NDIR_H
 
+/* Define if you have the <netinet/in.h> header file.  */
+#undef HAVE_NETINET_IN_H
+
 /* Define if you have the <pthread.h> header file.  */
 #undef HAVE_PTHREAD_H
 
@@ -186,6 +189,9 @@ config.h - created by autoconf; contains defines generated by autoconf
 /* Define if you have the <sys/time.h> header file.  */
 #undef HAVE_SYS_TIME_H
 
+/* Define if you have the <sys/types.h> header file.  */
+#undef HAVE_SYS_TYPES_H
+
 /* Define if you have the <syslog.h> header file.  */
 #undef HAVE_SYSLOG_H