diff options
| author | Andrei Karas <akaras@inbox.ru> | 2012-02-19 15:49:45 +0300 |
|---|---|---|
| committer | Andrei Karas <akaras@inbox.ru> | 2012-02-19 15:49:45 +0300 |
| commit | b30a5d2289a0b68410dee5343e148aba88ea4839 (patch) | |
| tree | 9d756785b9166ced76675ad3ebe398c09b494a3c /configure.ac | |
| parent | 9a3a196dbf633a699c26d0227802a42f025c8bfd (diff) | |
| parent | 164e4ed5a153ce06badb52f3a5a4dff16c58d7e6 (diff) | |
| download | plus-b30a5d2289a0b68410dee5343e148aba88ea4839.tar.gz plus-b30a5d2289a0b68410dee5343e148aba88ea4839.tar.bz2 plus-b30a5d2289a0b68410dee5343e148aba88ea4839.tar.xz plus-b30a5d2289a0b68410dee5343e148aba88ea4839.zip | |
Merge branch 'master' into stripped
Diffstat (limited to 'configure.ac')
| -rwxr-xr-x | configure.ac | 15 |
1 files changed, 14 insertions, 1 deletions
diff --git a/configure.ac b/configure.ac index 01a438ca8..9dea280d5 100755 --- a/configure.ac +++ b/configure.ac @@ -1,5 +1,5 @@ AC_PREREQ(2.59) -AC_INIT([ManaPlus], [1.2.2.5], [akaras@inbox.ru], [manaplus]) +AC_INIT([ManaPlus], [1.2.2.19], [akaras@inbox.ru], [manaplus]) AM_INIT_AUTOMAKE([1.9]) AC_CONFIG_HEADERS([config.h:config.h.in]) AC_LANG_CPLUSPLUS @@ -194,6 +194,19 @@ esac],[memdebug_enabled=false]) AM_CONDITIONAL(ENABLE_MEM_DEBUG, test x$memdebug_enabled = xtrue) +# Enable unit tests +AC_ARG_ENABLE(unittests, +[ --enable-unittests Turn on unit tests], +[case "${enableval}" in + yes) unittests_enabled=true +LIBS="$LIBS -lgtest" + ;; + no) unittests_enabled=false ;; + *) AC_MSG_ERROR(bad value ${enableval} for --enable-tests) ;; +esac],[unittests_enabled=false]) + +AM_CONDITIONAL(ENABLE_UNITTESTS, test x$unittests_enabled = xtrue) + # Enable tcmalloc AC_ARG_ENABLE(tcmalloc, [ --enable-tcmalloc Turn on tcmalloc], |