loolwsd/configure.ac | 7 -------
loolwsd/debian/rules | 2 +-
2 files changed, 1 insertion(+), 8 deletions(-)
New commits:
commit beebec76c81a3986a59e50fef6229b1bb96fe15b
Author: Andras Timar <andras.ti...@collabora.com>
Date: Tue May 10 11:12:14 2016 +0200
loolwsd is not buildable with --disable-tests, let's remove this option
diff --git a/loolwsd/configure.ac b/loolwsd/configure.ac
index 2158771..89e95cb 100644
--- a/loolwsd/configure.ac
+++ b/loolwsd/configure.ac
@@ -75,10 +75,6 @@ AC_ARG_WITH([libpng-libs],
AS_HELP_STRING([--with-libpng-libs=<path>],
[Path to the "lib" directory with the libpng
libraries]))
-AC_ARG_ENABLE([tests],
- AS_HELP_STRING([--disable-tests],
- [Build and run unit tests]))
-
AC_ARG_ENABLE([ssl],
AS_HELP_STRING([--disable-ssl],
[Compile without SSL support]))
@@ -174,9 +170,6 @@ AS_IF([test `uname -s` = Linux],
[],
[AC_MSG_ERROR([libcap not available?])])])
-AS_IF([test "$enable_tests" != "no"],
- [PKG_CHECK_MODULES([CPPUNIT], [cppunit])])
-
AS_IF([test "$enable_ssl" != "no"],
[AC_DEFINE([ENABLE_SSL],1,[Whether to enable SSL])],
[AC_DEFINE([ENABLE_SSL],0,[Whether to enable SSL])])
diff --git a/loolwsd/debian/rules b/loolwsd/debian/rules
index 91b2294..c477524 100755
--- a/loolwsd/debian/rules
+++ b/loolwsd/debian/rules
@@ -5,7 +5,7 @@ DPKG_EXPORT_BUILDFLAGS = 1
include /usr/share/dpkg/default.mk
-CONFFLAGS = --prefix=/usr --localstatedir=/var --sysconfdir=/etc
--with-lokit-path=`pwd`/bundled/include --disable-tests
+CONFFLAGS = --prefix=/usr --localstatedir=/var --sysconfdir=/etc
--with-lokit-path=`pwd`/bundled/include
# Avoid setcap when doing "make", when building for packaging
# the setcap is done at installation time
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
