diff options
| -rw-r--r-- | ChangeLog | 2 | ||||
| -rw-r--r-- | Makefile.am | 6 | ||||
| -rw-r--r-- | configure.in | 6 |
3 files changed, 13 insertions, 1 deletions
@@ -6,6 +6,8 @@ * test/Makefile.am, test/gkbd-keyboard-drawing-test.c, configure.in: make test apps using GOption, http://bugzilla.gnome.org/show_bug.cgi?id=502993 + * configure.in, Makefile.am: make tests optional, + http://bugzilla.gnome.org/show_bug.cgi?id=502998 2007-12-05 svu diff --git a/Makefile.am b/Makefile.am index 5f54f6e..4ec3abd 100644 --- a/Makefile.am +++ b/Makefile.am @@ -1,4 +1,8 @@ -SUBDIRS = libgnomekbd test capplet po +if BUILD_TESTS +TEST = test +endif + +SUBDIRS = libgnomekbd $(TEST) capplet po ACLOCAL_AMFLAGS = -I m4 diff --git a/configure.in b/configure.in index 5cd30cb..d6b9888 100644 --- a/configure.in +++ b/configure.in @@ -120,6 +120,12 @@ fi AM_GCONF_SOURCE_2 +AC_ARG_ENABLE([tests], + AC_HELP_STRING([--disable-tests], [Dont build the test apps]),, + [enable_tests=yes]) + +AM_CONDITIONAL(BUILD_TESTS, test "$enable_tests" = "yes") + AC_OUTPUT([ Makefile libgnomekbd.pc |