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 | a60ce8b60d5c6f672c730a0b2c159d405124f7a7 (patch) | |
| tree | b3402658348c5d27848530efc6b940c06da211d8 /configure.in | |
| parent | 0b0ae70b5bbbcb4cb3ab49879a94052c9918eb23 (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.
Diffstat (limited to 'configure.in')
| -rwxr-xr-x | configure.in | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/configure.in b/configure.in index f548037425e2..be941c843338 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" |