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

[Tor Lillqvist]

 README.cross |   34 ++++++++++++++++++++++++++++------
 configure.in |   20 +++++++++++++++-----
 2 files changed, 43 insertions(+), 11 deletions(-)

New commits:
commit 09f12713dda7a43c3aaae68082161eddca93c1fe
Author: Tor Lillqvist <tml at iki.fi>
Date:   Sun Jun 5 00:54:42 2011 +0300

    Mention cross-compiling to PPC Mac from Intel Mac

diff --git a/README.cross b/README.cross
index d595ab8..68c5d76 100644
--- a/README.cross
+++ b/README.cross
@@ -14,11 +14,11 @@ Searching for information about cross-compilation of OpenOffice.org
 (the predecessor of LibreOffice) you will find information about what
 actually was not cross-compilation, but using QEMU.
 
-The cross-compilation experimentation is going on for three platforms:
-Windows, iOS and Android. This work is being done on the master branch
-of LibreOffice. Some other people have talked about setting up a
-separate branch for Android work, or even separate clones at github. I
-am not interested in that.
+My cross-compilation experimentation is going on for four platforms:
+Windows, iOS, Android and PowerPC Mac OS X. I work on the master
+branch of LibreOffice. Some other people have talked about setting up
+a separate branch for Android work, or even separate clones at
+github. I am not interested in that.
 
 
 General
@@ -209,8 +209,30 @@ CXX_FOR_BUILD=ccache g++
 --with-external-tar=/mnt/hemulen/ooo/git/master/src
 
 
+PowerPC Mac OS X
+----------------
+
+Cross-compiling for PowerPC Mac OS X from Intel Mac OS X will probably
+be easy. The APIs available should after all be closely identical to
+those on Intel Mac OS X, and LibreOffice builds fine natively on
+PowerPC Mac already. I have just started experimenting with it. My
+autogen.lastrun looks like this:
+
+CC=ccache /Xcode3/usr/bin/gcc-4.0 -arch ppc
+CXX=ccache /Xcode3/usr/bin/g++-4.0 -arch ppc
+CC_FOR_BUILD=ccache /Xcode3/usr/bin/gcc-4.0
+CXX_FOR_BUILD=ccache /Xcode3/usr/bin/g++-4.0
+--build=i386-apple-darwin10.7.0
+--host=powerpc-apple-darwin10
+--disable-mozilla
+--disable-build-mozilla
+--with-external-tar=/Volumes/ooo/git/master/src
+--with-icu-native-build-root=/Users/tml/lo-macosx/icu/unxmacxi.pro/misc/build/icu/source
+
+
+
 That's all, thank you, and have a nice day. People with commit access,
-feel free to edit this document and add yourself below. Sorry for
+feel free to edit this document, and add yourself below. Sorry for
 writing now initially from such a personal point of view.
 
 --Tor Lillqvist <tlillqvist at novell.com>, <tml at iki.fi>
commit 059e973ea3233b6764400f556aecdc41f0c9c9d7
Author: Tor Lillqvist <tml at iki.fi>
Date:   Sun Jun 5 00:45:13 2011 +0300

    Improve libcurl configury
    
    Hardcode use of the curl-config from the 10.4 SDK for MacOSX. Make use
    of pkg-config to find libcurl when cross-compiling optional, if no
    libcurl package found by pkg-config, use curl-config.

diff --git a/configure.in b/configure.in
index 7fbea64..17302c6 100755
--- a/configure.in
+++ b/configure.in
@@ -4985,19 +4985,29 @@ dnl ===================================================================
 if test "$_os" = "Darwin" -a "$with_system_curl" != "no"; then
    with_system_curl=yes
 fi
-AC_MSG_CHECKING([which curl to use])
+AC_MSG_CHECKING([which libcurl to use])
 if test -n "$with_system_curl" -o -n "$with_system_libs" && \
     test "$with_system_curl" != "no"; then
    AC_MSG_RESULT([external])
    SYSTEM_CURL=YES
 
+   test $_os = Darwin && CURLCONFIG=/Developer/SDKs/MacOSX10.4u.sdk/usr/bin/curl-config
+
+   curl_version=""
    if test "$cross_compiling" = "yes"; then
-      PKG_CHECK_MODULES(CURL, libcurl)
-      curl_version=`$PKG_CONFIG --modversion libcurl`
-   else
+      dnl At least the OBS mingw32-libcurl-devel package
+      dnl comes with a proper .pc file
+      PKG_CHECK_MODULES(CURL, libcurl,, [:])
+      if test -n "CURL_PKG_ERRORS"; then
+         AC_MSG_RESULT([no])
+      else
+         curl_version=`$PKG_CONFIG --modversion libcurl`
+      fi
+   fi
+   if test -z "$curl_version"; then
       AC_PATH_PROG(CURLCONFIG, curl-config)
       if test -z "$CURLCONFIG"; then
-         AC_MSG_ERROR([install curl to run this script])
+         AC_MSG_ERROR([install the libcurl development package])
       fi
       CURL_LIBS=`$CURLCONFIG --libs`
       CURL_CFLAGS=`$CURLCONFIG --cflags`