~ubuntu-branches/ubuntu/quantal/lxc/quantal-201208301614

« back to all changes in this revision

Viewing changes to configure.ac

  • Committer: Bazaar Package Importer
  • Author(s): Guido Trotter
  • Date: 2009-07-25 12:24:30 UTC
  • mfrom: (1.2.1 upstream)
  • mto: This revision was merged to the branch mainline in revision 5.
  • Revision ID: james.westby@ubuntu.com-20090725122430-s2mijwddl8nwseue
* New Upstream Version
* Remove duplicate build-dependency on autotools-dev
* Build depend on linux-libc-dev
* Disable checking of netlink headers from configure
  (currently fails under sid)
* Upgrade standards-version to 3.8.2

Show diffs side-by-side

added added

removed removed

Lines of Context:
1
1
#                                               -*- Autoconf -*-
2
2
# Process this file with autoconf to produce a configure script.
3
3
 
4
 
AC_INIT([lxc], [0.6.2])
 
4
AC_INIT([lxc], [0.6.3])
5
5
 
6
6
AC_CONFIG_SRCDIR([configure.ac])
7
7
AC_CONFIG_AUX_DIR([config])
11
11
AM_PROG_CC_C_O
12
12
AC_GNU_SOURCE
13
13
AC_PROG_LIBTOOL
14
 
AC_CHECK_PROG(SETCAP, setcap, yes, no)
 
14
AC_CHECK_PROG(SETCAP, setcap, yes, no, $PATH$PATH_SEPARATOR/sbin)
15
15
AC_CHECK_PROG(DOCBOOK, docbook2man, yes, no)
16
16
AM_CONDITIONAL(ENABLE_DOCBOOK, test x$DOCBOOK = xyes)
 
17
AS_AC_EXPAND(PREFIX, $prefix)
 
18
AS_AC_EXPAND(LIBDIR, $libdir)
17
19
AS_AC_EXPAND(BINDIR, $bindir)
 
20
AS_AC_EXPAND(INCLUDEDIR, $includedir)
18
21
AS_AC_EXPAND(LIBEXECDIR, $libexecdir)
19
22
AS_AC_EXPAND(SYSCONFDIR, $sysconfdir)
 
23
AS_AC_EXPAND(DATADIR, $datadir)
20
24
AS_AC_EXPAND(LOCALSTATEDIR, $localstatedir)
21
25
AS_AC_EXPAND(LXCPATH, "${localstatedir}/lib/lxc")
 
26
AS_AC_EXPAND(LXC_GENERATE_DATE, "$(date)")
22
27
 
23
 
AC_CHECK_HEADERS([linux/netlink.h linux/genetlink.h], [], AC_MSG_ERROR([netlink headers not found]),
 
28
AC_CHECK_HEADERS([linux/netlink.h linux/genetlink.h], [], AC_MSG_ERROR([netlink headers not found. Please install the linux kernel headers.]),
24
29
[#include <linux/types.h>
25
30
#include <bits/sockaddr.h>
26
31
#include <linux/socket.h>])
27
32
 
28
33
AC_CHECK_HEADERS([sys/capability.h], [], AC_MSG_ERROR([please install libcap-devel.]),
29
 
[#include <sys/capability.h>])
 
34
[#include <sys/types.h>
 
35
#include <sys/capability.h>])
30
36
 
31
37
# Some systems lack PR_CAPBSET_DROP definition => HAVE_DECL_PR_CAPBSET_DROP
32
38
AC_CHECK_DECLS([PR_CAPBSET_DROP], [], [], [#include <sys/prctl.h>])
49
55
        [KERNEL_RELEASE="${withval}"],
50
56
        [KERNEL_RELEASE=`uname -r`])
51
57
 
52
 
AX_COMPARE_VERSION([$KERNEL_RELEASE], [ge], [2.6.29],
53
 
                                     AC_MSG_NOTICE([network autodestroy: yes]),
54
 
                                     AC_MSG_NOTICE([network autodestroy: no]))
55
 
 
56
 
if test ${ax_compare_version} != "true"; then
57
 
   CFLAGS="$CFLAGS -DNETWORK_DESTROY"
58
 
fi
59
 
 
60
58
AC_ARG_ENABLE(test, [  --enable-test    compile test program [default=no]],, enable_test=no)
61
59
AM_CONDITIONAL(ENABLE_TEST, test x$enable_test = xyes)
62
60
 
66
64
 
67
65
AC_CONFIG_FILES([
68
66
        Makefile
 
67
        lxc.pc
69
68
        lxc.spec
70
69
        config/Makefile
71
70
 
85
84
        doc/lxc-cgroup.sgml
86
85
        doc/lxc.conf.sgml
87
86
        doc/lxc.sgml
 
87
        doc/common_options.sgml
 
88
        doc/see_also.sgml
88
89
 
89
90
        scripts/Makefile
90
91
        scripts/lxc-debian
98
99
        src/lxc/lxc-netstat
99
100
        src/lxc/lxc-checkconfig
100
101
        src/lxc/lxc-setcap
 
102
        src/lxc/lxc-version
101
103
 
102
104
        etc/Makefile
103
105
        etc/lxc-macvlan.conf
130
132
Warning:
131
133
--------
132
134
 
133
 
The libcap-2 is not installed. That means the tools to
134
 
set the privilege for the lxc commands are not available,
135
 
that's ok, but you will need to run these commands as root
 
135
The setcap binary was not found. This means the tools to set the
 
136
privilege for the lxc commands are not available, that's ok, but you
 
137
will need to run these commands as root or install libcap-2.
136
138
 
137
139
])
138
140
 
143
145
Advice:
144
146
-------
145
147
 
146
 
If you which to have a non root user to use the lxc tools,
 
148
If you wish to have a non root user to use the lxc tools,
147
149
you can add the needed capabilities to the tools by invoking
148
150
the 'lxc-setcap' script. To remove the capabilities, use
149
 
'lxc-setcap -d'
 
151
'lxc-setcap -d'.
150
152
])
151
153
 
152
154
fi