Disable test compilation by default

From: Daniel Lezcano <dlezcano@fr.ibm.com>

Disable the test programs compilation by default in order to reduce the
compilation time when generating rpm and dist.

Signed-off-by: Daniel Lezcano <dlezcano@fr.ibm.com>

diff --git a/Makefile.am b/Makefile.am
index 7188153161ee19f8b587373398899d1e90112e6a..e35838a4466ee7dab542c6f50924b9f98cb5c4b7 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -2,14 +2,14 @@
 
 SUBDIRS = doc src test etc
 DIST_SUBDIRS = config doc src test etc
-EXTRA_DIST = lxc.spec CONTRIBUTING MAINTAINERS
+EXTRA_DIST = lxc.spec CONTRIBUTING MAINTAINERS ChangeLog
 
 ChangeLog::
        @touch ChangeLog
 
 dist-hook:
        -@cvs2cl
-       @cp ChangeLog $(distdir)
+       @mv ChangeLog $(distdir)
 
 rpm: dist
        rpmbuild --clean -ta ${distdir}.tar.gz

diff --git a/configure.in b/configure.in
index 1b905c5020caa7862063ab20dcfe76e47c848260..c1525debac9e2e6dd886f807de312c845a94a305 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -34,6 +34,8 @@ AC_ARG_ENABLE(network_destroy, [  --disable-network-destroy  disable network des
 if test "x$enable_network_destroy" = "xyes"; then
    CFLAGS="$CFLAGS -DNETWORK_DESTROY"
 fi
+AC_ARG_ENABLE(test, [  --enable-test    compile test program [default=no]],, enable_test=no)
+AM_CONDITIONAL(ENABLE_TEST, test x$enable_test = xyes)
 
 AC_SUBST(LXC_MAJOR_VERSION)
 AC_SUBST(LXC_MINOR_VERSION)

diff --git a/test/Makefile.am b/test/Makefile.am
index e6188db9cd6e3f3d4921b50357aced3c82d7cbb5..bbc47e9614fcfc24a94ae190043db5f370c60c39 100644 (file)
--- a/test/Makefile.am
+++ b/test/Makefile.am
@@ -1,3 +1,5 @@
+if ENABLE_TEST
+
 INCLUDES= -I$(top_srcdir)/src
 
 noinst_PROGRAMS = \
@@ -93,3 +95,5 @@ lxc_low_monitor_LDADD = \
 lxc_state_SOURCES = lxc_state.c
 lxc_state_LDADD = \
        $(top_builddir)/src/lxc/liblxc.la
+
+endif
\ No newline at end of file