diff options
| -rwxr-xr-x | configure.in | 4 | ||||
| -rwxr-xr-x | set_soenv.in | 6 |
2 files changed, 7 insertions, 3 deletions
diff --git a/configure.in b/configure.in index f54b1e905..39f238fa8 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 a23a64138..f48cf2cf7 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 { |