| configure.ac (18079e30) | configure.ac (746748b1) |
|---|---|
| 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 --- 1136 unchanged lines hidden (view full) --- 1145 AC_MSG_WARN([Disabling gtk-quickstarter - not supported on Mac. Use --disable-systray]) 1146 echo "Disabling gtk-quickstarter - not supported on Mac. Use --disable-systray" >>warn 1147 enable_systray=no 1148 fi 1149 if test ! -n "$CC"; then 1150 CC="`xcrun -f clang` -arch x86_64" 1151 fi 1152 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 --- 1136 unchanged lines hidden (view full) --- 1145 AC_MSG_WARN([Disabling gtk-quickstarter - not supported on Mac. Use --disable-systray]) 1146 echo "Disabling gtk-quickstarter - not supported on Mac. Use --disable-systray" >>warn 1147 enable_systray=no 1148 fi 1149 if test ! -n "$CC"; then 1150 CC="`xcrun -f clang` -arch x86_64" 1151 fi 1152 if test ! -n "$CXX"; then |
| 1153 CXX="`xcrun -f clang++` -arch x86_64" | 1153 CXX="`xcrun -f clang++` -arch x86_64 -std=c++11" |
| 1154 fi 1155 ;; 1156 os2*) 1157 test_x=no 1158 test_cups=no 1159 test_randr=no 1160 test_gtk=no 1161 test_freetype=no --- 2756 unchanged lines hidden (view full) --- 3918AC_SUBST(LIBXML_CFLAGS) 3919AC_SUBST(LIBXML_LIBS) 3920 3921 3922dnl =================================================================== 3923dnl Checks for a MacOS platform SDK compatible with an OSX 10.7 deployment target 3924dnl =================================================================== 3925if test "$_os" = "Darwin"; then | 1154 fi 1155 ;; 1156 os2*) 1157 test_x=no 1158 test_cups=no 1159 test_randr=no 1160 test_gtk=no 1161 test_freetype=no --- 2756 unchanged lines hidden (view full) --- 3918AC_SUBST(LIBXML_CFLAGS) 3919AC_SUBST(LIBXML_LIBS) 3920 3921 3922dnl =================================================================== 3923dnl Checks for a MacOS platform SDK compatible with an OSX 10.7 deployment target 3924dnl =================================================================== 3925if test "$_os" = "Darwin"; then |
| 3926 sdk_target=10.9 | 3926 sdk_target=10.7 |
| 3927 AC_MSG_CHECKING([checking SDK compatibility with OSX $sdk_target]) 3928 3929 sdk_minor=`echo $sdk_target | cut -d"." -f2` 3930 | 3927 AC_MSG_CHECKING([checking SDK compatibility with OSX $sdk_target]) 3928 3929 sdk_minor=`echo $sdk_target | cut -d"." -f2` 3930 |
| 3931 if test "$sdk_minor" -lt "9"; then | 3931 if test "$sdk_minor" -lt "7"; then |
| 3932 AC_MSG_ERROR([SDK version < 10.7 is not longer supported]) 3933 else 3934 MACOSX_DEPLOYMENT_TARGET=$sdk_target 3935 | 3932 AC_MSG_ERROR([SDK version < 10.7 is not longer supported]) 3933 else 3934 MACOSX_DEPLOYMENT_TARGET=$sdk_target 3935 |
| 3936 sdk_found=`xcodebuild -showsdks | $EGREP "sdk macosx10.(9|10|11|12)" | sed -e "s/.*sdk //" | tail -n1` | 3936 sdk_found=`xcodebuild -showsdks | $EGREP "sdk macosx10.(7|8|9|10|11|12)" | sed -e "s/.*sdk //" | tail -n1` |
| 3937 if test -z "$sdk_found"; then 3938 AC_MSG_ERROR([No SDK with OSX $sdk_target compatibility found]) 3939 else 3940 AC_MSG_RESULT([yes, by using SDK $sdk_found]) 3941 fi 3942 3943 sdk_path=`xcodebuild -version -sdk ${sdk_found} Path` 3944 AC_MSG_CHECKING([for $sdk_path]) --- 3457 unchanged lines hidden --- | 3937 if test -z "$sdk_found"; then 3938 AC_MSG_ERROR([No SDK with OSX $sdk_target compatibility found]) 3939 else 3940 AC_MSG_RESULT([yes, by using SDK $sdk_found]) 3941 fi 3942 3943 sdk_path=`xcodebuild -version -sdk ${sdk_found} Path` 3944 AC_MSG_CHECKING([for $sdk_path]) --- 3457 unchanged lines hidden --- |