diff options
| author | Thomas James Alexander Thurman <tthurman@src.gnome.org> | 2009-01-19 21:28:00 +0000 |
|---|---|---|
| committer | Thomas James Alexander Thurman <tthurman@src.gnome.org> | 2009-01-19 21:28:00 +0000 |
| commit | 7c34a2124988db1665d343666716b6f08d89b7b7 (patch) | |
| tree | 14624674fc329c784583ebf13aa5eb1cf425c0d6 | |
| parent | 1b35154e2baec3f0a6854a2f5538444bcebac1d0 (diff) | |
| download | metacity-7c34a2124988db1665d343666716b6f08d89b7b7.tar.gz | |
New branch for testing
svn path=/branches/veracity/; revision=4078
| -rw-r--r-- | Makefile.am | 2 | ||||
| -rw-r--r-- | configure.in | 19 |
2 files changed, 20 insertions, 1 deletions
diff --git a/Makefile.am b/Makefile.am index 725c69c9..8e86ced8 100644 --- a/Makefile.am +++ b/Makefile.am @@ -1,5 +1,5 @@ -SUBDIRS=src po doc +SUBDIRS=src po doc test EXTRA_DIST = HACKING MAINTAINERS rationales.txt \ intltool-extract.in intltool-merge.in intltool-update.in diff --git a/configure.in b/configure.in index 554ac1fd..097ade07 100644 --- a/configure.in +++ b/configure.in @@ -158,6 +158,11 @@ AC_ARG_ENABLE(shape, [disable metacity's use of the shaped window extension]),, enable_shape=auto) +AC_ARG_ENABLE(veracity, + AC_HELP_STRING([--enable-veracity], + [enable metacity test suite]),, + enable_veracity=auto) + ## try definining HAVE_BACKTRACE AC_CHECK_HEADERS(execinfo.h, [AC_CHECK_FUNCS(backtrace)]) @@ -240,6 +245,15 @@ else echo "Building without compositing manager" fi +if test x$enable_veracity = xyes; then + METACITY_PC_MODULES="$METACITY_PC_MODULES guile-1.8" + echo "Building test suite" + use_veracity=yes +else + use_veracity=no +fi +AM_CONDITIONAL(BUILD_TESTS, test x$build_tests = xyes) + ## if no compositor, still possibly enable render if test x$have_xcomposite = xno; then XRENDER_VERSION=0.0 @@ -501,7 +515,10 @@ src/wm-tester/Makefile src/libmetacity-private.pc src/tools/Makefile src/themes/Makefile +$veracity_makefile po/Makefile.in +test/Makefile +test/veracity/Makefile ]) AC_OUTPUT @@ -540,6 +557,8 @@ metacity-$VERSION: Xsync: ${found_xsync} Render: ${have_xrender} Xcursor: ${have_xcursor} + + Build test suite: ${use_veracity} " METACITY_MINOR_VERSION=metacity_minor_version |