aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--Makefile.am8
-rw-r--r--configure.ac3
-rw-r--r--debian/changelog4
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