mir/lxc
2
0
Fork 0
mirror of git://github.com/lxc/lxc synced 2025-08-22 18:59:22 +00:00
Code Issues Releases Wiki Activity
lxc/configure.ac

149 lines
3.7 KiB
Plaintext
Raw Normal View History

Initial revision
2008-08-06 14:32:29 +00:00
# -*- Autoconf -*-
# Process this file with autoconf to produce a configure script.
change version to 0.6.3 Increment to the 0.6.3 version. Signed-off-by: Daniel Lezcano <dlezcano@fr.ibm.com>
2009-07-24 15:25:43 +02:00
AC_INIT([lxc], [0.6.3])
Initial revision
2008-08-06 14:32:29 +00:00
rename configure.in to configure.ac Rename configure.in to configure.ac as it is the correct name for the recent version. Signed-off-by: Daniel Lezcano <dlezcano@fr.ibm.com>
2009-04-26 11:43:41 +02:00
AC_CONFIG_SRCDIR([configure.ac])
Initial revision
2008-08-06 14:32:29 +00:00
AC_CONFIG_AUX_DIR([config])
AM_CONFIG_HEADER([src/config.h])
AM_INIT_AUTOMAKE([-Wno-portability])
AC_CANONICAL_HOST
AM_PROG_CC_C_O
AC_GNU_SOURCE
Include /sbin in PATH for setcap Rationale: some distributions don't include /sbin in PATH for regular users, thus setcap might not be found during configure Signed-off-by: Filippo Giunchedi <filippo@esaurito.net> Signed-off-by: Daniel Lezcano <dlezcano@fr.ibm.com>
2009-07-02 15:42:18 +02:00
AC_CHECK_PROG(SETCAP, setcap, yes, no, $PATH$PATH_SEPARATOR/sbin)
configure.ac - allow user to switch off/on documentation generation Andrian Nord <NightNord@gmail.com>: >> > > As documentation requires docbook2man to be installed, which is not, >> > > otherwise, required for proper LXC work or compilation process, it >> > > might be usefull to be able to switch it off. Michel Normand <normand@fr.ibm.com>: > > For me, it is Ok to add a --enable/disable/-doc, > > but not make configure to fail if no option specified > > and no docbook2man package. > > > > For me it should be optionnal. > > I like the current behaviour where configure is running without option > > and is enabling/disabling by itself the doc building. > > Could you send a new patch with this idea ? Andrian Nord <NightNord@gmail.com>: Of course. You mean, that you what default behaviour to remain auto-detection? That is: --enable-doc: require docbook2man or fail, generate mans --enable-doc=auto, or not specified (default): check for docbook2man, generate mans if found, silently ignore if not found (I suppose diagnostic message is redundant, as information already contains into ./configure --help) --disable-doc: never check for docbook2man and don't gen mans Here comes a patch what do this, as far as I see (I'm sorry for violating post-rules in previous mail, now I'll do all right, I hope. Should I attach patch anyway, as it might be usefull for applying?) Signed-off-by: Andrian Nord <NightNord@gmail.com> Acked-by: Michel Normand <normand@fr.ibm.com> Signed-off-by: Daniel Lezcano <dlezcano@fr.ibm.com>
2009-11-04 14:03:44 +01:00
AC_ARG_ENABLE([doc],
[AC_HELP_STRING([--enable-doc], [make mans (require docbook2man installed) [default=auto]])],
[], [enable_doc=auto])
if test "x$enable_doc" = "xyes" -o "x$enable_doc" = "xauto"; then
AC_CHECK_PROG(have_docbook, [docbook2man], [yes], [no])
test "x$have_docbook" = "xno" -a "x$enable_doc" = "xyes" && \
AC_MSG_ERROR([docbook2man required by man request, but not found])
fi
AM_CONDITIONAL([ENABLE_DOCBOOK], [test "x$have_docbook" = "xyes"])
Q: general lxc architecture Patch moves etc/* contents into doc/examples/ and adds --disable-examples configure switch which may be used not to install examples. Default is to install them into ${docdir}/examples (commonly: /usr/share/doc/lxc/examples) Signed-off-by: Andrian Nord <NightNord@gmail.com> Signed-off-by: Daniel Lezcano <dlezcano@fr.ibm.com>
2009-11-13 11:48:29 +01:00
AC_ARG_ENABLE([examples],
[AC_HELP_STRING([--disable-examples], [do not install configuration examples])],
[], [enable_examples=yes])
AM_CONDITIONAL([ENABLE_EXAMPLES], [test "x$enable_examples" = "xyes"])
add pkg-config for lxc Add the pkg-config information for lxc. Signed-off-by: Daniel Lezcano <dlezcano@fr.ibm.com>
2009-06-10 18:21:48 +02:00
AS_AC_EXPAND(PREFIX, $prefix)
AS_AC_EXPAND(LIBDIR, $libdir)
Expand the configure directory From: Daniel Lezcano <dlezcano@fr.ibm.com> Expand the configure variable specifying the directories in order to use them directly in the scripts. Signed-off-by: Daniel Lezcano <dlezcano@fr.ibm.com>
2008-12-01 11:50:43 +00:00
AS_AC_EXPAND(BINDIR, $bindir)
add pkg-config for lxc Add the pkg-config information for lxc. Signed-off-by: Daniel Lezcano <dlezcano@fr.ibm.com>
2009-06-10 18:21:48 +02:00
AS_AC_EXPAND(INCLUDEDIR, $includedir)
Install lxc-init in libexec dir Since lxc-init is a helper program, which doesn't have an usage output and is only going to be called only internally by lxc-execute, we'll move it to the libexec dir. Signed-off-by: Guido Trotter <ultrotter@quaqua.net> Signed-off-by: Daniel Lezcano <dlezcano@fr.ibm.com>
2009-03-18 17:27:27 +00:00
AS_AC_EXPAND(LIBEXECDIR, $libexecdir)
Expand the configure directory From: Daniel Lezcano <dlezcano@fr.ibm.com> Expand the configure variable specifying the directories in order to use them directly in the scripts. Signed-off-by: Daniel Lezcano <dlezcano@fr.ibm.com>
2008-12-01 11:50:43 +00:00
AS_AC_EXPAND(SYSCONFDIR, $sysconfdir)
replace lxc-version by lxc-config As we have the correct informations with pkg-config we can write a script which will collect the informations and we get rid of the C program. Signed-off-by: Daniel Lezcano <dlezcano@fr.ibm.com>
2009-06-10 18:21:48 +02:00
AS_AC_EXPAND(DATADIR, $datadir)
Expand the configure directory From: Daniel Lezcano <dlezcano@fr.ibm.com> Expand the configure variable specifying the directories in order to use them directly in the scripts. Signed-off-by: Daniel Lezcano <dlezcano@fr.ibm.com>
2008-12-01 11:50:43 +00:00
AS_AC_EXPAND(LOCALSTATEDIR, $localstatedir)
$(localstatedir) != $(prefix)/var The current code assumes that localstatedir is equal to $(prefix)/var, thus failing for example on debian, where prefix is /usr and localstatedir is /var. This patch fixes this by expanding LXCPATH just once in configure.ac to $(localstatedir)/lib/lxc and expanding that variable everywhere else. install-exec-local is changed to just do one mkdir -p, and taking into account of the DESTDIR variable, user for example for packaging. Changing the permission of LXCPATH is done in lxc-setcap Signed-off-by: Guido Trotter <ultrotter@quaqua.net> Signed-off-by: Daniel Lezcano <dlezcano@fr.ibm.com>
2009-03-30 10:12:13 +01:00
AS_AC_EXPAND(LXCPATH, "${localstatedir}/lib/lxc")
autoassign tty number When no tty number is specified in the command line, let the tty service to provide choose one available tty and provide this one. The documentation is updated wrt this modification and I did a little fix to generate the date of the documentation. Signed-off-by: Daniel Lezcano <dlezcano@fr.ibm.com>
2009-05-07 19:36:33 +02:00
AS_AC_EXPAND(LXC_GENERATE_DATE, "$(date)")
Give the ability to non-root user to play with the containers. This feature relies on the file capabilities, when the lxc commands are installed, the sys/net admin capabilities are given to these files. These capabilities are not available for the application running inside the container.
2008-10-24 20:14:57 +00:00
use config.h to define the lxcpath and co Instead of passing the LXCPATH definition in the compiler command line, use configure.ac to define the value in the config.h file and include this file where it is needed. Signed-off-by: Daniel Lezcano <dlezcano@fr.ibm.com>
2009-10-22 15:33:40 +02:00
AH_TEMPLATE([LXCPATH], [lxc configuration repository])
AH_TEMPLATE([LXCLIBEXECDIR], [lxc executable library path])
AC_DEFINE_UNQUOTED(LXCPATH, "$LXCPATH")
AC_DEFINE_UNQUOTED(LXCLIBEXECDIR, "$LIBEXECDIR")
Include <sys/socket.h> before checking for netlink With some versions of the compiler/headers linux/netlink.h won't compile if sys/socket.h is defined before it. Signed-off-by: Daniel Lezcano <dlezcano@fr.ibm.com> Signed-off-by: Guido Trotter <ultrotter@quaqua.net>
2009-07-26 17:44:12 +02:00
AC_CHECK_HEADERS([linux/netlink.h linux/genetlink.h],
[],
AC_MSG_ERROR([netlink headers not found. Please install the linux kernel headers.]),
[#include <sys/socket.h>
])
Check the libpcap devel is installed From: Daniel Lezcano <dlezcano@fr.ibm.com> Check the libpcap devel is installed Signed-off-by: Daniel Lezcano <dlezcano@fr.ibm.com>
2008-12-09 17:49:21 +00:00
AC_CHECK_HEADERS([sys/capability.h], [], AC_MSG_ERROR([please install libcap-devel.]),
fix capability.h compilation problem The capability.h header is broken on fedora 11. The workaround is to include <sys/types.h> before <sys/capability.h>. Signed-off-by: Daniel Lezcano <dlezcano@fr.ibm.com>
2009-06-12 16:02:14 +02:00
[#include <sys/types.h>
#include <sys/capability.h>])
Check the libpcap devel is installed From: Daniel Lezcano <dlezcano@fr.ibm.com> Check the libpcap devel is installed Signed-off-by: Daniel Lezcano <dlezcano@fr.ibm.com>
2008-12-09 17:49:21 +00:00
liblxc: Handle missing PR_CAPBSET_DROP definition On distros with older headers liblxc fails to build because PR_CAPBSET_DROP is not defined by including /usr/include/sys/prctl.h. This adds an autoconf test and, if not present, defines it. When prctl() is called on systems that do not support PR_CAPBSET_DROP we should expect EINVAL. This case is already handled by the liblxc code so no further changes are needed. Signed-off-by: Matt Helsley <matthltc@us.ibm.com> Signed-off-by: Daniel Lezcano <dlezcano@fr.ibm.com>
2009-03-08 17:09:27 +01:00
# Some systems lack PR_CAPBSET_DROP definition => HAVE_DECL_PR_CAPBSET_DROP
AC_CHECK_DECLS([PR_CAPBSET_DROP], [], [], [#include <sys/prctl.h>])
Add signalfd function definition From: Dietmar Maurer <dietmar@proxmox.com> The signalfd function prototype and the signalfd header file is not defined in the debian Lenny. We want to use this debian version with a newer kernel. This patch gives the signalfd function prototype, because the function is available in the glibc-2.7 which is the version coming with debian Lenny. Signed-off-by: Dietmar Maurer <dietmar@proxmox.com> Signed-off-by: Daniel Lezcano <dlezcano@fr.ibm.com>
2009-02-02 14:50:00 +00:00
AC_CHECK_HEADERS([sys/signalfd.h])
Initial revision
2008-08-06 14:32:29 +00:00
AC_PROG_GCC_TRADITIONAL
if test "x$GCC" = "xyes"; then
Removed Werror compilation flag
2008-08-06 14:54:00 +00:00
CFLAGS="$CFLAGS -Wall"
Initial revision
2008-08-06 14:32:29 +00:00
fi
AC_CONFIG_FILES([
Makefile
add pkg-config for lxc Add the pkg-config information for lxc. Signed-off-by: Daniel Lezcano <dlezcano@fr.ibm.com>
2009-06-10 18:21:48 +02:00
lxc.pc
Initial revision
2008-08-06 14:32:29 +00:00
lxc.spec
config/Makefile
Added the man.1 pages From: Daniel Lezcano <dlezcano@fr.ibm.com> Added the different man pages for the lxc commands. The generation of the man pages relies on the docbook tool. Signed-off-by: Daniel Lezcano <dlezcano@fr.ibm.com>
2008-11-18 13:45:49 +00:00
doc/Makefile
doc/lxc-create.sgml
doc/lxc-destroy.sgml
doc/lxc-execute.sgml
doc/lxc-start.sgml
doc/lxc-stop.sgml
From: Daniel Lezcano <daniel.lezcano@free.fr> Console support for the system container. Signed-off-by: Daniel Lezcano <daniel.lezcano@free.fr> Signed-off-by: Daniel Lezcano <dlezcano@fr.ibm.com>
2009-01-25 21:52:38 +00:00
doc/lxc-console.sgml
Added the man.1 pages From: Daniel Lezcano <dlezcano@fr.ibm.com> Added the different man pages for the lxc commands. The generation of the man pages relies on the docbook tool. Signed-off-by: Daniel Lezcano <dlezcano@fr.ibm.com>
2008-11-18 13:45:49 +00:00
doc/lxc-freeze.sgml
doc/lxc-unfreeze.sgml
doc/lxc-monitor.sgml
doc/lxc-wait.sgml
doc/lxc-ls.sgml
doc/lxc-ps.sgml
Add the lxc-cgroup man page From: Daniel Lezcano <dlezcano@fr.ibm.com> Added the lxc-cgroup man page Signed-off-by: Daniel Lezcano <dlezcano@fr.ibm.com>
2008-11-18 14:27:12 +00:00
doc/lxc-cgroup.sgml
Added the man page lxc.conf.5 From: Daniel Lezcano <dlezcano@fr.ibm.com> Added the man page for the lxc.conf configuration file. Signed-off-by: Daniel Lezcano <dlezcano@fr.ibm.com>
2008-11-19 16:58:09 +00:00
doc/lxc.conf.sgml
Add lxc.7 man page From: Daniel Lezcano <dlezcano@fr.ibm.com> Added the overview man page for lxc. Signed-off-by: Daniel Lezcano <dlezcano@fr.ibm.com>
2008-11-20 15:04:09 +00:00
doc/lxc.sgml
change man pages to use a common file for common options the common options of lxc commands are now described in one file "common_options.sgml.in" Signed-off-by: Michel Normand <normand@fr.ibm.com> Signed-off-by: Daniel Lezcano <dlezcano@fr.ibm.com>
2009-05-28 15:32:30 +02:00
doc/common_options.sgml
change man pages to use a seealso file for references the common references to lxc man pages are now placed in one file "see_also.sgml.in" Note that the few man pages that refer to man pages that are not lxc ones have two "See Also" paragraph. Signed-off-by: Michel Normand <normand@fr.ibm.com> Signed-off-by: Daniel Lezcano <dlezcano@fr.ibm.com>
2009-05-28 15:32:29 +02:00
doc/see_also.sgml
Added the man.1 pages From: Daniel Lezcano <dlezcano@fr.ibm.com> Added the different man pages for the lxc commands. The generation of the man pages relies on the docbook tool. Signed-off-by: Daniel Lezcano <dlezcano@fr.ibm.com>
2008-11-18 13:45:49 +00:00
Added a script directory for containers creation helper scripts From: Daniel Lezcano <dlezcano@fr.ibm.com> Added a directory called 'scripts' where is stored two helpers. The first one allows to create a mini debian container and the second one to create a sshd container. Signed-off-by: Daniel Lezcano <dlezcano@fr.ibm.com>
2008-11-28 15:36:51 +00:00
scripts/Makefile
scripts/lxc-debian
liblxc: create a fedore template container On Mon, 2009-02-09 at 15:43 -0800, Dan Smith wrote: > DL> It may be possible to use yum like debootstrap for an minbase > DL> fedora install. > > Yep, something like the following should work: > > root=/path/to/tmproot > mkdir -p $root/var/lib/rpm > rpm --root $root --initdb > rpm --root $root -Uvfh --nodeps http://fedora.osuosl.org/linux/releases/10/Fedora/i386/os/Packages/fedora-release-10-1.noarch.rpm > yum --installroot=$root -y groupinstall Base Looks familiar! ;) I was intrigued by this idea last weekend so I started such a script. However I only tested it as far as creating a semi-correct rootfs. With the exception of network configs most of the configs are still written as for debian. For example I know the selinux policy enforcement settings need to move, the inittab needs to be replaced by the proper upstart configs, etc. Of course it's based heavily on Daniel's excellent lxc-debian script. Signed-off-by: Matt Helsley <matthltc@us.ibm.com> Signed-off-by: Daniel Lezcano <dlezcano@fr.ibm.com>
2009-03-08 17:09:27 +01:00
scripts/lxc-fedora
Added a script directory for containers creation helper scripts From: Daniel Lezcano <dlezcano@fr.ibm.com> Added a directory called 'scripts' where is stored two helpers. The first one allows to create a mini debian container and the second one to create a sshd container. Signed-off-by: Daniel Lezcano <dlezcano@fr.ibm.com>
2008-11-28 15:36:51 +00:00
scripts/lxc-sshd
Initial revision
2008-08-06 14:32:29 +00:00
src/Makefile
src/lxc/Makefile
src/lxc/lxc-ps
Added the man.1 pages From: Daniel Lezcano <dlezcano@fr.ibm.com> Added the different man pages for the lxc commands. The generation of the man pages relies on the docbook tool. Signed-off-by: Daniel Lezcano <dlezcano@fr.ibm.com>
2008-11-18 13:45:49 +00:00
src/lxc/lxc-ls
Remove lxc.pc pkgconfig usage
2008-11-21 18:17:38 +00:00
src/lxc/lxc-netstat
Use a specific script to set the capabilities Instead of having the capabilities to be set automatically, it will be up to the user to set them through a specific script 'lxc-setcap'. After installing the lxc tools, if we want them to be available, for a non-root user, lxc-setcap will set the needed capabilities. If, after thinking it, we want to remove the capabilities, the 'lxc-setcap -d' will do this for us. Signed-off-by: Daniel Lezcano <dlezcano@fr.ibm.com> Acked-by: Guido Trotter <ultrotter@google.com>
2009-03-24 13:56:37 +01:00
src/lxc/lxc-checkconfig
src/lxc/lxc-setcap
rename lxc-config to lxc-version Rename lxc-config to lxc-version in order to avoid the confusion with what looks like a container configuration tool. Signed-off-by: Daniel Lezcano <dlezcano@fr.ibm.com>
2009-06-10 18:49:16 +02:00
src/lxc/lxc-version
Replace create/destroy by a script The simplification of the container configuration makes pointless to have so much complexity in the container creation. Let's remove that and replace by some scripts. Signed-off-by: Daniel Lezcano <dlezcano@fr.ibm.com>
2009-11-13 11:48:29 +01:00
src/lxc/lxc-create
src/lxc/lxc-destroy
Added a script directory for containers creation helper scripts From: Daniel Lezcano <dlezcano@fr.ibm.com> Added a directory called 'scripts' where is stored two helpers. The first one allows to create a mini debian container and the second one to create a sshd container. Signed-off-by: Daniel Lezcano <dlezcano@fr.ibm.com>
2008-11-28 15:36:51 +00:00
Q: general lxc architecture Patch moves etc/* contents into doc/examples/ and adds --disable-examples configure switch which may be used not to install examples. Default is to install them into ${docdir}/examples (commonly: /usr/share/doc/lxc/examples) Signed-off-by: Andrian Nord <NightNord@gmail.com> Signed-off-by: Daniel Lezcano <dlezcano@fr.ibm.com>
2009-11-13 11:48:29 +01:00
doc/examples/Makefile
doc/examples/lxc-macvlan.conf
doc/examples/lxc-no-netns.conf
doc/examples/lxc-empty-netns.conf
doc/examples/lxc-phys.conf
doc/examples/lxc-veth.conf
doc/examples/lxc-complex-config
Initial revision
2008-08-06 14:32:29 +00:00
])
AC_CONFIG_COMMANDS([default],[[]],[[]])
AC_OUTPUT
Give the ability to non-root user to play with the containers. This feature relies on the file capabilities, when the lxc commands are installed, the sys/net admin capabilities are given to these files. These capabilities are not available for the application running inside the container.
2008-10-24 20:14:57 +00:00
if test "x$SETCAP" = "xno"; then
rename configure.in to configure.ac Rename configure.in to configure.ac as it is the correct name for the recent version. Signed-off-by: Daniel Lezcano <dlezcano@fr.ibm.com>
2009-04-26 11:43:41 +02:00
AC_MSG_NOTICE([
Give the ability to non-root user to play with the containers. This feature relies on the file capabilities, when the lxc commands are installed, the sys/net admin capabilities are given to these files. These capabilities are not available for the application running inside the container.
2008-10-24 20:14:57 +00:00
Warning:
--------
Clarify setcap advice/warning messages Probably a mention to libcap-2 is worth keeping, though it might be clearer to point to setcap binary directly. Signed-off-by: Filippo Giunchedi <filippo@esaurito.net> Signed-off-by: Daniel Lezcano <dlezcano@fr.ibm.com>
2009-07-02 15:42:18 +02:00
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.
Give the ability to non-root user to play with the containers. This feature relies on the file capabilities, when the lxc commands are installed, the sys/net admin capabilities are given to these files. These capabilities are not available for the application running inside the container.
2008-10-24 20:14:57 +00:00
])
else
rename configure.in to configure.ac Rename configure.in to configure.ac as it is the correct name for the recent version. Signed-off-by: Daniel Lezcano <dlezcano@fr.ibm.com>
2009-04-26 11:43:41 +02:00
AC_MSG_NOTICE([
Give the ability to non-root user to play with the containers. This feature relies on the file capabilities, when the lxc commands are installed, the sys/net admin capabilities are given to these files. These capabilities are not available for the application running inside the container.
2008-10-24 20:14:57 +00:00
Advice:
-------
Clarify setcap advice/warning messages Probably a mention to libcap-2 is worth keeping, though it might be clearer to point to setcap binary directly. Signed-off-by: Filippo Giunchedi <filippo@esaurito.net> Signed-off-by: Daniel Lezcano <dlezcano@fr.ibm.com>
2009-07-02 15:42:18 +02:00
If you wish to have a non root user to use the lxc tools,
Use a specific script to set the capabilities Instead of having the capabilities to be set automatically, it will be up to the user to set them through a specific script 'lxc-setcap'. After installing the lxc tools, if we want them to be available, for a non-root user, lxc-setcap will set the needed capabilities. If, after thinking it, we want to remove the capabilities, the 'lxc-setcap -d' will do this for us. Signed-off-by: Daniel Lezcano <dlezcano@fr.ibm.com> Acked-by: Guido Trotter <ultrotter@google.com>
2009-03-24 13:56:37 +01:00
you can add the needed capabilities to the tools by invoking
the 'lxc-setcap' script. To remove the capabilities, use
Clarify setcap advice/warning messages Probably a mention to libcap-2 is worth keeping, though it might be clearer to point to setcap binary directly. Signed-off-by: Filippo Giunchedi <filippo@esaurito.net> Signed-off-by: Daniel Lezcano <dlezcano@fr.ibm.com>
2009-07-02 15:42:18 +02:00
'lxc-setcap -d'.
Give the ability to non-root user to play with the containers. This feature relies on the file capabilities, when the lxc commands are installed, the sys/net admin capabilities are given to these files. These capabilities are not available for the application running inside the container.
2008-10-24 20:14:57 +00:00
])
fi
Reference in New Issue Copy Permalink