osmith
/
wireshark
forked from osmocom/wireshark
1
0
Fork 0
Code Pull Requests Releases Wiki Activity

To handle the hypothetical case of an OS X release offering a choice of 

installing command-line developer tools with no SDKs but with a standard
UN*Xy /usr/include or of installing Full Frontal Xcode, if the user
didn't specify building against an SDK, check to see whether we *have*
any SDKs and, if not, don't set the deployment target.

svn path=/trunk/; revision=51501
This commit is contained in:
Guy Harris 2013-08-23 23:57:09 +00:00
parent 0675ed7494
commit 98db1cefbb
1 changed files with 18 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
configure.ac
View File

@ -267,10 +267,11 @@ AC_ARG_ENABLE(osx-deploy-target,
# Let the user specify an OS X release to use as a
# deplayment target; if they specify that we should
# have a deployment target but don't specify the
# deployment target, pick the OS version on which the
# build is being done. This also causes the build to
# be done against an SDK rather than against the headers
# and libraries in /usr/include and /usr/lib.
# deployment target, then, if we have SDKs available,
# pick the OS version on which the build is being done.
# This also causes the build to be done against an SDK
# rather than against the headers and libraries in
# /usr/include and /usr/lib.
#
# Check for an OS X deployment target early, so that
# as many tests using the compiler are done using the
@ -319,13 +320,23 @@ AC_ARG_ENABLE(osx-deploy-target,
#
# Yes.
#
# Default to targeting the major version number of
# the version of OS X on which we're running.
# If we have SDKs available, default to targeting the major
# version number of the version of OS X on which we're
# running.
#
# (We quote the command so that we can use autoconf's
# M4 quoting characters, [ and ], in the sed expression.)
#
[deploy_target=`sw_vers -productVersion | sed 's/\([0-9][0-9]*\)\.\([0-9][0-9]*\)\.[0-9]*/\1.\2/'`]
for i in /Developer/SDKs \
/Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs \
/Library/Developer/CommandLineTools/SDKs
do
if [ -d "$i" ]
then
[deploy_target=`sw_vers -productVersion | sed 's/\([0-9][0-9]*\)\.\([0-9][0-9]*\)\.[0-9]*/\1.\2/'`]
break
fi
done
;;
*)