[Libreoffice-commits] core.git: Branch 'libreoffice-4-2' - configure.ac

[Michael Stahl]

 configure.ac |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit ba5c3753f736cdca9b6ffea4bf3db2e9b31d4ee2
Author: Michael Stahl <mstahl at redhat.com>
Date:   Thu Jan 9 22:10:23 2014 +0100

    configure: we need both cups header and library
    
    Change-Id: Ie27a67b7d1086fbbce5eb40a56b4d154afb3faf8
    (cherry picked from commit 3b3c8c4796a89a76ce7574908096a91993412523)
    Reviewed-on: https://gerrit.libreoffice.org/7348
    Reviewed-by: Caolán McNamara <caolanm at redhat.com>
    Tested-by: Caolán McNamara <caolanm at redhat.com>

diff --git a/configure.ac b/configure.ac
index 9887963..ccf2704 100644
--- a/configure.ac
+++ b/configure.ac
@@ -4647,7 +4647,7 @@ if test "$test_cups" = "yes"; then
     AC_MSG_CHECKING([whether cups support is present])
     AC_CHECK_LIB([cups], [cupsPrintFiles], [:])
     AC_CHECK_HEADER(cups/cups.h, AC_DEFINE(HAVE_CUPS_H))
-    if test "$ac_cv_lib_cups_cupsPrintFiles" != "yes" -a "$ac_cv_header_cups_cups_h" != "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 libcupsys2-dev or cups-devel.])
     fi