From 62ebf76ad7add47d4faa895cdd449570f963e357 Mon Sep 17 00:00:00 2001
From: philburk <philburk@0f58301d-fd10-0410-b4af-bbb618454e57>
Date: Sat, 1 Sep 2012 21:11:27 +0000
Subject: [PATCH] Apply patch to configure to fix build on Mac Lion. See ticket
 #216.

---
 configure    | Bin 572014 -> 573306 bytes
 configure.in |  74 +++++++++++++++++++++++++++++++++++++++------------
 2 files changed, 57 insertions(+), 17 deletions(-)

diff --git a/configure b/configure
index 4b502fec0e917315a700c62cb17b214f5743a18e..a58b15da5fbec419423493b0e8cb60043674fc12 100755
GIT binary patch
delta 1094
zcmbVLOKTHR6lT&+PcvwnwyD;I_BfWtmOPq1rp1sUv5HMCtq-CF3z?XiG()E|q0<*y
zutK0vC}OfWNI`HbE?kIRyKt?78^KNgKz-oKg?K0Rk=6>K1NSg@&OP7x<~!fr`6hn<
zA+8p<f~!zds4eh?x)-2EZ)DQ8hT?L@QnlL)x}joVQJb@M%fuD5HMTX;XNM-8JWibr
zc29MMroy4TPek1m1pNDid%IWqf<0`7y9DACI7J=>8vh$gO0kaAD9DtIL6oF8c*qlj
zGnAB}nUb6QvHgj!F=(N+X}-a|+cgpq=$!#4sZnui_cUYZ?ueengMKVvt1~#8&RF(x
zxF<M(SJLx2ltZev7%~?O1AFDpFg=uE9|7T>QZ1SyRw~2TYDQIDqyxEN1m|;_DbOPs
z8XQsl^j3zZKay2NY!~{l#0C#XELeqNyU=A~G`7jNQ|uhqGB|847^>-;$E<Fu=#0tl
zM9GiVobxh>*DqWaQS2B?j9(m|5OJWaIIT|et@Qda-$ZVO4e&#hInW=6qvx}%E<KmY
zG25cvHzeWmkd%`8F`v&kOX{zjm}*t-*!=ADqDG(JyS#Ka2X0y)0q^lLT89(&Oq*Uk
z<C3MFH{j}t(DQX}m=j7@i{4gdfLj>2!zeTBrJOR&7U_WuZKYJvO&_Ds48PEv^EA21
zxBSi=IZ;uBfy&O#*_x~_(CMdK+=WQ@N1(N~%r~C{Z>?&X8a=tmw{5k@p}n5_=W1?@
pFe_b4KqoCF;3fGkL5g2eXJ>5sGQmE68iTI2?NQj;9<AT7egeA3LN)*Z

delta 377
zcmezMPwCwkrG^&97N!>F7M2#)7Pc+yDYnxs?AYz5$2+iFP1kf~=h4?qEK1H$$TYSv
zQ-ClF3X-9$3JbG%GZTccnTZnDbO(E&_GfnNLQJVSAhQ%%&Gd>>vZwENVV3|It2sTu
ziCqwEwj_qx5EG%Mh=4UJaVa1G%t&)GjbsOF1e*WBj$IDnNihtE06htDMc{N9XLj!C
ztHN3Nr)#*f^KSp=$}Ysg%*n|)-Pe!Ze0r-N`_}26!R&m~t%BLjxXV*=vy0<POEPnc
erys~=mz^Hq&n`UueIUDO`&)nZ?Qi`#dh-E&d~MhO

diff --git a/configure.in b/configure.in
index e740950..7783581 100644
--- a/configure.in
+++ b/configure.in
@@ -208,23 +208,63 @@ case "${host_os}" in
         LIBS="-framework CoreAudio -framework AudioToolbox -framework AudioUnit -framework Carbon"
 
         if test "x$enable_mac_universal" = "xyes" ; then
-           if [[ -d /Developer/SDKs/MacOSX10.5.sdk ]] ; then
-              mac_version_min="-mmacosx-version-min=10.3"
-              mac_arches="-arch i386 -arch ppc -arch x86_64 -arch ppc64"
-              mac_sysroot="-isysroot /Developer/SDKs/MacOSX10.5.sdk"
-           elif [[ -d /Developer/SDKs/MacOSX10.6.sdk ]] ; then
-              mac_version_min="-mmacosx-version-min=10.4"
-              mac_arches="-arch i386 -arch x86_64"
-              mac_sysroot="-isysroot /Developer/SDKs/MacOSX10.6.sdk"
-           elif [[ -d /Developer/SDKs/MacOSX10.7.sdk ]] ; then
-              mac_version_min="-mmacosx-version-min=10.4"
-              mac_arches="-arch i386 -arch x86_64"
-              mac_sysroot="-isysroot /Developer/SDKs/MacOSX10.7.sdk"
-           else
-              mac_version_min="-mmacosx-version-min=10.3"
-              mac_arches="-arch i386 -arch ppc"
-              mac_sysroot="-isysroot /Developer/SDKs/MacOSX10.4u.sdk"
-           fi
+           case "xcodebuild -version | sed -n 's/Xcode \(.*\)/\1/p'" in
+
+           [12]*|3.0|3.1)
+              dnl In pre-3.2 versions of Xcode, xcodebuild doesn't
+              dnl support -sdk, so we can't use that to look for
+              dnl SDKs.  However, in those versions of Xcode, the
+              dnl SDKs are under /Developer/SDKs, so we can just look
+              dnl there.  Also, we assume they had no SDKs later
+              dnl than 10.5, as 3.2 was the version that came with
+              dnl 10.6, at least if the Wikipedia page for Xcode
+              dnl is to be believed.
+              if [[ -d /Developer/SDKs/MacOSX10.5.sdk ]] ; then
+                 mac_version_min="-mmacosx-version-min=10.3"
+                 mac_sysroot="-isysroot /Developer/SDKs/MacOSX10.5.sdk"
+              else
+                 mac_version_min="-mmacosx-version-min=10.3"
+                 mac_sysroot="-isysroot /Developer/SDKs/MacOSX10.4u.sdk"
+              fi
+              ;;
+
+           *)
+              dnl In 3.2 and later, xcodebuild supports -sdk, and, in
+              dnl 4.3 and later, the SDKs aren't under /Developer/SDKs
+              dnl as there *is* no /Developer, so we use -sdk to check
+              dnl what SDKs are available and to get the full path of
+              dnl the SDKs.
+              if xcodebuild -version -sdk macosx10.5 Path >/dev/null 2>&1 ; then
+                 mac_version_min="-mmacosx-version-min=10.3"
+                 mac_sysroot="-isysroot `xcodebuild -version -sdk macosx10.5 Path`"
+              elif xcodebuild -version -sdk macosx10.6 Path >/dev/null 2>&1 ; then
+                 mac_version_min="-mmacosx-version-min=10.4"
+                 mac_sysroot="-isysroot `xcodebuild -version -sdk macosx10.6 Path`"
+              elif xcodebuild -version -sdk macosx10.7 Path >/dev/null 2>&1 ; then
+                 mac_version_min="-mmacosx-version-min=10.4"
+                 mac_sysroot="-isysroot `xcodebuild -version -sdk macosx10.7 Path`"
+              else
+                 AC_MSG_ERROR([Couldn't find 10.5, 10.6, or 10.7 SDK])
+              fi
+           esac
+
+           dnl Pick which architectures to build for based on what
+           dnl the compiler supports.
+           mac_arches=""
+           for arch in i386 x86_64 ppc ppc64
+           do
+              save_CFLAGS="$CFLAGS"
+              CFLAGS="$CFLAGS -arch $arch"
+              AC_TRY_COMPILE([], [return 0;],
+                 [
+                    if [[ -z "$mac_arches" ]] ; then
+                       mac_arches="-arch $arch"
+                    else
+                       mac_arches="$mac_arches -arch $arch"
+                    fi
+                 ])
+              CFLAGS="$save_CFLAGS"
+           done
         else
            mac_arches=""
            mac_sysroot=""
-- 
2.43.0