Merge branch 'duplicated-logcheck' into buildenv

[ultramonkey-l7/ultramonkey-l7-v2.git] / configure.ac

diff --git a/configure.ac b/configure.ac
index ee009dc..66806bf 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -1,14 +1,11 @@
 #                                               -*- Autoconf -*-
 # Process this file with autoconf to produce a configure script.
 
-m4_define([UML7VERSION], 2.1.2)
-m4_define([UML7PATCHLV], 2)
-# For additional releasename (ex. m4_define([UML7RELSUFFIX], [rc1]) for rc1)
-m4_define([UML7RELSUFFIX], [atfix])
+m4_define([uml7_ver], esyscmd([./genvers.sh]))
 
 AC_PREREQ(2.59)
 AC_INIT([ultramonkey-l7],
-       UML7VERSION[-]UML7PATCHLV[]UML7RELSUFFIX,
+       uml7_ver,
        [ultramonkey-l7-develop@lists.sourceforge.jp])
 
 ## set default value
@@ -116,9 +113,6 @@ AC_ARG_WITH(
 )
 
 AC_SUBST(CC,g++)
-AC_SUBST(uml7version, UML7VERSION)
-AC_SUBST(uml7patchlv, UML7PATCHLV)
-AC_SUBST(uml7relsuffix, UML7RELSUFFIX)
 AC_SUBST(l7vs_moddir)
 AC_SUBST(l7vs_logdir)
 AC_SUBST(l7vsadm_sockdir)
@@ -127,7 +121,6 @@ AC_SUBST(snmpagent_libs)
 
 AC_CONFIG_FILES([Makefile
                  conf/Makefile
-                 debian/Makefile
                  doc/Makefile
                  doc/heartbeat-ra/Makefile
                  init.d/Makefile
@@ -139,6 +132,7 @@ AC_CONFIG_FILES([Makefile
                  module/schedule/Makefile
                  parameter/Makefile
                  snmpagent/Makefile
-                 src/Makefile])
+                 src/Makefile
+                ])
 
-AC_OUTPUT(ultramonkeyl7.spec)
+AC_OUTPUT