| configure.ac (6d53c851) | configure.ac (0e91ffb3) |
|---|---|
| 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 --- 1140 unchanged lines hidden (view full) --- 1149 AC_MSG_WARN([Disabling gtk-quickstarter - not supported on Mac. Use --disable-systray]) 1150 echo "Disabling gtk-quickstarter - not supported on Mac. Use --disable-systray" >>warn 1151 enable_systray=no 1152 fi 1153 if test ! -n "$CC"; then 1154 CC="`xcrun -f clang` -arch x86_64" 1155 fi 1156 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 --- 1140 unchanged lines hidden (view full) --- 1149 AC_MSG_WARN([Disabling gtk-quickstarter - not supported on Mac. Use --disable-systray]) 1150 echo "Disabling gtk-quickstarter - not supported on Mac. Use --disable-systray" >>warn 1151 enable_systray=no 1152 fi 1153 if test ! -n "$CC"; then 1154 CC="`xcrun -f clang` -arch x86_64" 1155 fi 1156 if test ! -n "$CXX"; then |
| 1157 CXX="`xcrun -f clang++` -arch x86_64" | 1157 CXX="`xcrun -f clang++` -stdlib=libc++ -arch x86_64" |
| 1158 fi 1159 # Don't use OSVERSION until we know no conflicts result from it 1160 _darwin_version="`uname -r | $AWK -F . '{ print $1 }'`" 1161 _osx_version="10.`expr $_darwin_version - 4`" 1162 AC_MSG_NOTICE([Detected Darwin version: $_darwin_version ($_osx_version)]) 1163 ;; 1164 os2*) 1165 test_x=no --- 151 unchanged lines hidden (view full) --- 1317dnl =================================================================== 1318dnl Set the ENABLE_WERROR variable. (Activate --enable-werror) 1319dnl =================================================================== 1320AC_MSG_CHECKING([whether to turn warnings to errors]) 1321if test -n "$enable_werror" && test "$enable_werror" != "no"; then 1322 ENABLE_WERROR="TRUE" 1323 AC_MSG_RESULT([yes]) 1324 AC_MSG_WARN([Turning warnings to errors has no effect in modules or]) | 1158 fi 1159 # Don't use OSVERSION until we know no conflicts result from it 1160 _darwin_version="`uname -r | $AWK -F . '{ print $1 }'`" 1161 _osx_version="10.`expr $_darwin_version - 4`" 1162 AC_MSG_NOTICE([Detected Darwin version: $_darwin_version ($_osx_version)]) 1163 ;; 1164 os2*) 1165 test_x=no --- 151 unchanged lines hidden (view full) --- 1317dnl =================================================================== 1318dnl Set the ENABLE_WERROR variable. (Activate --enable-werror) 1319dnl =================================================================== 1320AC_MSG_CHECKING([whether to turn warnings to errors]) 1321if test -n "$enable_werror" && test "$enable_werror" != "no"; then 1322 ENABLE_WERROR="TRUE" 1323 AC_MSG_RESULT([yes]) 1324 AC_MSG_WARN([Turning warnings to errors has no effect in modules or]) |
| 1325 AC_MSG_WARN([on platforms where it has been disabled explicitly]) | 1325 AC_MSG_WARN([on platforms where it has been disabled explicitely]) |
| 1326 echo "Turning warnings to errors has no effect in modules or on platforms where it has been disabled explicitly" >> warn 1327else 1328 ENABLE_WERROR="FALSE" 1329 AC_MSG_RESULT([no]) 1330fi 1331AC_SUBST(ENABLE_WERROR) 1332 1333dnl =================================================================== --- 2604 unchanged lines hidden (view full) --- 3938 sdk_minor=`echo $sdk_target | cut -d"." -f2` 3939 3940 if test "$sdk_minor" -lt "7"; then 3941 AC_MSG_ERROR([SDK version < 10.7 is not longer supported]) 3942 else 3943 MACOSX_DEPLOYMENT_TARGET=$sdk_target 3944 3945 dnl Why not MacOSX10.9.sdk? It lacks Python.h (!?) | 1326 echo "Turning warnings to errors has no effect in modules or on platforms where it has been disabled explicitly" >> warn 1327else 1328 ENABLE_WERROR="FALSE" 1329 AC_MSG_RESULT([no]) 1330fi 1331AC_SUBST(ENABLE_WERROR) 1332 1333dnl =================================================================== --- 2604 unchanged lines hidden (view full) --- 3938 sdk_minor=`echo $sdk_target | cut -d"." -f2` 3939 3940 if test "$sdk_minor" -lt "7"; then 3941 AC_MSG_ERROR([SDK version < 10.7 is not longer supported]) 3942 else 3943 MACOSX_DEPLOYMENT_TARGET=$sdk_target 3944 3945 dnl Why not MacOSX10.9.sdk? It lacks Python.h (!?) |
| 3946 sdk_found=`xcodebuild -showsdks | $EGREP "sdk macosx10.(7|8|10|11)" | sed -e "s/.*sdk //" | tail -n1` | 3946 sdk_found=`xcodebuild -showsdks | $EGREP "sdk macosx10.(7|8|10|11|12|13|14|15)" | sed -e "s/.*sdk //" | tail -n1` |
| 3947 if test -z "$sdk_found"; then 3948 AC_MSG_ERROR([No SDK with OSX $sdk_target compatibility found]) 3949 else 3950 AC_MSG_RESULT([yes, by using SDK $sdk_found]) 3951 fi 3952 3953 sdk_path=`xcodebuild -version -sdk ${sdk_found} Path` 3954 AC_MSG_CHECKING([for $sdk_path]) --- 3566 unchanged lines hidden --- | 3947 if test -z "$sdk_found"; then 3948 AC_MSG_ERROR([No SDK with OSX $sdk_target compatibility found]) 3949 else 3950 AC_MSG_RESULT([yes, by using SDK $sdk_found]) 3951 fi 3952 3953 sdk_path=`xcodebuild -version -sdk ${sdk_found} Path` 3954 AC_MSG_CHECKING([for $sdk_path]) --- 3566 unchanged lines hidden --- |