lxc-0.9.0

[mirror_lxc.git] / configure.ac

diff --git a/configure.ac b/configure.ac
index eb4b714e34e621f96253202fdbf982b172eee121..7dc82cfbcb8db10be6758e5298d3ac93b312feaa 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])
 
 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
@@ -161,7 +161,7 @@ AC_ARG_ENABLE([tests],
 AM_CONDITIONAL([ENABLE_TESTS], [test "x$enable_tests" = "xyes"])
 
 # LXC container path, where the containers are actually stored
-# This is overriden 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)
 AC_ARG_WITH([config-path],
        [AC_HELP_STRING(
@@ -194,7 +194,7 @@ AM_CONDITIONAL([USE_CONFIGPATH_LOGS], [test "$use_configpath_logs" = "yes"])
 if test "$use_configpath_logs" = "yes"; then
        default_log_path="${with_config_path}"
 else
-       default_log_path="/var/log/lxc"
+       default_log_path="${localstatedir}/log/lxc"
 fi
 
 AC_ARG_WITH([log-path],
@@ -219,6 +219,7 @@ AS_AC_EXPAND(LXCPATH, "$with_config_path")
 AS_AC_EXPAND(LXC_GLOBAL_CONF, "$with_global_conf")
 AS_AC_EXPAND(LXCROOTFSMOUNT, "$with_rootfs_path")
 AS_AC_EXPAND(LXCTEMPLATEDIR, "$datadir/lxc/templates")
+AS_AC_EXPAND(LXCHOOKDIR, "$datadir/lxc/hooks")
 AS_AC_EXPAND(LXCINITDIR, "$libexecdir")
 AS_AC_EXPAND(LOGPATH, "$with_log_path")
 
@@ -286,6 +287,10 @@ AC_CHECK_FUNCS([fgetln],
        AC_DEFINE(HAVE_FGETLN,1,[Have fgetln]),
        AM_CONDITIONAL(HAVE_FGETLN, false))
 
+# Check for some libraries
+AC_SEARCH_LIBS(sem_open, [rt pthread])
+AC_SEARCH_LIBS(clock_gettime, [rt])
+
 # Check for some standard binaries
 AC_PROG_GCC_TRADITIONAL
 AC_PROG_SED
@@ -302,31 +307,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/lxc-unshare.sgml
 
        doc/rootfs/Makefile
 
@@ -339,8 +352,9 @@ AC_CONFIG_FILES([
        doc/examples/lxc-veth.conf
        doc/examples/lxc-complex.conf
 
+       hooks/Makefile
+
        templates/Makefile
-       templates/lxc-lenny
        templates/lxc-debian
        templates/lxc-ubuntu
        templates/lxc-ubuntu-cloud
@@ -368,8 +382,6 @@ AC_CONFIG_FILES([
        src/lxc/lxc.functions
 
        src/python-lxc/Makefile
-       src/python-lxc/lxc/__init__.py
-       src/python-lxc/examples/api_test.py
 
        src/lua-lxc/Makefile