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>

Disable test compilation by default
abd4a3b3 · dlezcano · 7f989f01 · abd4a3b3 · abd4a3b3 · abd4a3b3
Commit abd4a3b3 authored Nov 20, 2008 by dlezcano
Hide whitespace changes
Inline Side-by-side

Showing with 9 additions and 2 deletions

Makefile.am Makefile.am +2 -2

configure.in configure.in +2 -0

Makefile.am test/Makefile.am +5 -0

No files found.
--- 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

--- 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)

--- a/test/Makefile.am
+++ b/test/Makefile.am
+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