[Libreoffice-commits] .: autogen.sh configure.in

[Christian Lohmaier]

 autogen.sh   |    2 +-
 configure.in |   14 ++++++++------
 2 files changed, 9 insertions(+), 7 deletions(-)

New commits:
commit 760b608f55662df105e2d08df9516d01cabf2068
Author: Christian Lohmaier <lohmaier+LibreOffice at googlemail.com>
Date:   Fri Oct 8 23:05:41 2010 +0200

    no pkg-config for Mac, fixing breakers

diff --git a/autogen.sh b/autogen.sh
index 6f1b027..d6f2f93 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -23,7 +23,7 @@ fi
 touch ChangeLog
 
 if test "z$ACLOCAL_FLAGS" = "z" -a "z`uname -s`" = "zDarwin" ; then
-    ACLOCAL_FLAGS="-I./m4/mac"
+    ACLOCAL_FLAGS="-I ./m4/mac"
 fi
 aclocal $ACLOCAL_FLAGS || exit 1;
 automake --gnu --add-missing --copy --warnings=no-portability || exit 1;
diff --git a/configure.in b/configure.in
index 6ad380c..78bd280 100644
--- a/configure.in
+++ b/configure.in
@@ -523,12 +523,14 @@ PKG_CHECK_MODULES( MINIMUM_REQS,
 	[ libxml-2.0 fontconfig >= 1.0.1 ],
 	have_common=true, have_common=false )
 
-if test "z`uname -s`" = "zDarwin" -a -d "/Developer/SDKs/MacOSX10.4u.sdk"; then
-	AC_MSG_RESULT([ok])
-	have_common="yes"
-else
-	AC_MSG_RESULT([not met])
-	AC_MSG_ERROR([To build LibreOffice on the Mac, you need to have the 10.4u-SDK installed (rerun XCode installer)])
+if test "z`uname -s`" = "zDarwin"; then
+    if test -a -d "/Developer/SDKs/MacOSX10.4u.sdk"; then
+        AC_MSG_RESULT([ok])
+        have_common="yes"
+    else
+        AC_MSG_RESULT([not met])
+        AC_MSG_ERROR([To build LibreOffice on the Mac, you need to have the 10.4u-SDK installed (rerun XCode installer)])
+    fi
 fi
 
 # NB. according to: