diff options
| author | Jan-Marek Glogowski <glogow@fbihome.de> | 2021-05-26 09:23:59 +0200 |
|---|---|---|
| committer | Jan-Marek Glogowski <glogow@fbihome.de> | 2021-05-26 10:47:57 +0200 |
| commit | b161daeccf299afefeaf319ee9b6f50e6f888eff (patch) | |
| tree | 4c65f6bb3a0ccce172b36523e4584bc22316ff49 | |
| parent | tdf#96061 Unset the highlight property (diff) | |
| download | core-b161daeccf299afefeaf319ee9b6f50e6f888eff.tar.gz core-b161daeccf299afefeaf319ee9b6f50e6f888eff.zip | |
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 <glogow@fbihome.de>
| -rw-r--r-- | configure.ac | 10 |
1 files changed, 2 insertions, 8 deletions
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 |