bug fix

[ultramonkey-l7/ultramonkey-l7-v3.git] / configure.in

diff --git a/configure.in b/configure.in
index 93e5272..46bf7a1 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -1,7 +1,7 @@
 AC_PREREQ(2.59)
 AC_INIT(l7vsd)
 PACKAGENAME=l7vsd
-VERSION=3.0.0-0
+VERSION=3.0.0
 
 AM_INIT_AUTOMAKE($PACKAGENAME, $VERSION, no-define )
 AC_CONFIG_SRCDIR([config.h.in])
@@ -21,14 +21,22 @@ AC_CHECK_LIB(log4cxx, main, :,
        [AC_MSG_ERROR( l7vsd require log4cxx library. )] )
 AC_CHECK_LIB(rt, main, :,
        [AC_MSG_ERROR( l7vsd require rt library. )] )
-AC_CHECK_LIB(boost_thread-gcc41-mt, main, :,
+AC_CHECK_LIB(boost_thread-mt, main, :,
        [AC_MSG_ERROR( l7vsd require boost library. )] )
-AC_CHECK_LIB(boost_system-gcc41-mt, main, :,
+AC_CHECK_LIB(boost_system-mt, main, :,
        [AC_MSG_ERROR( l7vsd require boost library. )] )
+AC_CHECK_LIB([netsnmp], main, :,
+       [AC_MSG_ERROR( l7vsd require netsnmp library. )] )
 
 # Checks for header files.
 AC_CHECK_HEADERS([limits.h unistd.h])
 
+# Checks for declarations.
+AC_CHECK_DECLS([IP_TRANSPARENT], [], [], [[
+       #include <sys/socket.h>
+       #include <linux/in.h>
+]])
+
 # Checks for typedefs, structures, and compiler characteristics.
 AC_HEADER_STDBOOL
 AC_C_CONST
@@ -47,13 +55,14 @@ if test `uname -m` == "x86_64"; then
        AC_SUBST( libdir, [/usr/lib64] )
 else
        AC_SUBST( libdir, [/usr/lib] )
+       AC_SUBST( CXXFLAGS, -march=i686 )
 fi
 
 AC_ARG_WITH(
        l7vs-moddir,
        [       --with-l7vs-moddir=DIR  l7vs module is to be installed in DIR.
                                                                [default=LIBDIR/l7vs] ],
-       [       l7vs_moddir-"$withval" ],
+       [       l7vs_moddir="$withval" ],
        [       l7vs_moddir="${libdir}/l7vs" ]
 )
 
@@ -67,7 +76,7 @@ AC_ARG_WITH(
 
 AC_ARG_WITH(
        l7vs-buffer-size,
-       [       --wigh-l7vs-buffer-size=NUM     l7vsd using heap buffer size.
+       [       --with-l7vs-buffer-size=NUM     l7vsd using heap buffer size.
                                                                        [default=4096] ],
        [       l7vs_max_buffer_size="$withval" ],
        [       l7vs_max_buffer_size=4096 ]
@@ -88,18 +97,21 @@ AC_SUBST(l7vs_moddir)
 AC_SUBST(l7vs_max_buffer_size)
 AC_SUBST(l7vs_config)
 AC_SUBST(MANDIR)
-AC_SUBST(snmpagent_libs)
+AC_SUBST(external_agent_libs, `net-snmp-config --external-agent-libs`)
+AC_SUBST(ultramonkeyl7_version,ultramonkeyl7-$VERSION)
 
 AC_CONFIG_FILES([doc/Makefile]
+                [doc/conf/Makefile]
+                [doc/sslfiles/Makefile]
+                [doc/heartbeat-ra/Makefile]
+               [doc/mibs/Makefile]
                 [l7directord/Makefile]
                 [l7vsd/Makefile]
                 [l7vsd/init.d/Makefile]
-                [l7vsd/modtester/Makefile]
                 [l7vsd/module/Makefile]
                 [l7vsd/module/protocol/Makefile]
                 [l7vsd/module/schedule/Makefile]
                 [l7vsd/src/Makefile]
-                [snmpagent/Makefile]
                 [Makefile])
 
 AC_OUTPUT(l7vsd.spec)