doc: fix regex-typo in Japanese and Korean lxc-monitor(1)

[mirror_lxc.git] / configure.ac

diff --git a/configure.ac b/configure.ac
index 30d66eea9fc94d8379a07ec24580027d458434b8..fcfec39cdeacdc466337cf15a0ebd5f57cc27faa 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -1,14 +1,14 @@
 #                                               -*- Autoconf -*-
 # Process this file with autoconf to produce a configure script.
 
-m4_define([lxc_devel], 1)
+m4_define([lxc_devel], 0)
 m4_define([lxc_version_major], 2)
-m4_define([lxc_version_minor], 0)
+m4_define([lxc_version_minor], 1)
 m4_define([lxc_version_micro], 0)
 m4_define([lxc_version_beta], [])
 
 m4_define([lxc_abi_major], 1)
-m4_define([lxc_abi_minor], 2)
+m4_define([lxc_abi_minor], 3)
 m4_define([lxc_abi_micro], 0)
 m4_define([lxc_abi], [lxc_abi_major.lxc_abi_minor.lxc_abi_micro])
 
@@ -114,13 +114,13 @@ case "$with_init_script" in
                        fedora|altlinux|opensuse*)
                                init_script=systemd
                                ;;
-                       redhat|centos|oracle|oracleserver|sparclinux|plamo)
+                       redhat|oracle|oracleserver|sparclinux|plamo)
                                init_script=sysvinit
                                ;;
-                       debian|raspbian)
-                               init_script=upstart,systemd
+                       centos)
+                               init_script=sysvinit,systemd
                                ;;
-                       ubuntu)
+                       debian|raspbian|ubuntu)
                                init_script=upstart,systemd
                                ;;
                        pld)
@@ -558,7 +558,7 @@ AC_ARG_WITH([cgroup-pattern],
        [AC_HELP_STRING(
                [--with-cgroup-pattern=pattern],
                [pattern for container cgroups]
-       )], [], [with_cgroup_pattern=['/lxc/%n']])
+       )], [], [with_cgroup_pattern=['lxc/%n']])
 
 # Container log path.  By default, use $lxcpath.
 AC_MSG_CHECKING([Whether to place logfiles in container config path])
@@ -785,6 +785,7 @@ AC_CONFIG_FILES([
        doc/lxc-top.sgml
        doc/lxc-unfreeze.sgml
        doc/lxc-unshare.sgml
+       doc/lxc-update-config.sgml
        doc/lxc-user-nic.sgml
        doc/lxc-usernsexec.sgml
        doc/lxc-wait.sgml
@@ -914,6 +915,7 @@ AC_CONFIG_FILES([
        src/lxc/lxc.functions
        src/lxc/tools/lxc-checkconfig
        src/lxc/tools/lxc-start-ephemeral
+       src/lxc/tools/lxc-update-config
        src/lxc/version.h
        src/python-lxc/Makefile