[Libreoffice-commits] .: bin/build-ooo configure.in

[Christian Lohmaier]

 bin/build-ooo |    3 +++
 configure.in  |    5 ++++-
 2 files changed, 7 insertions(+), 1 deletion(-)

New commits:
commit d333442295aedd94c8d27bb702906c10f1880e4d
Author: Christian Lohmaier <lohmaier+LibreOffice at googlemail.com>
Date:   Sat Oct 16 18:33:16 2010 +0200

    Mac: default to LibreOfficeMacOSX & use pkg.m4 for real build as well

diff --git a/bin/build-ooo b/bin/build-ooo
index e9ff5ca..1f10182 100755
--- a/bin/build-ooo
+++ b/bin/build-ooo
@@ -50,6 +50,9 @@ echo "Env for configure:"
 set
 echo "Env for configure ends"
 
+if test "z$ACLOCAL_FLAGS" = "z" -a "z`uname -s`" = "zDarwin"; then
+    export ACLOCAL_FLAGS="-I $TOOLSDIR/m4/mac"
+fi
 eval ./autogen.sh "$CONFIGURE_OPTIONS" "$PROPAGATED_ARGS" || exit 1;
 
 # Final build preparation
diff --git a/configure.in b/configure.in
index 726b29c..f3151a7 100644
--- a/configure.in
+++ b/configure.in
@@ -665,7 +665,10 @@ case "$with_distro" in
             AC_MSG_WARN([A distribution could be selected by the option --with-distro. You can choose one from:
 $distros_list])
         fi
-	DISTRO="LibreOfficeLinuxDevel"
+        DISTRO="LibreOfficeLinuxDevel"
+        if test "z`uname -s`" = "zDarwin"; then
+            DISTRO="LibreOfficeMacOSX"
+        fi
         ;;
     NLD) DISTRO="SUSE"
         ;;