diff options
| author | Jan Engelhardt <jengelh@inai.de> | 2013-04-30 17:42:04 +0200 |
|---|---|---|
| committer | Mike Gabriel <mike.gabriel@das-netzwerkteam.de> | 2013-04-30 17:42:25 +0200 |
| commit | 1087882065333ed4180bb7020465a7a132019a4c (patch) | |
| tree | df9cb9d1e6df9c87b5bfc9e23a3091d3970c1038 | |
| parent | f50fdee7cbe0f8795ba61364c06be0c28314db7b (diff) | |
| download | libpam-x2go-1087882065333ed4180bb7020465a7a132019a4c.tar.gz libpam-x2go-1087882065333ed4180bb7020465a7a132019a4c.tar.bz2 libpam-x2go-1087882065333ed4180bb7020465a7a132019a4c.zip | |
Make building tests optional. (Fixes: #196).
| -rw-r--r-- | Makefile.am | 8 | ||||
| -rw-r--r-- | configure.ac | 3 | ||||
| -rw-r--r-- | debian/changelog | 4 |
3 files changed, 10 insertions, 5 deletions
diff --git a/Makefile.am b/Makefile.am index 9477c1c..7d71690 100644 --- a/Makefile.am +++ b/Makefile.am @@ -1,7 +1,9 @@ -SUBDIRS = \ - src \ - tests +SUBDIRS = src + +if HAVE_GTEST +SUBDIRS += tests +endif DISTCHECK_CONFIGURE_FLAGS = --enable-localinstall diff --git a/configure.ac b/configure.ac index 78b4195..ba57d72 100644 --- a/configure.ac +++ b/configure.ac @@ -55,8 +55,9 @@ AC_SUBST(PAMMODULEDIR) m4_include([m4/gtest.m4]) CHECK_GTEST if test "x$have_gtest" != "xyes"; then - AC_MSG_ERROR([tests were requested but gtest is not installed.]) + AC_MSG_WARN([tests were requested but gtest is not installed.]) fi +AM_CONDITIONAL([HAVE_GTEST], [test "$have_gtest" != "no"]) ########################### # gcov coverage reporting diff --git a/debian/changelog b/debian/changelog index b7c9a34..ee0ba61 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,6 +1,8 @@ libpam-x2go (0.0.1.1-0~x2go1) UNRELEASED; urgency=low - * Continue development... + [ Jan Engelhardt ] + * New upstream version (0.0.1.1): + - Make building tests optional. (Fixes: #196). -- Mike Gabriel <mike.gabriel@das-netzwerkteam.de> Tue, 30 Apr 2013 17:40:29 +0200 |