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

[Libreoffice Gerrit user]

 configure.ac |   54 ++++++++++++++++++++++++++++--------------------------
 1 file changed, 28 insertions(+), 26 deletions(-)

New commits:
commit cb59a80743f9fc268828124707aca131a9b84b9c
Author: Tor Lillqvist <tml at iki.fi>
Date:   Thu Nov 8 10:54:42 2012 +0200

    Untabify where appropriate
    
    Some TABs had sneaked in again. The intent is that no TABs are used in
    this file, except in the couple of makefiles embedded as "here
    documents" where TABs must be used because that is what Make requires.
    
    Change-Id: Ia72968ae69aafd7c484cf8d47f6a9b1cfb12d24d

diff --git a/configure.ac b/configure.ac
index 38a3f28..200092a 100644
--- a/configure.ac
+++ b/configure.ac
@@ -7789,7 +7789,7 @@ if test "x$enable_postgresql_sdbc" != "xno"; then
             POSTGRESQL_LIB=""
             POSTGRESQL_INC="%OVERRIDE_ME%"
             BUILD_TYPE="$BUILD_TYPE POSTGRESQL"
-	    POSTGRESQL_TARBALL="061a9f17323117c9358ed60f33ecff78-postgresql-9.1.1.tar.bz2"
+        POSTGRESQL_TARBALL="061a9f17323117c9358ed60f33ecff78-postgresql-9.1.1.tar.bz2"
         fi
     fi
     if test "${SYSTEM_POSTGRESQL}" = "YES"; then
@@ -9509,8 +9509,8 @@ if test -n "$enable_sdremote" -a "$enable_sdremote" != "no"; then
     if test -n "$enable_bluetooth" -a "$enable_bluetooth" != "no"; then
         if test "$OS" = "LINUX"; then
             if test "$ENABLE_DBUS" = "TRUE"; then
-				AC_MSG_RESULT([yes])
-				ENABLE_BLUETOOTH=YES
+                AC_MSG_RESULT([yes])
+                ENABLE_BLUETOOTH=YES
                 dnl ===================================================================
                 dnl Check for system bluez
                 dnl ===================================================================
@@ -9523,15 +9523,15 @@ if test -n "$enable_sdremote" -a "$enable_sdremote" != "no"; then
                     AC_MSG_RESULT([internal])
                     BUILD_TYPE="$BUILD_TYPE BLUEZ"
                 fi
-			else
-				AC_MSG_RESULT([no, dbus disabled])
-				ENABLE_BLUETOOTH=NO
-			fi
-		else
-			AC_MSG_RESULT([no])
-			ENABLE_BLUETOOTH=NO
-		fi
-	fi
+            else
+                AC_MSG_RESULT([no, dbus disabled])
+                ENABLE_BLUETOOTH=NO
+            fi
+        else
+            AC_MSG_RESULT([no])
+            ENABLE_BLUETOOTH=NO
+        fi
+    fi
 else
     ENABLE_SDREMOTE=NO
     AC_MSG_RESULT([no])
@@ -9553,14 +9553,14 @@ if test  "$test_gtk" = "yes"; then
         PKG_CHECK_MODULES(GTHREAD, gthread-2.0,,AC_MSG_ERROR([requirements to build the gtk-plugin not met. Use --disable-gtk or install the missing packages]))
         BUILD_TYPE="$BUILD_TYPE GTK"
 
-	AC_MSG_CHECKING([whether to enable the systray quickstarter])
+    AC_MSG_CHECKING([whether to enable the systray quickstarter])
         if test "x$enable_systray" = "xyes"; then
-	    AC_MSG_RESULT([yes])
+        AC_MSG_RESULT([yes])
             PKG_CHECK_MODULES( GTK210, gtk+-2.0 >= 2.10.0,
                             [ ENABLE_SYSTRAY_GTK="TRUE" ],
                             [ ENABLE_SYSTRAY_GTK="" ])
         else
-	    AC_MSG_RESULT([no])
+        AC_MSG_RESULT([no])
         fi
 
         AC_MSG_CHECKING([whether to enable Gtk print dialog support])
commit 386d7762aee953f052c945bd1039bb01ead66182
Author: Tor Lillqvist <tml at iki.fi>
Date:   Thu Nov 8 10:53:14 2012 +0200

    Avoid pointless warning when building experimental code anyway
    
    Change-Id: Ied9a4fb4eed0a7fda8e6b1bd03a3dbc476797587

diff --git a/configure.ac b/configure.ac
index e2e9d67..38a3f28 100644
--- a/configure.ac
+++ b/configure.ac
@@ -2732,22 +2732,24 @@ if test "$_os" = "Darwin"; then
         esac
     fi
 
-    case "$with_macosx_version_min_required" in
-    10.4)
-        case "$with_macosx_sdk" in
+    if test "$BITNESS_OVERRIDE" == ""; then
+        case "$with_macosx_version_min_required" in
         10.4)
+            case "$with_macosx_sdk" in
+            10.4)
+                ;;
+            *)
+                AC_MSG_WARN([Building with a SDK > 10.4 possibly breaks 10.4 compatibility. Do not use for deliverable build until verified that it really works])
+                add_warning "Building with a SDK > 10.4 possibly breaks 10.4 compatibility. Do not use for deliverable build until verified that it really works"
+                ;;
+            esac
             ;;
         *)
-            AC_MSG_WARN([Building with a SDK > 10.4 possibly breaks 10.4 compatibility. Do not use for deliverable build until verified that it really works])
-            add_warning "Building with a SDK > 10.4 possibly breaks 10.4 compatibility. Do not use for deliverable build until verified that it really works"
+            AC_MSG_WARN([Building with a minimum version requirement > 10.4 breaks 10.4 compatibility. Do not use for deliverable build])
+            add_warning "Building with a minimum version requirement > 10.4 breaks 10.4 compatibility. Do not use for deliverable build"
             ;;
         esac
-        ;;
-    *)
-        AC_MSG_WARN([Building with a minimum version requirement > 10.4 breaks 10.4 compatibility. Do not use for deliverable build])
-        add_warning "Building with a minimum version requirement > 10.4 breaks 10.4 compatibility. Do not use for deliverable build"
-        ;;
-    esac
+    fi
 
     # If no CC and CXX environment vars, try to guess where the compiler is
     if test -z "$save_CC"; then