[Libreoffice-commits] .: configure.in set_soenv.in

[Joseph Powers]

 configure.in |    4 ++++
 set_soenv.in |    6 +++---
 2 files changed, 7 insertions(+), 3 deletions(-)

New commits:
commit 5090d5560aca64e0bd59ff8bc9b78717fe475e11
Author: Joseph Powers <jpowers27 at cox.net>
Date:   Fri Jul 29 07:52:42 2011 -0700

    Mac OS: On 10.7, the standard search paths don't work.
    
    Installing xCode 4.1 renames the xCode 3.2.6 directory to /Developer-old/;
    however, the compiler gets confused and can't find the headers and libraries.
    This patch just notifies the compiler where they are actually located.
    
    Note: I'm assuming that people compiling on 10.7 aren't trying to generate
    a PPC binary.

diff --git a/configure.in b/configure.in
index f54b1e9..39f238f 100755
--- a/configure.in
+++ b/configure.in
@@ -1742,6 +1742,10 @@ if test "$_os" = "Darwin" ; then
         MACOSX_SDK_PATH="/Developer/SDKs/MacOSX10.4u.sdk"
         if ! [ test -d "$MACOSX_SDK_PATH" ]; then
           MACOSX_SDK_PATH="/Developer-old/SDKs/MacOSX10.4u.sdk"
+          CPATH="$MACOSX_SDK_PATH/usr/include:$MACOSX_SDK_PATH/usr/include/c++/4.0.0"
+          LIBRARY_PATH="$MACOSX_SDK_PATH/usr/lib:$MACOSX_SDK_PATH/usr/lib/gcc/i686-apple-darwin10/4.0.1"
+          AC_SUBST(CPATH)
+          AC_SUBST(LIBRARY_PATH)
         fi
         macosx_sdk_value="1040"
         ;;
diff --git a/set_soenv.in b/set_soenv.in
index a23a641..f48cf2c 100755
--- a/set_soenv.in
+++ b/set_soenv.in
@@ -86,7 +86,7 @@ my ( $oldPATH, $SRC_ROOT, $SO_HOME, $JAVA_HOME, $JDK, $JAVAFLAGS, $OOO_SHELL,
      $WIN_GNUCOPY, $WIN_TOUCH, $MOZILLA_VERSION, $MOZILLA_TOOLKIT, $PREBUILD_MOZAB, $MOZILLABUILD,
      $PROEXT, $TARFILE_LOCATION, $GNUMAKE,
      $PYTHON, $SYSTEM_PYTHON, $SYSTEM_MOZILLA, $EPM_FLAGS,
-     $MACOSX_SDK_PATH);
+     $MACOSX_SDK_PATH, $CPATH, $LIBRARY_PATH);
 #
 #-------------------------------------------
 # IId. Declaring the aliases.
@@ -2491,7 +2491,7 @@ sub GetCorrectPath
 	    my $cmd = shift;
 	    while (@_) {
 		my $elem = shift;
-		
+
 		-x "$elem/$cmd" && return $elem;
 	    }
 	    return '';
@@ -2508,7 +2508,7 @@ sub GetCorrectPath
 		}
 	    }
 	    return 0;
-	}	
+	}
 
 	sub CleanupPath
 	{