diff options
| author | Joseph Powers <jpowers27@cox.net> | 2011-07-30 07:03:21 -0700 |
|---|---|---|
| committer | Joseph Powers <jpowers27@cox.net> | 2011-07-30 17:05:32 -0700 |
| commit | 6639f8a1a5ae59fe99c52375f1dce2101ab7a53a (patch) | |
| tree | 199d77ca63389c4dcf35fe9c68a8dc29078de5a8 | |
| parent | 1d71ecc959d549789993eb4f8a1ffee1a55bacc4 (diff) | |
MacOS: Remove some of my changes.
tml didn't like some of them; plus, configure.in -> configure removes the
[] in if statements (atleast on my machine) so I have to use "test".
My CPATH & LIBRARY_PATH statements where unreliable; even after modifying
set_soenv.in to export them correctly. I'm currently exporting them before
the ./autogen.sh && make and things seem to work better; I'm still looking
for a better solution.
| -rwxr-xr-x | configure.in | 8 | ||||
| -rwxr-xr-x | set_soenv.in | 2 |
2 files changed, 3 insertions, 7 deletions
diff --git a/configure.in b/configure.in index f54803742..be941c843 100755 --- a/configure.in +++ b/configure.in @@ -1740,18 +1740,14 @@ if test "$_os" = "Darwin" ; then 10.4) MACOSX_SDK_PATH="/Developer/SDKs/MacOSX10.4u.sdk" - if ! [ test -d "$MACOSX_SDK_PATH" ]; then + 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" ;; 10.5) MACOSX_SDK_PATH="/Developer/SDKs/MacOSX10.5.sdk" - if ! [ test -d "$MACOSX_SDK_PATH" ] ; then + if test ! -d "$MACOSX_SDK_PATH"; then MACOSX_SDK_PATH="/Developer-old/SDKs/MacOSX10.5.sdk" fi macosx_sdk_value="1050" diff --git a/set_soenv.in b/set_soenv.in index f48cf2cf7..a26d2a0eb 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, $CPATH, $LIBRARY_PATH); + $MACOSX_SDK_PATH); # #------------------------------------------- # IId. Declaring the aliases. |