configure: replace deprecated AM_CONFIG_HEADER

[mirror_lxc.git] / configure.ac

diff --git a/configure.ac b/configure.ac
index e7e3a7e711047d87df85b17388b4968289b31a01..aaedabb8f4a289c59c6d123be3942f91c141765d 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -1,11 +1,11 @@
 #                                               -*- Autoconf -*-
 # Process this file with autoconf to produce a configure script.
 
-AC_INIT([lxc], [0.9.0.alpha2])
+AC_INIT([lxc], [0.9.0.alpha3])
 
 AC_CONFIG_SRCDIR([configure.ac])
 AC_CONFIG_AUX_DIR([config])
-AM_CONFIG_HEADER([src/config.h])
+AC_CONFIG_HEADERS([src/config.h])
 AM_INIT_AUTOMAKE([-Wall -Werror -Wno-portability])
 AC_CANONICAL_HOST
 AM_PROG_CC_C_O
@@ -302,29 +302,39 @@ AC_CONFIG_FILES([
        config/Makefile
 
        doc/Makefile
+       doc/legacy/lxc-ls.sgml
+       doc/lxc-attach.sgml
+       doc/lxc-cgroup.sgml
+       doc/lxc-checkconfig.sgml
+       doc/lxc-checkpoint.sgml
+       doc/lxc-clone.sgml
+       doc/lxc-console.sgml
        doc/lxc-create.sgml
        doc/lxc-destroy.sgml
+       doc/lxc-device.sgml
        doc/lxc-execute.sgml
-       doc/lxc-start.sgml
-       doc/lxc-checkpoint.sgml
-       doc/lxc-restart.sgml
-       doc/lxc-stop.sgml
-       doc/lxc-console.sgml
        doc/lxc-freeze.sgml
-       doc/lxc-unfreeze.sgml
-       doc/lxc-monitor.sgml
-       doc/lxc-wait.sgml
+       doc/lxc-info.sgml
+       doc/lxc-kill.sgml
        doc/lxc-ls.sgml
+       doc/lxc-monitor.sgml
+       doc/lxc-netstat.sgml
        doc/lxc-ps.sgml
+       doc/lxc-restart.sgml
+       doc/lxc-shutdown.sgml
+       doc/lxc-start-ephemeral.sgml
+       doc/lxc-start.sgml
+       doc/lxc-stop.sgml
        doc/lxc-top.sgml
-       doc/lxc-cgroup.sgml
-       doc/lxc-kill.sgml
-       doc/lxc-attach.sgml
+       doc/lxc-unfreeze.sgml
+       doc/lxc-unshare.sgml
+       doc/lxc-version.sgml
+       doc/lxc-wait.sgml
+
        doc/lxc.conf.sgml
        doc/lxc.sgml
        doc/common_options.sgml
        doc/see_also.sgml
-       doc/legacy/lxc-ls.sgml
 
        doc/rootfs/Makefile
 
@@ -356,8 +366,6 @@ AC_CONFIG_FILES([
        src/lxc/lxc-ps
        src/lxc/lxc-netstat
        src/lxc/lxc-checkconfig
-       src/lxc/lxc-setcap
-       src/lxc/lxc-setuid
        src/lxc/lxc-version
        src/lxc/lxc-create
        src/lxc/lxc-clone
@@ -377,32 +385,3 @@ AC_CONFIG_FILES([
 ])
 AC_CONFIG_COMMANDS([default],[[]],[[]])
 AC_OUTPUT
-
-
-# Detect missing setcap binary
-AC_CHECK_PROG(SETCAP, setcap, yes, no, $PATH$PATH_SEPARATOR/sbin)
-if test "x$SETCAP" = "xno"; then
-       AC_MSG_NOTICE([
-
-Warning:
---------
-
-The setcap binary was not found. This means the tools to set the
-privilege for the lxc commands are not available, that's ok, but you
-will need to run these commands as root or install libcap-2.
-
-])
-
-else
-
-   AC_MSG_NOTICE([
-
-Advice:
--------
-
-If you wish to have a non root user to use the lxc tools,
-you can add the needed capabilities to the tools by invoking
-the 'lxc-setcap' script. To remove the capabilities, use
-'lxc-setcap -d'.
-])
-fi