ooo-build r13877 - in trunk: . patches/test

[thorstenb svn gnome org]

Author: thorstenb
Date: Thu Sep 11 09:51:46 2008
New Revision: 13877
URL: http://svn.gnome.org/viewvc/ooo-build?rev=13877&view=rev

Log:
    * patches/test/macbuild.diff: work-in-progress, getting ooo-build
    to fly on mac



Added:
   trunk/patches/test/macbuild.diff
Modified:
   trunk/ChangeLog

Added: trunk/patches/test/macbuild.diff
==============================================================================
--- (empty file)
+++ trunk/patches/test/macbuild.diff	Thu Sep 11 09:51:46 2008
@@ -0,0 +1,48 @@
+Index: bin/build-ooo
+===================================================================
+--- bin/build-ooo	(revision 13863)
++++ bin/build-ooo	(working copy)
+@@ -5,7 +5,7 @@
+ #
+ . ./setup
+ 
+-if test "z$BUILD_WIN32" = "z" -a "z`uname -s`" != "zSunOS"; then
++if test "z$BUILD_WIN32" = "z" -a "z`uname -s`" != "zSunOS" -a "z`uname -s`" != "zDarwin"; then
+     if ! test -f /proc/cpuinfo; then
+         echo "Looks like proc isn't mounted - this means almost certain"
+         echo "Java related weird build failure: please check /proc"
+Index: configure.in
+===================================================================
+--- configure.in	(revision 13863)
++++ configure.in	(working copy)
+@@ -589,7 +589,7 @@
+ AC_CHECK_HEADER(png.h, have_png=true, have_png=false)
+ AC_CHECK_HEADER(zlib.h, have_zlib=true, have_zlib=false)
+ 
+-if test "z$with_win32" = "z"; then
++if test "z$with_win32" = "z" -a "z`uname -s`" != "zDarwin"; then
+     if test "z$enable_pam" != "zno" && ! $have_pam; then
+ 	AC_MSG_ERROR(install pam-devel)
+     fi
+@@ -716,7 +716,7 @@
+    fi
+ fi
+ if test "$enable_gtk" != "no"; then
+-   if test "z$with_win32" = "z"; then
++   if test "z$with_win32" = "z" -a "z`uname -s`" != "zDarwin"; then
+       OOO_WIDGET_FLAGS="--enable-gtk $OOO_WIDGET_FLAGS"
+       widget_sets="gtk $widget_sets"
+ 
+@@ -896,7 +896,11 @@
+ 
+ 
+ AC_MSG_CHECKING([for GNU cp])
+-GNUCP=cp
++if test "z`uname -s`" = "zDarwin"; then
++   GNUCP=gcp
++else
++   GNUCP=cp
++fi
+ if test "z$with_gnu_cp" != "z"; then
+     if test "z${with_gnu_cp%%/*}" = "z" ; then
+ 	# it's an absolute path