From de2cca8988f43443f83f6f324c73d6ea03edfae3 Mon Sep 17 00:00:00 2001 From: Pavel Labath <pavelo@centrum.sk> Date: Tue, 19 Apr 2011 22:42:36 +0200 Subject: Include src/tests in the distribution tarball and add a configure option for building them (default: off). This patch fixes an error when configuring the tarball, where configure complained it cannot find src/tests/Makefile.in. --- configure.in | 16 ++++++++++++++++ src/Makefile.am | 6 +++++- 2 files changed, 21 insertions(+), 1 deletion(-) diff --git a/configure.in b/configure.in index e3cc569..1d69f34 100644 --- a/configure.in +++ b/configure.in @@ -308,6 +308,22 @@ AC_ARG_ENABLE(debug, AC_SUBST(DEBUG) CXXFLAGS="$CXXFLAGS $DEBUG" +dnl Check whether to build test programs +AC_MSG_CHECKING([whether to build test programs]) +AC_ARG_ENABLE(test, + [ --enable-test build programs used in testing fluxbox ([default=no])], + if test x$enableval = "xyes"; then + AC_MSG_RESULT([yes]) + TEST=yes + else + AC_MSG_RESULT([no]) + TEST=no + fi, + AC_MSG_RESULT([no]) + TEST=no +) +AM_CONDITIONAL(TEST, test x$TEST = xyes) + dnl Check whether to include native language support (i18n) AC_MSG_CHECKING([whether to include NLS support]) AC_ARG_ENABLE(nls, diff --git a/src/Makefile.am b/src/Makefile.am index 12f86bb..cfb249a 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -23,7 +23,11 @@ # DEALINGS IN THE SOFTWARE. -SUBDIRS= FbTk +if TEST +BUILD_TEST= tests +endif +SUBDIRS= FbTk $(BUILD_TEST) + DEFAULT_MENU=@DEFAULT_MENU@ DEFAULT_STYLE=@DEFAULT_STYLE@ DEFAULT_KEYSFILE=@DEFAULT_KEYS@ -- cgit v0.11.2