configure.ac | 10 ++--------
1 file changed, 2 insertions(+), 8 deletions(-)
New commits:
commit b161daeccf299afefeaf319ee9b6f50e6f888eff
Author: Jan-Marek Glogowski <glo...@fbihome.de>
AuthorDate: Wed May 26 09:23:59 2021 +0200
Commit: Jan-Marek Glogowski <glo...@fbihome.de>
CommitDate: Wed May 26 10:47:57 2021 +0200
configure: merge extra test for $enable_cups
Change-Id: Ic98a6db70355aa24e29590bb9cb1416c15852090
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/116144
Tested-by: Jenkins
Reviewed-by: Jan-Marek Glogowski <glo...@fbihome.de>
diff --git a/configure.ac b/configure.ac
index 3390584a841f..6eae61afefb7 100644
--- a/configure.ac
+++ b/configure.ac
@@ -5616,15 +5616,10 @@ fi
dnl ===================================================================
dnl check for cups support
dnl ===================================================================
-ENABLE_CUPS=""
-
-if test "$enable_cups" = "no"; then
- test_cups=no
-fi
AC_MSG_CHECKING([whether to enable CUPS support])
-if test "$test_cups" = "yes"; then
- ENABLE_CUPS="TRUE"
+if test "$test_cups" = yes -a "$enable_cups" != no; then
+ ENABLE_CUPS=TRUE
AC_MSG_RESULT([yes])
AC_MSG_CHECKING([whether cups support is present])
@@ -5633,7 +5628,6 @@ if test "$test_cups" = "yes"; then
if test "$ac_cv_lib_cups_cupsPrintFiles" != "yes" -o
"$ac_cv_header_cups_cups_h" != "yes"; then
AC_MSG_ERROR([Could not find CUPS. Install libcups2-dev or
cups-devel.])
fi
-
else
AC_MSG_RESULT([no])
fi
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
