Release LXC 3.0.0

[mirror_lxc.git] / configure.ac

diff --git a/configure.ac b/configure.ac
index 1cf1a4ba9374c5f797a3835d45a1753193f09fec..50c99836b2805bd2ddf1f374a45d3042f69b9a7c 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_version_major], 2)
-m4_define([lxc_version_minor], 1)
+m4_define([lxc_devel], 0)
+m4_define([lxc_version_major], 3)
+m4_define([lxc_version_minor], 0)
 m4_define([lxc_version_micro], 0)
 m4_define([lxc_version_beta], [])
 
 m4_define([lxc_abi_major], 1)
-m4_define([lxc_abi_minor], 3)
+m4_define([lxc_abi_minor], 4)
 m4_define([lxc_abi_micro], 0)
 m4_define([lxc_abi], [lxc_abi_major.lxc_abi_minor.lxc_abi_micro])
 
@@ -52,7 +52,7 @@ AC_SUBST([LIBTOOL_DEPS])
 # Detect the distribution. This is used for the default configuration and
 # for some distro-specific build options.
 AC_MSG_CHECKING([host distribution])
-AC_ARG_WITH(distro, AS_HELP_STRING([--with-distro=DISTRO], [Specify the Linux distribution to target: One of redhat, oracle, centos, fedora, suse, gentoo, debian, arch, slackware, plamo, paldo, openmandriva, pardus, sparclinux, altlinux.]))
+AC_ARG_WITH(distro, AS_HELP_STRING([--with-distro=DISTRO], [Specify the Linux distribution to target: One of redhat, redhatenterpriseserver, oracle, centos, fedora, suse, gentoo, debian, arch, slackware, plamo, paldo, openmandriva, pardus, sparclinux, altlinux.]))
 if type lsb_release >/dev/null 2>&1 && test "z$with_distro" = "z"; then
        with_distro=`lsb_release -is`
 fi
@@ -89,7 +89,7 @@ case $with_distro in
                distroconf=default.conf.lxcbr
                distrosysconf="$sysconfdir/default"
                ;;
-       redhat|centos|fedora|oracle|oracleserver|sparclinux|altlinux|suse|opensuse*|plamo|pld)
+       redhat|redhatenterpriseserver|centos|fedora|oracle|oracleserver|sparclinux|altlinux|suse|opensuse*|plamo|pld)
                distroconf=default.conf.lxcbr
                distrosysconf="$sysconfdir/sysconfig"
                ;;
@@ -116,7 +116,7 @@ case "$with_init_script" in
                        fedora|altlinux|opensuse*)
                                init_script=systemd
                                ;;
-                       redhat|oracle|oracleserver|sparclinux|plamo)
+                       redhat|redhatenterpriseserver|oracle|oracleserver|sparclinux|plamo)
                                init_script=sysvinit
                                ;;
                        centos)
@@ -173,13 +173,6 @@ AC_ARG_ENABLE([werror],
        [do not treat warnings as errors])],
        [], [enable_werror=yes])
 
-# Allow enabling deprecated executables
-AC_ARG_ENABLE([deprecated],
-       [AC_HELP_STRING([--enable-deprecated],
-       [enable deprecated executables [default=no]])],
-       [], [enable_deprecated=false])
-AM_CONDITIONAL([ENABLE_DEPRECATED], [test "x$enable_deprecated" = "xyes"])
-
 # Allow disabling rpath
 AC_ARG_ENABLE([rpath],
        [AC_HELP_STRING([--enable-rpath], [set rpath in executables [default=no]])],
@@ -673,44 +666,10 @@ AC_CONFIG_FILES([
        config/init/upstart/Makefile
        config/etc/Makefile
        config/templates/Makefile
-       config/templates/alpine.common.conf
-       config/templates/alpine.userns.conf
-       config/templates/archlinux.common.conf
-       config/templates/archlinux.userns.conf
-       config/templates/centos.common.conf
-       config/templates/centos.userns.conf
        config/templates/common.conf
        config/templates/common.conf.d/Makefile
-       config/templates/debian.common.conf
-       config/templates/debian.userns.conf
-       config/templates/fedora.common.conf
-       config/templates/fedora.userns.conf
-       config/templates/gentoo.common.conf
-       config/templates/gentoo.moresecure.conf
-       config/templates/gentoo.userns.conf
        config/templates/nesting.conf
        config/templates/oci.common.conf
-       config/templates/opensuse.common.conf
-       config/templates/opensuse.userns.conf
-       config/templates/oracle.common.conf
-       config/templates/oracle.userns.conf
-       config/templates/plamo.common.conf
-       config/templates/plamo.userns.conf
-       config/templates/slackware.common.conf
-       config/templates/slackware.userns.conf
-       config/templates/ubuntu-cloud.common.conf
-       config/templates/ubuntu-cloud.lucid.conf
-       config/templates/ubuntu-cloud.userns.conf
-       config/templates/ubuntu.common.conf
-       config/templates/ubuntu.lucid.conf
-       config/templates/ubuntu.userns.conf
-       config/templates/openwrt.common.conf
-       config/templates/sparclinux.common.conf
-       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
@@ -839,31 +798,10 @@ AC_CONFIG_FILES([
        hooks/dhclient
 
        templates/Makefile
-       templates/lxc-alpine
-       templates/lxc-altlinux
-       templates/lxc-archlinux
        templates/lxc-busybox
-       templates/lxc-centos
-       templates/lxc-cirros
-       templates/lxc-debian
        templates/lxc-download
-       templates/lxc-fedora
-       templates/lxc-fedora-legacy
-       templates/lxc-gentoo
        templates/lxc-local
        templates/lxc-oci
-       templates/lxc-openmandriva
-       templates/lxc-opensuse
-       templates/lxc-oracle
-       templates/lxc-plamo
-       templates/lxc-pld
-       templates/lxc-slackware
-       templates/lxc-sshd
-       templates/lxc-ubuntu
-       templates/lxc-ubuntu-cloud
-       templates/lxc-sparclinux
-       templates/lxc-voidlinux
-       templates/lxc-sabayon
 
        src/Makefile
        src/lxc/Makefile