[Libreoffice-commits] .: 2 commits - configure.in

[Tor Lillqvist]

 configure.in |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 190ff38183b8d763234d32ae712a2298021a1a73
Author: Tor Lillqvist <tlillqvist at suse.com>
Date:   Mon Feb 27 10:13:25 2012 +0200

    Just call it "Windows" here, too

diff --git a/configure.in b/configure.in
index 5cbd236..a7da32b 100644
--- a/configure.in
+++ b/configure.in
@@ -6366,7 +6366,7 @@ if test "x$enable_postgresql_sdbc" != "xno"; then
         ;;
     WINNT)
         if test "$with_krb5" = "yes" -o "$with_gssapi" = "yes"; then
-            AC_MSG_ERROR([Refusing to enable MIT Kerberos 5 or GSSAPI on Microsoft Windows.])
+            AC_MSG_ERROR([Refusing to enable MIT Kerberos 5 or GSSAPI on Windows.])
         fi
         ;;
     Linux|GNU|*BSD|DragonFly)
commit 675cfeee6f66e265c696d539974a87e479b7b769
Author: Tor Lillqvist <tlillqvist at suse.com>
Date:   Mon Feb 27 10:12:34 2012 +0200

    Fix shell / test OR operator confusion

diff --git a/configure.in b/configure.in
index cc251d2..5cbd236 100644
--- a/configure.in
+++ b/configure.in
@@ -6365,7 +6365,7 @@ if test "x$enable_postgresql_sdbc" != "xno"; then
         fi
         ;;
     WINNT)
-        if test "$with_krb5" = "yes" || "$with_gssapi" = "yes"; then
+        if test "$with_krb5" = "yes" -o "$with_gssapi" = "yes"; then
             AC_MSG_ERROR([Refusing to enable MIT Kerberos 5 or GSSAPI on Microsoft Windows.])
         fi
         ;;