diff options
| author | Manuel M T Chakravarty <chak@cse.unsw.edu.au> | 2008-02-21 22:44:49 +0000 |
|---|---|---|
| committer | Manuel M T Chakravarty <chak@cse.unsw.edu.au> | 2008-02-21 22:44:49 +0000 |
| commit | 5b846fa36eee0f96c4c47128706d0131f8bb4113 (patch) | |
| tree | 1991038fe55b93d063958dfe8fe230b1911f2a28 /aclocal.m4 | |
| parent | 7350aaa60aaf63074202f24208497e2d64ddffb2 (diff) | |
| download | haskell-5b846fa36eee0f96c4c47128706d0131f8bb4113.tar.gz | |
Mac OS X deployment target: piping opts through Makefiles
Diffstat (limited to 'aclocal.m4')
| -rw-r--r-- | aclocal.m4 | 28 |
1 files changed, 14 insertions, 14 deletions
diff --git a/aclocal.m4 b/aclocal.m4 index c72d15d9ac..3df243f53a 100644 --- a/aclocal.m4 +++ b/aclocal.m4 @@ -1091,31 +1091,31 @@ AC_DEFUN([CHECK_GMP], AC_REQUIRE([AC_PROG_CC]) ]) -# FP_MACOS_DEPLOYMENT_TARGET -# -------------------------- -AC_DEFUN([FP_MACOS_DEPLOYMENT_TARGET], +# FP_CHECK_MACOSX_DEPLOYMENT_TARGET +# --------------------------------- +AC_DEFUN([FP_CHECK_MACOSX_DEPLOYMENT_TARGET], [ if test "x$TargetOS_CPP-$TargetVendor_CPP" = "xdarwin-apple"; then AC_MSG_CHECKING([Mac OS X deployment target]) - case $MACOS_DEPLOYMENT_TARGET in + case $FP_MACOSX_DEPLOYMENT_TARGET in none) ;; - 10.4) MACOS_DEPLOYMENT_VERSION=10.4 - MACOS_DEPLOYMENT_SDK=/Developer/SDKs/MacOSX10.4u.sdk + 10.4) MACOSX_DEPLOYMENT_VERSION=10.4 + MACOSX_DEPLOYMENT_SDK=/Developer/SDKs/MacOSX10.4u.sdk ;; - 10.4u) MACOS_DEPLOYMENT_VERSION=10.4 - MACOS_DEPLOYMENT_SDK=/Developer/SDKs/MacOSX10.4u.sdk + 10.4u) MACOSX_DEPLOYMENT_VERSION=10.4 + MACOSX_DEPLOYMENT_SDK=/Developer/SDKs/MacOSX10.4u.sdk ;; - *) MACOS_DEPLOYMENT_VERSION=$MACOS_DEPLOYMENT_TARGET - MACOS_DEPLOYMENT_SDK=/Developer/SDKs/MacOSX${MACOS_DEPLOYMENT_TARGET}.sdk + *) MACOSX_DEPLOYMENT_VERSION=$FP_MACOSX_DEPLOYMENT_TARGET + MACOSX_DEPLOYMENT_SDK=/Developer/SDKs/MacOSX${FP_MACOSX_DEPLOYMENT_TARGET}.sdk ;; esac - if test "x$MACOS_DEPLOYMENT_TARGET" = "xnone"; then + if test "x$FP_MACOSX_DEPLOYMENT_TARGET" = "xnone"; then AC_MSG_RESULT(none) else - if test ! -d $MACOS_DEPLOYMENT_SDK; then - AC_MSG_ERROR([Unknown deployment target $MACOS_DEPLOYMENT_TARGET]) + if test ! -d $MACOSX_DEPLOYMENT_SDK; then + AC_MSG_ERROR([Unknown deployment target $FP_MACOSX_DEPLOYMENT_TARGET]) fi - AC_MSG_RESULT([${MACOS_DEPLOYMENT_VERSION} (${MACOS_DEPLOYMENT_SDK})]) + AC_MSG_RESULT([${MACOSX_DEPLOYMENT_VERSION} (${MACOSX_DEPLOYMENT_SDK})]) fi fi ]) |