| configure.ac (f669900d) | configure.ac (87bf159b) |
|---|---|
| 1dnl * ************************************************************* 2dnl * 3dnl * Licensed to the Apache Software Foundation (ASF) under one 4dnl * or more contributor license agreements. See the NOTICE file 5dnl * distributed with this work for additional information 6dnl * regarding copyright ownership. The ASF licenses this file 7dnl * to you under the Apache License, Version 2.0 (the 8dnl * "License"); you may not use this file except in compliance --- 1134 unchanged lines hidden (view full) --- 1143 AC_MSG_WARN([Disabling gtk-quickstarter - not supported on Mac. Use --disable-systray]) 1144 echo "Disabling gtk-quickstarter - not supported on Mac. Use --disable-systray" >>warn 1145 enable_systray=no 1146 fi 1147 if test ! -n "$CC"; then 1148 CC="`xcrun -f clang` -arch x86_64" 1149 fi 1150 if test ! -n "$CXX"; then | 1dnl * ************************************************************* 2dnl * 3dnl * Licensed to the Apache Software Foundation (ASF) under one 4dnl * or more contributor license agreements. See the NOTICE file 5dnl * distributed with this work for additional information 6dnl * regarding copyright ownership. The ASF licenses this file 7dnl * to you under the Apache License, Version 2.0 (the 8dnl * "License"); you may not use this file except in compliance --- 1134 unchanged lines hidden (view full) --- 1143 AC_MSG_WARN([Disabling gtk-quickstarter - not supported on Mac. Use --disable-systray]) 1144 echo "Disabling gtk-quickstarter - not supported on Mac. Use --disable-systray" >>warn 1145 enable_systray=no 1146 fi 1147 if test ! -n "$CC"; then 1148 CC="`xcrun -f clang` -arch x86_64" 1149 fi 1150 if test ! -n "$CXX"; then |
| 1151 CXX="`xcrun -f clang++` -arch x86_64 -std=c++11" | 1151 CXX="`xcrun -f clang++` -arch x86_64" |
| 1152 fi 1153 # Don't use OSVERSION until we know no conflicts result from it 1154 _darwin_version="`uname -r | $AWK -F . '{ print $1 }'`" 1155 _osx_version="10.`expr $_darwin_version - 4`" 1156 AC_MSG_NOTICE([Detected Darwin version: $_darwin_version ($_osx_version)]) 1157 ;; 1158 os2*) 1159 test_x=no --- 2662 unchanged lines hidden (view full) --- 3822AC_SUBST(LIBXML_CFLAGS) 3823AC_SUBST(LIBXML_LIBS) 3824 3825 3826dnl =================================================================== 3827dnl Checks for a MacOS platform SDK compatible with an OSX 10.7 deployment target 3828dnl =================================================================== 3829if test "$_os" = "Darwin"; then | 1152 fi 1153 # Don't use OSVERSION until we know no conflicts result from it 1154 _darwin_version="`uname -r | $AWK -F . '{ print $1 }'`" 1155 _osx_version="10.`expr $_darwin_version - 4`" 1156 AC_MSG_NOTICE([Detected Darwin version: $_darwin_version ($_osx_version)]) 1157 ;; 1158 os2*) 1159 test_x=no --- 2662 unchanged lines hidden (view full) --- 3822AC_SUBST(LIBXML_CFLAGS) 3823AC_SUBST(LIBXML_LIBS) 3824 3825 3826dnl =================================================================== 3827dnl Checks for a MacOS platform SDK compatible with an OSX 10.7 deployment target 3828dnl =================================================================== 3829if test "$_os" = "Darwin"; then |
| 3830 sdk_target=10.7 | 3830 sdk_target=10.9 |
| 3831 AC_MSG_CHECKING([checking SDK compatibility with OSX $sdk_target]) 3832 3833 sdk_minor=`echo $sdk_target | cut -d"." -f2` 3834 | 3831 AC_MSG_CHECKING([checking SDK compatibility with OSX $sdk_target]) 3832 3833 sdk_minor=`echo $sdk_target | cut -d"." -f2` 3834 |
| 3835 if test "$sdk_minor" -lt "7"; then | 3835 if test "$sdk_minor" -lt "9"; then |
| 3836 AC_MSG_ERROR([SDK version < 10.7 is not longer supported]) 3837 else 3838 MACOSX_DEPLOYMENT_TARGET=$sdk_target 3839 | 3836 AC_MSG_ERROR([SDK version < 10.7 is not longer supported]) 3837 else 3838 MACOSX_DEPLOYMENT_TARGET=$sdk_target 3839 |
| 3840 sdk_found=`xcodebuild -showsdks | $EGREP "sdk macosx10.(7|8|9|10|11|12)" | sed -e "s/.*sdk //" | tail -n1` | 3840 sdk_found=`xcodebuild -showsdks | $EGREP "sdk macosx10.(9|10|11|12)" | sed -e "s/.*sdk //" | tail -n1` |
| 3841 if test -z "$sdk_found"; then 3842 AC_MSG_ERROR([No SDK with OSX $sdk_target compatibility found]) 3843 else 3844 AC_MSG_RESULT([yes, by using SDK $sdk_found]) 3845 fi 3846 3847 sdk_path=`xcodebuild -version -sdk ${sdk_found} Path` 3848 AC_MSG_CHECKING([for $sdk_path]) --- 3482 unchanged lines hidden --- | 3841 if test -z "$sdk_found"; then 3842 AC_MSG_ERROR([No SDK with OSX $sdk_target compatibility found]) 3843 else 3844 AC_MSG_RESULT([yes, by using SDK $sdk_found]) 3845 fi 3846 3847 sdk_path=`xcodebuild -version -sdk ${sdk_found} Path` 3848 AC_MSG_CHECKING([for $sdk_path]) --- 3482 unchanged lines hidden --- |