Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Add macosx11.1 support to configure #469

Closed
wants to merge 1 commit into from
Closed

Add macosx11.1 support to configure #469

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@ lib-stamp
lib/*
libtool
portaudio-2.0.pc
autom4te.cache/*

# Precompiled Headers
*.gch
Expand Down
52 changes: 26 additions & 26 deletions configure
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -723,7 +723,6 @@ infodir
docdir
oldincludedir
includedir
runstatedir
localstatedir
sharedstatedir
sysconfdir
Expand Down Expand Up @@ -822,7 +821,6 @@ datadir='${datarootdir}'
sysconfdir='${prefix}/etc'
sharedstatedir='${prefix}/com'
localstatedir='${prefix}/var'
runstatedir='${localstatedir}/run'
includedir='${prefix}/include'
oldincludedir='/usr/include'
docdir='${datarootdir}/doc/${PACKAGE}'
Expand Down Expand Up @@ -1075,15 +1073,6 @@ do
| -silent | --silent | --silen | --sile | --sil)
silent=yes ;;

-runstatedir | --runstatedir | --runstatedi | --runstated \
| --runstate | --runstat | --runsta | --runst | --runs \
| --run | --ru | --r)
ac_prev=runstatedir ;;
-runstatedir=* | --runstatedir=* | --runstatedi=* | --runstated=* \
| --runstate=* | --runstat=* | --runsta=* | --runst=* | --runs=* \
| --run=* | --ru=* | --r=*)
runstatedir=$ac_optarg ;;

-sbindir | --sbindir | --sbindi | --sbind | --sbin | --sbi | --sb)
ac_prev=sbindir ;;
-sbindir=* | --sbindir=* | --sbindi=* | --sbind=* | --sbin=* \
Expand Down Expand Up @@ -1221,7 +1210,7 @@ fi
for ac_var in exec_prefix prefix bindir sbindir libexecdir datarootdir \
datadir sysconfdir sharedstatedir localstatedir includedir \
oldincludedir docdir infodir htmldir dvidir pdfdir psdir \
libdir localedir mandir runstatedir
libdir localedir mandir
do
eval ac_val=\$$ac_var
# Remove trailing slashes.
Expand Down Expand Up @@ -1374,7 +1363,6 @@ Fine tuning of the installation directories:
--sysconfdir=DIR read-only single-machine data [PREFIX/etc]
--sharedstatedir=DIR modifiable architecture-independent data [PREFIX/com]
--localstatedir=DIR modifiable single-machine data [PREFIX/var]
--runstatedir=DIR modifiable per-process data [LOCALSTATEDIR/run]
--libdir=DIR object code libraries [EPREFIX/lib]
--includedir=DIR C header files [PREFIX/include]
--oldincludedir=DIR C header files for non-gcc [/usr/include]
Expand Down Expand Up @@ -15851,41 +15839,53 @@ case "${host_os}" in
;;

*)
if xcodebuild -version -sdk macosx10.5 Path >/dev/null 2>&1 ; then
mac_version_min="-mmacosx-version-min=10.3"
if xcodebuild -version -sdk macosx10.5 Path >/dev/null 2>&1 ; then
mac_version_min="-mmacosx-version-min=10.6"
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_version_min="-mmacosx-version-min=10.6"
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_version_min="-mmacosx-version-min=10.6"
mac_sysroot="-isysroot `xcodebuild -version -sdk macosx10.7 Path`"
elif xcodebuild -version -sdk macosx10.8 Path >/dev/null 2>&1 ; then
mac_version_min="-mmacosx-version-min=10.4"
mac_version_min="-mmacosx-version-min=10.6"
mac_sysroot="-isysroot `xcodebuild -version -sdk macosx10.8 Path`"
elif xcodebuild -version -sdk macosx10.9 Path >/dev/null 2>&1 ; then
mac_version_min="-mmacosx-version-min=10.4"
mac_version_min="-mmacosx-version-min=10.6"
mac_sysroot="-isysroot `xcodebuild -version -sdk macosx10.9 Path`"
elif xcodebuild -version -sdk macosx10.10 Path >/dev/null 2>&1 ; then
mac_version_min="-mmacosx-version-min=10.4"
mac_version_min="-mmacosx-version-min=10.6"
mac_sysroot="-isysroot `xcodebuild -version -sdk macosx10.10 Path`"
elif xcodebuild -version -sdk macosx10.11 Path >/dev/null 2>&1 ; then
mac_version_min="-mmacosx-version-min=10.4"
mac_version_min="-mmacosx-version-min=10.6"
mac_sysroot="-isysroot `xcodebuild -version -sdk macosx10.11 Path`"
elif xcodebuild -version -sdk macosx10.12 Path >/dev/null 2>&1 ; then
mac_version_min="-mmacosx-version-min=10.4"
mac_version_min="-mmacosx-version-min=10.6"
mac_sysroot="-isysroot `xcodebuild -version -sdk macosx10.12 Path`"
elif xcodebuild -version -sdk macosx10.13 Path >/dev/null 2>&1 ; then
mac_version_min="-mmacosx-version-min=10.4"
mac_version_min="-mmacosx-version-min=10.6"
mac_sysroot="-isysroot `xcodebuild -version -sdk macosx10.13 Path`"
elif xcodebuild -version -sdk macosx10.14 Path >/dev/null 2>&1 ; then
mac_version_min="-mmacosx-version-min=10.4"
mac_version_min="-mmacosx-version-min=10.6"
mac_sysroot="-isysroot `xcodebuild -version -sdk macosx10.14 Path`"
elif xcodebuild -version -sdk macosx10.15 Path >/dev/null 2>&1 ; then
mac_version_min="-mmacosx-version-min=10.4"
mac_version_min="-mmacosx-version-min=10.6"
mac_sysroot="-isysroot `xcodebuild -version -sdk macosx10.15 Path`"
elif xcodebuild -version -sdk macosx11 Path >/dev/null 2>&1 ; then
mac_version_min="-mmacosx-version-min=10.6"
mac_sysroot="-isysroot `xcodebuild -version -sdk macosx11 Path`"
elif xcodebuild -version -sdk macosx11.0 Path >/dev/null 2>&1 ; then
mac_version_min="-mmacosx-version-min=10.6"
mac_sysroot="-isysroot `xcodebuild -version -sdk macosx11.0 Path`"
elif xcodebuild -version -sdk macosx11.1 Path >/dev/null 2>&1 ; then
mac_version_min="-mmacosx-version-min=10.6"
mac_sysroot="-isysroot `xcodebuild -version -sdk macosx11.1 Path`"
elif xcodebuild -version -sdk macosx11.2 Path >/dev/null 2>&1 ; then
mac_version_min="-mmacosx-version-min=10.6"
mac_sysroot="-isysroot `xcodebuild -version -sdk macosx11.2 Path`"
else
as_fn_error $? "Could not find 10.5 to 10.13 SDK." "$LINENO" 5
as_fn_error $? "Could not find 10.5 to 11.2 SDK." "$LINENO" 5
fi
esac

Expand Down
38 changes: 26 additions & 12 deletions configure.in
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -234,41 +234,55 @@ case "${host_os}" in
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.
dnl TODO We may be able to avoid this long list of elifs by parsing:
dnl xcodebuild -version -showsdks
if xcodebuild -version -sdk macosx10.5 Path >/dev/null 2>&1 ; then
mac_version_min="-mmacosx-version-min=10.3"
mac_version_min="-mmacosx-version-min=10.6"
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_version_min="-mmacosx-version-min=10.6"
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_version_min="-mmacosx-version-min=10.6"
mac_sysroot="-isysroot `xcodebuild -version -sdk macosx10.7 Path`"
elif xcodebuild -version -sdk macosx10.8 Path >/dev/null 2>&1 ; then
mac_version_min="-mmacosx-version-min=10.4"
mac_version_min="-mmacosx-version-min=10.6"
mac_sysroot="-isysroot `xcodebuild -version -sdk macosx10.8 Path`"
elif xcodebuild -version -sdk macosx10.9 Path >/dev/null 2>&1 ; then
mac_version_min="-mmacosx-version-min=10.4"
mac_version_min="-mmacosx-version-min=10.6"
mac_sysroot="-isysroot `xcodebuild -version -sdk macosx10.9 Path`"
elif xcodebuild -version -sdk macosx10.10 Path >/dev/null 2>&1 ; then
mac_version_min="-mmacosx-version-min=10.4"
mac_version_min="-mmacosx-version-min=10.6"
mac_sysroot="-isysroot `xcodebuild -version -sdk macosx10.10 Path`"
elif xcodebuild -version -sdk macosx10.11 Path >/dev/null 2>&1 ; then
mac_version_min="-mmacosx-version-min=10.4"
mac_version_min="-mmacosx-version-min=10.6"
mac_sysroot="-isysroot `xcodebuild -version -sdk macosx10.11 Path`"
elif xcodebuild -version -sdk macosx10.12 Path >/dev/null 2>&1 ; then
mac_version_min="-mmacosx-version-min=10.4"
mac_version_min="-mmacosx-version-min=10.6"
mac_sysroot="-isysroot `xcodebuild -version -sdk macosx10.12 Path`"
elif xcodebuild -version -sdk macosx10.13 Path >/dev/null 2>&1 ; then
mac_version_min="-mmacosx-version-min=10.4"
mac_version_min="-mmacosx-version-min=10.6"
mac_sysroot="-isysroot `xcodebuild -version -sdk macosx10.13 Path`"
elif xcodebuild -version -sdk macosx10.14 Path >/dev/null 2>&1 ; then
mac_version_min="-mmacosx-version-min=10.4"
mac_version_min="-mmacosx-version-min=10.6"
mac_sysroot="-isysroot `xcodebuild -version -sdk macosx10.14 Path`"
elif xcodebuild -version -sdk macosx10.15 Path >/dev/null 2>&1 ; then
mac_version_min="-mmacosx-version-min=10.4"
mac_version_min="-mmacosx-version-min=10.6"
mac_sysroot="-isysroot `xcodebuild -version -sdk macosx10.15 Path`"
elif xcodebuild -version -sdk macosx11 Path >/dev/null 2>&1 ; then
mac_version_min="-mmacosx-version-min=10.6"
mac_sysroot="-isysroot `xcodebuild -version -sdk macosx11 Path`"
elif xcodebuild -version -sdk macosx11.0 Path >/dev/null 2>&1 ; then
mac_version_min="-mmacosx-version-min=10.6"
mac_sysroot="-isysroot `xcodebuild -version -sdk macosx11.0 Path`"
elif xcodebuild -version -sdk macosx11.1 Path >/dev/null 2>&1 ; then
mac_version_min="-mmacosx-version-min=10.6"
mac_sysroot="-isysroot `xcodebuild -version -sdk macosx11.1 Path`"
elif xcodebuild -version -sdk macosx11.2 Path >/dev/null 2>&1 ; then
mac_version_min="-mmacosx-version-min=10.6"
mac_sysroot="-isysroot `xcodebuild -version -sdk macosx11.2 Path`"
else
AC_MSG_ERROR([Could not find 10.5 to 10.13 SDK.])
AC_MSG_ERROR([Could not find 10.5 to 11.2 SDK.])
fi
esac

Expand Down