Repository : ssh://darcs.haskell.org//srv/darcs/ghc On branch : ghc-7.2
http://hackage.haskell.org/trac/ghc/changeset/9b875cd4cef78b5c095b375ac3bb8abc9654ef4d >--------------------------------------------------------------- commit 9b875cd4cef78b5c095b375ac3bb8abc9654ef4d Author: Ian Lynagh <[email protected]> Date: Wed Aug 3 00:49:10 2011 +0100 Refactor configure.ac's: Put XCODE_VERSION() in aclocal.m4 >--------------------------------------------------------------- aclocal.m4 | 26 ++++++++++++++++++++++++++ configure.ac | 21 +-------------------- distrib/configure.ac.in | 22 +--------------------- 3 files changed, 28 insertions(+), 41 deletions(-) diff --git a/aclocal.m4 b/aclocal.m4 index 680e0a8..dc94791 100644 --- a/aclocal.m4 +++ b/aclocal.m4 @@ -1581,4 +1581,30 @@ LIBRARY_[]translit([$1], [-], [_])[]_VERSION=`grep -i "^version:" libraries/${di AC_SUBST(LIBRARY_[]translit([$1], [-], [_])[]_VERSION) ]) +# XCODE_VERSION() +# -------------------------------- +# Gets the version number of XCode, if on a Mac +AC_DEFUN([XCODE_VERSION],[ + if test "$TargetOS_CPP" = "darwin" + then + AC_MSG_CHECKING(XCode version) + XCodeVersion=`xcodebuild -version | grep Xcode | sed "s/Xcode //"` + # Old XCode versions don't actually give the XCode version + if test "$XCodeVersion" = "" + then + AC_MSG_RESULT(not found (too old?)) + XCodeVersion1=0 + XCodeVersion2=0 + else + AC_MSG_RESULT($XCodeVersion) + XCodeVersion1=`echo "$XCodeVersion" | sed 's/\..*//'` + changequote(, )dnl + XCodeVersion2=`echo "$XCodeVersion" | sed 's/[^.]*\.\([^.]*\).*/\1/'` + changequote([, ])dnl + AC_MSG_NOTICE(XCode version component 1: $XCodeVersion1) + AC_MSG_NOTICE(XCode version component 2: $XCodeVersion2) + fi + fi +]) + # LocalWords: fi diff --git a/configure.ac b/configure.ac index d4b2a14..b8b8f3c 100644 --- a/configure.ac +++ b/configure.ac @@ -403,26 +403,7 @@ then fi fi -if test "$TargetOS_CPP" = "darwin" -then - AC_MSG_CHECKING(XCode version) - XCodeVersion=`xcodebuild -version | grep Xcode | sed "s/Xcode //"` - # Old XCode versions don't actually give the XCode version - if test "$XCodeVersion" = "" - then - AC_MSG_RESULT(not found (too old?)) - XCodeVersion1=0 - XCodeVersion2=0 - else - AC_MSG_RESULT($XCodeVersion) - XCodeVersion1=`echo "$XCodeVersion" | sed 's/\..*//'` -changequote(, )dnl - XCodeVersion2=`echo "$XCodeVersion" | sed 's/[^.]*\.\([^.]*\).*/\1/'` -changequote([, ])dnl - AC_MSG_NOTICE(XCode version component 1: $XCodeVersion1) - AC_MSG_NOTICE(XCode version component 2: $XCodeVersion2) - fi -fi +XCODE_VERSION() SplitObjsBroken=NO if test "$TargetOS_CPP" = "darwin" diff --git a/distrib/configure.ac.in b/distrib/configure.ac.in index a378004..72fb712 100644 --- a/distrib/configure.ac.in +++ b/distrib/configure.ac.in @@ -47,27 +47,7 @@ dnl ** Find the path to sed ** # AC_PATH_PROG(SedCmd,gsed sed,sed) -# -dnl ** How to invoke gcc/cpp ** -# -if test "$TargetOS_CPP" = "darwin" -then - AC_MSG_CHECKING(XCode version) - XCodeVersion=`xcodebuild -version | grep Xcode | sed "s/Xcode //"` - # Old XCode versions don't actually give the XCode version - if test "$XCodeVersion" = "" - then - AC_MSG_RESULT(not found (too old?)) - else - AC_MSG_RESULT($XCodeVersion) - XCodeVersion1=`echo "$XCodeVersion" | sed 's/\..*//'` -changequote(, )dnl - XCodeVersion2=`echo "$XCodeVersion" | sed 's/[^.]*\.\([^.]*\).*/\1/'` -changequote([, ])dnl - AC_MSG_NOTICE(XCode version component 1: $XCodeVersion1) - AC_MSG_NOTICE(XCode version component 2: $XCodeVersion2) - fi -fi +XCODE_VERSION() dnl ** Which gcc to use? dnl -------------------------------------------------------------- _______________________________________________ Cvs-ghc mailing list [email protected] http://www.haskell.org/mailman/listinfo/cvs-ghc
