Commit 6baecccb authored by Felix Paul Kühne's avatar Felix Paul Kühne

configure.ac: allowing overwriting of the SDK version when using macosx-defaults

parent 28c4cb74
...@@ -238,10 +238,6 @@ case "${host_os}" in ...@@ -238,10 +238,6 @@ case "${host_os}" in
then then
echo "" echo ""
echo "Building with Mac OS X defaults:" echo "Building with Mac OS X defaults:"
with_macosx_version_min="10.5"
echo " Assuming --with-macosx-version-min=10.5"
with_macosx_sdk="/Developer/SDKs/MacOSX${with_macosx_version_min}.sdk"
echo " Assuming --with-macosx-sdk=/Developer/SDKs/MacOSX${with_macosx_version_min}.sdk"
build_dir=`pwd` build_dir=`pwd`
echo " Assuming --prefix=${build_dir}/vlc_install_dir" echo " Assuming --prefix=${build_dir}/vlc_install_dir"
ac_default_prefix="${build_dir}/vlc_install_dir" ac_default_prefix="${build_dir}/vlc_install_dir"
...@@ -282,6 +278,15 @@ case "${host_os}" in ...@@ -282,6 +278,15 @@ case "${host_os}" in
CXX="${CXX} -isysroot ${with_macosx_sdk}" CXX="${CXX} -isysroot ${with_macosx_sdk}"
OBJC="${OBJC} -isysroot ${with_macosx_sdk}" OBJC="${OBJC} -isysroot ${with_macosx_sdk}"
LD="${LD} -syslibroot ${with_macosx_sdk}" LD="${LD} -syslibroot ${with_macosx_sdk}"
else
echo " No desired SDK version given, falling back to 10.5"
CPP="${CPP} -isysroot /Developer/SDKs/MacOSX10.5.sdk"
CC="${CC} -isysroot /Developer/SDKs/MacOSX10.5.sdk"
CXX="${CXX} -isysroot /Developer/SDKs/MacOSX10.5.sdk"
OBJC="${OBJC} -isysroot /Developer/SDKs/MacOSX10.5.sdk"
LD="${LD} -syslibroot /Developer/SDKs/MacOSX10.5.sdk"
with_macosx_version_min="10.5"
echo " Assuming --with-macosx-version-min=10.5"
fi fi
AC_ARG_WITH(macosx-version-min, AC_ARG_WITH(macosx-version-min,
[ --with-macosx-version-min=VERSION compile for MacOSX VERSION and above]) [ --with-macosx-version-min=VERSION compile for MacOSX VERSION and above])
...@@ -3733,7 +3738,6 @@ AC_ARG_ENABLE(macosx-vlc-app, ...@@ -3733,7 +3738,6 @@ AC_ARG_ENABLE(macosx-vlc-app,
AM_CONDITIONAL(BUILD_MACOSX_VLC_APP, [test "${enable_macosx_vlc_app}" != "no" && AM_CONDITIONAL(BUILD_MACOSX_VLC_APP, [test "${enable_macosx_vlc_app}" != "no" &&
(test "${SYS}" = "darwin" || test "${enable_macosx_vlc_app}" = "yes") ]) (test "${SYS}" = "darwin" || test "${enable_macosx_vlc_app}" = "yes") ])
dnl dnl
dnl ncurses module dnl ncurses module
dnl dnl
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment