Merge branch 'v3.1.0-devel'

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

diff --git a/configure.in b/configure.in
index 8b984e9..16e0674 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -1,7 +1,7 @@
 AC_PREREQ(2.59)
 AC_INIT(l7vsd)
 PACKAGENAME=l7vsd
-VERSION=3.0.1
+VERSION=3.1.0
 
 AM_INIT_AUTOMAKE($PACKAGENAME, $VERSION, no-define )
 AC_CONFIG_SRCDIR([config.h.in])
@@ -50,28 +50,30 @@ AC_FUNC_MKTIME
 AC_FUNC_STRFTIME
 AC_CHECK_FUNCS([gethostname localtime_r memset])
 
-# application-specific option
-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] ],
+                                                               [default=${libdir}/l7vs] ],
        [       l7vs_moddir="$withval" ],
        [       l7vs_moddir="${libdir}/l7vs" ]
 )
 
 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] ],
+                                                                       [default=${localstatedir}/run/l7vs] ],
        [       l7vsadm_sockdir="$withval" ],
-       [       l7vsadm_sockdir="/var/run/l7vs" ]
+       [       l7vsadm_sockdir="${localstatedir}/run/l7vs" ]
 )
 
 AC_ARG_WITH(
@@ -85,15 +87,15 @@ AC_ARG_WITH(
 AC_ARG_WITH(
        l7vs-config-dir,
        [       --with-l7vs-config-dir=DIR      l7vs configfile PATH.
-                                                                       [default=/etc/l7vs/l7vs.cf] ],
+                                                                       [default=${sysconfdir}/l7vs] ],
        [       l7vs_config="$withval" ],
-       [       l7vs_config="/etc/l7vs/l7vs.cf" ]
+       [       l7vs_config="${sysconfdir}/l7vs"        ]
 )
 
 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 +107,11 @@ AC_CONFIG_FILES([doc/Makefile]
                 [doc/sslfiles/Makefile]
                 [doc/heartbeat-ra/Makefile]
                [doc/mibs/Makefile]
+               [doc/man/Makefile]
+               [doc/moduledevel/Makefile]
+               [doc/moduledevel/sample/Makefile]
+               [doc/moduledevel/sample/protocol/Makefile]
+               [doc/moduledevel/sample/schedule/Makefile]
                 [l7directord/Makefile]
                 [l7vsd/Makefile]
                 [l7vsd/init.d/Makefile]
@@ -112,6 +119,7 @@ AC_CONFIG_FILES([doc/Makefile]
                 [l7vsd/module/protocol/Makefile]
                 [l7vsd/module/schedule/Makefile]
                 [l7vsd/src/Makefile]
+               [l7vsd/include/Makefile]
                 [Makefile])
 
 AC_OUTPUT