Merge branch 'del_vs_crash_fix' into v3.1.0-devel

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

diff --git a/configure.in b/configure.in
index cc97836..f4eef72 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
+VERSION=3.1.0
 
 AM_INIT_AUTOMAKE($PACKAGENAME, $VERSION, no-define )
 AC_CONFIG_SRCDIR([config.h.in])
@@ -57,6 +57,7 @@ else
        AC_SUBST( libdir, [/usr/lib] )
        AC_SUBST( CXXFLAGS, -march=i686 )
 fi
+AC_SUBST( includedir, [/usr/include] )
 
 AC_ARG_WITH(
        l7vs-moddir,
@@ -67,6 +68,16 @@ AC_ARG_WITH(
 )
 
 AC_ARG_WITH(
+        l7vs-includedir,
+        [       --with-l7vs-includedir=DIR      l7vs headerfile is to be installed in DIR.
+
+                                                                [default=INCLUDEDIR/l7vs]
+],
+        [       l7vs_includedir="$withval" ],
+        [       l7vs_includedir="${includedir}/l7vs" ]
+)
+
+AC_ARG_WITH(
        l7vsadm-sockdir,
        [       --with-l7vsadm-sockdir=DIR      l7vsadm sockfile PATH.
                                                                        [default=/var/run/l7vs] ],
@@ -94,6 +105,7 @@ AC_SUBST(CC,g++)
 AC_SUBST(exec_prefix, [/usr] )
 AC_SUBST(l7vsadm_sockdir)
 AC_SUBST(l7vs_moddir)
+AC_SUBST(l7vs_includedir) 
 AC_SUBST(l7vs_max_buffer_size)
 AC_SUBST(l7vs_config)
 AC_SUBST(MANDIR)
@@ -105,6 +117,7 @@ AC_CONFIG_FILES([doc/Makefile]
                 [doc/sslfiles/Makefile]
                 [doc/heartbeat-ra/Makefile]
                [doc/mibs/Makefile]
+               [doc/man/Makefile]
                 [l7directord/Makefile]
                 [l7vsd/Makefile]
                 [l7vsd/init.d/Makefile]
@@ -114,4 +127,4 @@ AC_CONFIG_FILES([doc/Makefile]
                 [l7vsd/src/Makefile]
                 [Makefile])
 
-AC_OUTPUT() 
+AC_OUTPUT