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 46791ddc2e3f2325f32e7d1627608e56f67a480a..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)
@@ -370,8 +370,11 @@ fi
 AM_CONDITIONAL([ENABLE_CAP], [test "x$enable_capabilities" = "xyes"])
 
 AM_COND_IF([ENABLE_CAP],
-       [AC_CHECK_LIB(cap,cap_set_proc,[true],[AC_MSG_ERROR([You are missing libcap support.])])
-       AC_SUBST([CAP_LIBS], [-lcap])])
+       [AC_CHECK_HEADER([sys/capability.h],[],[AC_MSG_ERROR([You must install the libcap development package in order to compile lxc])])
+       AC_CHECK_LIB(cap,cap_set_proc,[],[AC_MSG_ERROR([You must install the libcap development package in order to compile lxc])])
+        # Test whether we support getting file capabilities via cap_get_file().
+        AC_CHECK_LIB(cap,cap_get_file, AC_DEFINE(LIBCAP_SUPPORTS_FILE_CAPABILITIES,1,[Have cap_get_file]),[],[])
+        AC_SUBST([CAP_LIBS], [-lcap])])
 
 # HAVE_SCMP_FILTER_CTX=1 will tell us we have libseccomp api >= 1.0.0
 OLD_CFLAGS="$CFLAGS"
@@ -555,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])
@@ -638,7 +641,10 @@ AC_CHECK_DECLS([PR_SET_NO_NEW_PRIVS], [], [], [#include <sys/prctl.h>])
 AC_CHECK_DECLS([PR_GET_NO_NEW_PRIVS], [], [], [#include <sys/prctl.h>])
 
 # Check for some headers
-AC_CHECK_HEADERS([sys/signalfd.h pty.h ifaddrs.h sys/capability.h sys/memfd.h sys/personality.h utmpx.h sys/timerfd.h])
+AC_CHECK_HEADERS([sys/signalfd.h pty.h ifaddrs.h sys/memfd.h sys/personality.h utmpx.h sys/timerfd.h sys/resource.h])
+
+# lookup major()/minor()/makedev()
+AC_HEADER_MAJOR
 
 # Check for some syscalls functions
 AC_CHECK_FUNCS([setns pivot_root sethostname unshare rand_r confstr faccessat gettid memfd_create])
@@ -661,6 +667,10 @@ AC_CHECK_FUNCS([fgetln],
        AM_CONDITIONAL(HAVE_FGETLN, true)
        AC_DEFINE(HAVE_FGETLN,1,[Have fgetln]),
        AM_CONDITIONAL(HAVE_FGETLN, false))
+AC_CHECK_FUNCS([prlimit],
+       AM_CONDITIONAL(HAVE_PRLIMIT, true)
+       AC_DEFINE(HAVE_PRLIMIT,1,[Have prlimit]),
+       AM_CONDITIONAL(HAVE_PRLIMIT, false))
 
 # Check for some libraries
 AC_SEARCH_LIBS(sem_open, [rt pthread])
@@ -742,6 +752,8 @@ AC_CONFIG_FILES([
        config/templates/sparclinux.userns.conf
        config/templates/voidlinux.common.conf
        config/templates/voidlinux.userns.conf
+       config/templates/sabayon.common.conf
+       config/templates/sabayon.userns.conf
        config/templates/userns.conf
        config/yum/Makefile
        config/sysconfig/Makefile
@@ -773,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
@@ -882,6 +895,7 @@ AC_CONFIG_FILES([
        templates/lxc-debian
        templates/lxc-download
        templates/lxc-fedora
+       templates/lxc-fedora-legacy
        templates/lxc-gentoo
        templates/lxc-openmandriva
        templates/lxc-opensuse
@@ -894,12 +908,14 @@ AC_CONFIG_FILES([
        templates/lxc-ubuntu-cloud
        templates/lxc-sparclinux
        templates/lxc-voidlinux
+       templates/lxc-sabayon
 
        src/Makefile
        src/lxc/Makefile
        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