Skip to content

L
lxc
Unverified Commit e46d105b by Caio B. Silva Committed by Christian Brauner
Options

Set minimun autoconf version to 2.69 and change obsolete function AC_HELP_STRING for AS_HELP_STRING

Signed-off-by: 's avatarCaio B. Silva <caioboffo@gmail.com>
parent 219eb1ee
Showing with 30 additions and 31 deletions
configure.ac
# -*- Autoconf -*- AC_PREREQ([2.69])
# Process this file with autoconf to produce a configure script.
m4_define([lxc_devel], 0) m4_define([lxc_devel], 0)
m4_define([lxc_version_major], 3) m4_define([lxc_version_major], 3)
...@@ -123,7 +122,7 @@ AC_CONFIG_LINKS([config/etc/default.conf:config/etc/${distroconf}]) ...@@ -123,7 +122,7 @@ AC_CONFIG_LINKS([config/etc/default.conf:config/etc/${distroconf}])
# Check for init system type # Check for init system type
AC_MSG_CHECKING([for init system type]) AC_MSG_CHECKING([for init system type])
AC_ARG_WITH([init-script], AC_ARG_WITH([init-script],
[AC_HELP_STRING([--with-init-script@<:@=TYPE@<:@,TYPE,...@:>@@:>@], [AS_HELP_STRING([--with-init-script@<:@=TYPE@<:@,TYPE,...@:>@@:>@],
[Type(s) of init script to install: sysvinit, systemd, upstart, [Type(s) of init script to install: sysvinit, systemd, upstart,
distro @<:@default=distro@:>@])],[],[with_init_script=distro]) distro @<:@default=distro@:>@])],[],[with_init_script=distro])
case "$with_init_script" in case "$with_init_script" in
...@@ -185,19 +184,19 @@ if test "x$with_systemdsystemunitdir" != "xno"; then ...@@ -185,19 +184,19 @@ if test "x$with_systemdsystemunitdir" != "xno"; then
fi fi
AC_ARG_ENABLE([werror], AC_ARG_ENABLE([werror],
[AC_HELP_STRING([--disable-werror], [AS_HELP_STRING([--disable-werror],
[do not treat warnings as errors])], [do not treat warnings as errors])],
[], [enable_werror=yes]) [], [enable_werror=yes])
# Allow disabling rpath # Allow disabling rpath
AC_ARG_ENABLE([rpath], AC_ARG_ENABLE([rpath],
[AC_HELP_STRING([--enable-rpath], [set rpath in executables [default=no]])], [AS_HELP_STRING([--enable-rpath], [set rpath in executables [default=no]])],
[], [enable_rpath=no]) [], [enable_rpath=no])
AM_CONDITIONAL([ENABLE_RPATH], [test "x$enable_rpath" = "xyes"]) AM_CONDITIONAL([ENABLE_RPATH], [test "x$enable_rpath" = "xyes"])
# Documentation (manpages) # Documentation (manpages)
AC_ARG_ENABLE([doc], AC_ARG_ENABLE([doc],
[AC_HELP_STRING([--enable-doc], [make man pages [default=auto]])], [AS_HELP_STRING([--enable-doc], [make man pages [default=auto]])],
[], [enable_doc=auto]) [], [enable_doc=auto])
if test "x$enable_doc" = "xyes" -o "x$enable_doc" = "xauto"; then if test "x$enable_doc" = "xyes" -o "x$enable_doc" = "xauto"; then
...@@ -237,7 +236,7 @@ AC_SUBST(docdtd) ...@@ -237,7 +236,7 @@ AC_SUBST(docdtd)
# Documentation (API) # Documentation (API)
AC_ARG_ENABLE([api-docs], AC_ARG_ENABLE([api-docs],
[AC_HELP_STRING([--enable-api-docs], [AS_HELP_STRING([--enable-api-docs],
[make API documentation [default=auto]])], [make API documentation [default=auto]])],
[], [enable_api_docs=auto]) [], [enable_api_docs=auto])
...@@ -261,7 +260,7 @@ AC_CONFIG_MACRO_DIRS([config]) ...@@ -261,7 +260,7 @@ AC_CONFIG_MACRO_DIRS([config])
# Apparmor # Apparmor
AC_ARG_ENABLE([apparmor], AC_ARG_ENABLE([apparmor],
[AC_HELP_STRING([--enable-apparmor], [enable apparmor support [default=auto]])], [AS_HELP_STRING([--enable-apparmor], [enable apparmor support [default=auto]])],
[], [enable_apparmor=auto]) [], [enable_apparmor=auto])
if test "$enable_apparmor" = "auto" ; then if test "$enable_apparmor" = "auto" ; then
...@@ -272,7 +271,7 @@ AM_CONDITIONAL([ENABLE_APPARMOR], [test "x$enable_apparmor" = "xyes"]) ...@@ -272,7 +271,7 @@ AM_CONDITIONAL([ENABLE_APPARMOR], [test "x$enable_apparmor" = "xyes"])
# OpenSSL # OpenSSL
# libssl-dev # libssl-dev
AC_ARG_ENABLE([openssl], AC_ARG_ENABLE([openssl],
[AC_HELP_STRING([--enable-openssl], [enable OpenSSL support [default=auto]])], [AS_HELP_STRING([--enable-openssl], [enable OpenSSL support [default=auto]])],
[], [enable_openssl=auto]) [], [enable_openssl=auto])
if test "$enable_openssl" = "auto" ; then if test "$enable_openssl" = "auto" ; then
...@@ -287,7 +286,7 @@ AM_COND_IF([ENABLE_OPENSSL], ...@@ -287,7 +286,7 @@ AM_COND_IF([ENABLE_OPENSSL],
# SELinux # SELinux
AC_ARG_ENABLE([selinux], AC_ARG_ENABLE([selinux],
[AC_HELP_STRING([--enable-selinux], [enable SELinux support [default=auto]])], [AS_HELP_STRING([--enable-selinux], [enable SELinux support [default=auto]])],
[], [enable_selinux=auto]) [], [enable_selinux=auto])
if test "x$enable_selinux" = xauto; then if test "x$enable_selinux" = xauto; then
...@@ -301,7 +300,7 @@ AM_COND_IF([ENABLE_SELINUX], ...@@ -301,7 +300,7 @@ AM_COND_IF([ENABLE_SELINUX],
# Seccomp syscall filter # Seccomp syscall filter
AC_ARG_ENABLE([seccomp], AC_ARG_ENABLE([seccomp],
[AC_HELP_STRING([--enable-seccomp], [enable seccomp support [default=auto]])], [AS_HELP_STRING([--enable-seccomp], [enable seccomp support [default=auto]])],
[], [enable_seccomp=auto]) [], [enable_seccomp=auto])
if test "x$enable_seccomp" = "xauto" ; then if test "x$enable_seccomp" = "xauto" ; then
...@@ -347,7 +346,7 @@ LIBS="$OLD_LIBS" ...@@ -347,7 +346,7 @@ LIBS="$OLD_LIBS"
# Linux capabilities # Linux capabilities
AC_ARG_ENABLE([capabilities], AC_ARG_ENABLE([capabilities],
[AC_HELP_STRING([--enable-capabilities], [enable kernel capabilities support [default=auto]])], [AS_HELP_STRING([--enable-capabilities], [enable kernel capabilities support [default=auto]])],
[], [enable_capabilities=auto]) [], [enable_capabilities=auto])
if test "x$enable_capabilities" = "xauto"; then if test "x$enable_capabilities" = "xauto"; then
...@@ -371,13 +370,13 @@ CFLAGS="$OLD_CFLAGS" ...@@ -371,13 +370,13 @@ CFLAGS="$OLD_CFLAGS"
# Configuration examples # Configuration examples
AC_ARG_ENABLE([examples], AC_ARG_ENABLE([examples],
[AC_HELP_STRING([--enable-examples], [install examples [default=yes]])], [AS_HELP_STRING([--enable-examples], [install examples [default=yes]])],
[], [enable_examples=yes]) [], [enable_examples=yes])
AM_CONDITIONAL([ENABLE_EXAMPLES], [test "x$enable_examples" = "xyes"]) AM_CONDITIONAL([ENABLE_EXAMPLES], [test "x$enable_examples" = "xyes"])
# Enable dumping stack traces # Enable dumping stack traces
AC_ARG_ENABLE([mutex-debugging], AC_ARG_ENABLE([mutex-debugging],
[AC_HELP_STRING([--enable-mutex-debugging], [Makes mutexes to report error and provide stack trace [default=no]])], [AS_HELP_STRING([--enable-mutex-debugging], [Makes mutexes to report error and provide stack trace [default=no]])],
[], [enable_mutex_debugging=no]) [], [enable_mutex_debugging=no])
AM_CONDITIONAL([MUTEX_DEBUGGING], [test "x$enable_mutex_debugging" = "xyes"]) AM_CONDITIONAL([MUTEX_DEBUGGING], [test "x$enable_mutex_debugging" = "xyes"])
...@@ -407,7 +406,7 @@ m4_ifdef([PKG_CHECK_VAR], [], ...@@ -407,7 +406,7 @@ m4_ifdef([PKG_CHECK_VAR], [],
# Optional bash integration # Optional bash integration
AC_ARG_ENABLE([bash], AC_ARG_ENABLE([bash],
[AC_HELP_STRING([--enable-bash], [build bash integration [default=yes]])], [AS_HELP_STRING([--enable-bash], [build bash integration [default=yes]])],
[], [enable_bash=yes]) [], [enable_bash=yes])
AM_CONDITIONAL([ENABLE_BASH], [test "x$enable_bash" = "xyes"]) AM_CONDITIONAL([ENABLE_BASH], [test "x$enable_bash" = "xyes"])
...@@ -421,31 +420,31 @@ AM_COND_IF([ENABLE_BASH], ...@@ -421,31 +420,31 @@ AM_COND_IF([ENABLE_BASH],
# Build the command line tools # Build the command line tools
AC_ARG_ENABLE([tools], AC_ARG_ENABLE([tools],
[AC_HELP_STRING([--enable-tools], [build the command line tools [default=yes]])], [AS_HELP_STRING([--enable-tools], [build the command line tools [default=yes]])],
[], [enable_tools=yes]) [], [enable_tools=yes])
AM_CONDITIONAL([ENABLE_TOOLS], [test "x$enable_tools" = "xyes"]) AM_CONDITIONAL([ENABLE_TOOLS], [test "x$enable_tools" = "xyes"])
# Build the liblxc commands # Build the liblxc commands
AC_ARG_ENABLE([commands], AC_ARG_ENABLE([commands],
[AC_HELP_STRING([--enable-commands], [build the liblxc commands [default=yes]])], [AS_HELP_STRING([--enable-commands], [build the liblxc commands [default=yes]])],
[], [enable_commands=yes]) [], [enable_commands=yes])
AM_CONDITIONAL([ENABLE_COMMANDS], [test "x$enable_commands" = "xyes"]) AM_CONDITIONAL([ENABLE_COMMANDS], [test "x$enable_commands" = "xyes"])
# Build with ASAN commands # Build with ASAN commands
AC_ARG_ENABLE([asan], AC_ARG_ENABLE([asan],
[AC_HELP_STRING([--enable-asan], [build with address sanitizer enabled [default=no]])], [AS_HELP_STRING([--enable-asan], [build with address sanitizer enabled [default=no]])],
[], [enable_asan=no]) [], [enable_asan=no])
AM_CONDITIONAL([ENABLE_ASAN], [test "x$enable_asan" = "xyes"]) AM_CONDITIONAL([ENABLE_ASAN], [test "x$enable_asan" = "xyes"])
# Optional test binaries # Optional test binaries
AC_ARG_ENABLE([tests], AC_ARG_ENABLE([tests],
[AC_HELP_STRING([--enable-tests], [build test/example binaries [default=no]])], [AS_HELP_STRING([--enable-tests], [build test/example binaries [default=no]])],
[], [enable_tests=no]) [], [enable_tests=no])
AM_CONDITIONAL([ENABLE_TESTS], [test "x$enable_tests" = "xyes"]) AM_CONDITIONAL([ENABLE_TESTS], [test "x$enable_tests" = "xyes"])
# Allow overriding the default runtime dir (/run) # Allow overriding the default runtime dir (/run)
AC_ARG_WITH([runtime-path], AC_ARG_WITH([runtime-path],
[AC_HELP_STRING( [AS_HELP_STRING(
[--with-runtime-path=dir], [--with-runtime-path=dir],
[runtime directory (default: /run)] [runtime directory (default: /run)]
)], [], [with_runtime_path=['/run']]) )], [], [with_runtime_path=['/run']])
...@@ -454,42 +453,42 @@ AC_ARG_WITH([runtime-path], ...@@ -454,42 +453,42 @@ AC_ARG_WITH([runtime-path],
# This is overridden by an entry in the file called LXCCONF # This is overridden by an entry in the file called LXCCONF
# (i.e. /etc/lxc/lxc.conf) # (i.e. /etc/lxc/lxc.conf)
AC_ARG_WITH([config-path], AC_ARG_WITH([config-path],
[AC_HELP_STRING( [AS_HELP_STRING(
[--with-config-path=dir], [--with-config-path=dir],
[lxc configuration repository path] [lxc configuration repository path]
)], [], [with_config_path=['${localstatedir}/lib/lxc']]) )], [], [with_config_path=['${localstatedir}/lib/lxc']])
# The path of the global lxc configuration file. # The path of the global lxc configuration file.
AC_ARG_WITH([global-conf], AC_ARG_WITH([global-conf],
[AC_HELP_STRING( [AS_HELP_STRING(
[--with-global-conf=dir], [--with-global-conf=dir],
[global lxc configuration file] [global lxc configuration file]
)], [], [with_global_conf=['${sysconfdir}/lxc/lxc.conf']]) )], [], [with_global_conf=['${sysconfdir}/lxc/lxc.conf']])
# The path of the userns network configuration file # The path of the userns network configuration file
AC_ARG_WITH([usernic-conf], AC_ARG_WITH([usernic-conf],
[AC_HELP_STRING( [AS_HELP_STRING(
[--with-usernic-conf], [--with-usernic-conf],
[user network interface configuration file] [user network interface configuration file]
)], [], [with_usernic_conf=['${sysconfdir}/lxc/lxc-usernet']]) )], [], [with_usernic_conf=['${sysconfdir}/lxc/lxc-usernet']])
# The path of the runtime usernic database # The path of the runtime usernic database
AC_ARG_WITH([usernic-db], AC_ARG_WITH([usernic-db],
[AC_HELP_STRING( [AS_HELP_STRING(
[--with-usernic-db], [--with-usernic-db],
[lxc user nic database] [lxc user nic database]
)], [], [with_usernic_db=['${with_runtime_path}/lxc/nics']]) )], [], [with_usernic_db=['${with_runtime_path}/lxc/nics']])
# Rootfs path, where the container mount structure is assembled # Rootfs path, where the container mount structure is assembled
AC_ARG_WITH([rootfs-path], AC_ARG_WITH([rootfs-path],
[AC_HELP_STRING( [AS_HELP_STRING(
[--with-rootfs-path=dir], [--with-rootfs-path=dir],
[lxc rootfs mount point] [lxc rootfs mount point]
)], [], [with_rootfs_path=['${libdir}/lxc/rootfs']]) )], [], [with_rootfs_path=['${libdir}/lxc/rootfs']])
# cgroup pattern specification # cgroup pattern specification
AC_ARG_WITH([cgroup-pattern], AC_ARG_WITH([cgroup-pattern],
[AC_HELP_STRING( [AS_HELP_STRING(
[--with-cgroup-pattern=pattern], [--with-cgroup-pattern=pattern],
[pattern for container cgroups] [pattern for container cgroups]
)], [], [with_cgroup_pattern=['lxc.payload/%n']]) )], [], [with_cgroup_pattern=['lxc.payload/%n']])
...@@ -497,7 +496,7 @@ AC_ARG_WITH([cgroup-pattern], ...@@ -497,7 +496,7 @@ AC_ARG_WITH([cgroup-pattern],
# Container log path. By default, use $lxcpath. # Container log path. By default, use $lxcpath.
AC_MSG_CHECKING([Whether to place logfiles in container config path]) AC_MSG_CHECKING([Whether to place logfiles in container config path])
AC_ARG_ENABLE([configpath-log], AC_ARG_ENABLE([configpath-log],
[AC_HELP_STRING([--enable-configpath-log], [use logfiles in config path [default=no]])], [AS_HELP_STRING([--enable-configpath-log], [use logfiles in config path [default=no]])],
[], [enable_configpath_log=no]) [], [enable_configpath_log=no])
AC_MSG_RESULT([$enable_configpath_log]) AC_MSG_RESULT([$enable_configpath_log])
AM_CONDITIONAL([USE_CONFIGPATH_LOGS], [test "$enable_configpath_log" = "yes"]) AM_CONDITIONAL([USE_CONFIGPATH_LOGS], [test "$enable_configpath_log" = "yes"])
...@@ -509,7 +508,7 @@ else ...@@ -509,7 +508,7 @@ else
fi fi
AC_ARG_WITH([log-path], AC_ARG_WITH([log-path],
[AC_HELP_STRING( [AS_HELP_STRING(
[--with-log-path=dir], [--with-log-path=dir],
[per container log path] [per container log path]
)], [], [with_log_path=['${default_log_path}']]) )], [], [with_log_path=['${default_log_path}']])
...@@ -569,7 +568,7 @@ AM_CONDITIONAL([IS_BIONIC], [test "x$is_bionic" = "xyes"]) ...@@ -569,7 +568,7 @@ AM_CONDITIONAL([IS_BIONIC], [test "x$is_bionic" = "xyes"])
# Configuration examples # Configuration examples
AC_ARG_ENABLE([pam], AC_ARG_ENABLE([pam],
[AC_HELP_STRING([--enable-pam], [enable pam module [default=no]])], [AS_HELP_STRING([--enable-pam], [enable pam module [default=no]])],
[], [enable_pam=no]) [], [enable_pam=no])
AM_CONDITIONAL([ENABLE_PAM], [test "x$enable_pam" = "xyes"]) AM_CONDITIONAL([ENABLE_PAM], [test "x$enable_pam" = "xyes"])
...@@ -760,12 +759,12 @@ if test "x$enable_werror" = "xyes"; then ...@@ -760,12 +759,12 @@ if test "x$enable_werror" = "xyes"; then
fi fi
AC_ARG_ENABLE([thread-safety], AC_ARG_ENABLE([thread-safety],
[AC_HELP_STRING([--enable-thread-safety], [enforce thread-safety otherwise fail the build [default=yes]])], [AS_HELP_STRING([--enable-thread-safety], [enforce thread-safety otherwise fail the build [default=yes]])],
[], [enable_thread_safety=yes]) [], [enable_thread_safety=yes])
AM_CONDITIONAL([ENFORCE_THREAD_SAFETY], [test "x$enable_thread_safety" = "xyes"]) AM_CONDITIONAL([ENFORCE_THREAD_SAFETY], [test "x$enable_thread_safety" = "xyes"])
AC_ARG_ENABLE([memfd-rexec], AC_ARG_ENABLE([memfd-rexec],
[AC_HELP_STRING([--enable-memfd-rexec], [enforce liblxc as a memfd to protect against certain symlink attacks [default=yes]])], [AS_HELP_STRING([--enable-memfd-rexec], [enforce liblxc as a memfd to protect against certain symlink attacks [default=yes]])],
[], [enable_memfd_rexec=yes]) [], [enable_memfd_rexec=yes])
AM_CONDITIONAL([ENFORCE_MEMFD_REXEC], [test "x$enable_memfd_rexec" = "xyes"]) AM_CONDITIONAL([ENFORCE_MEMFD_REXEC], [test "x$enable_memfd_rexec" = "xyes"])
if test "x$enable_memfd_rexec" = "xyes"; then if test "x$enable_memfd_rexec" = "xyes"; then
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment