configure.ac (0038efe0) configure.ac (a46cde23)
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

--- 1146 unchanged lines hidden (view full) ---

1155 enable_systray=no
1156 fi
1157 SDKROOT="`xcrun --sdk macosx --show-sdk-path`"
1158 if test ! -n "$CC"; then
1159 CC="`xcrun -f clang` -arch x86_64"
1160 fi
1161 if test ! -n "$CXX"; then
1162 CXX="`xcrun -f clang++` -std=c++11 -stdlib=libc++ -arch x86_64"
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

--- 1146 unchanged lines hidden (view full) ---

1155 enable_systray=no
1156 fi
1157 SDKROOT="`xcrun --sdk macosx --show-sdk-path`"
1158 if test ! -n "$CC"; then
1159 CC="`xcrun -f clang` -arch x86_64"
1160 fi
1161 if test ! -n "$CXX"; then
1162 CXX="`xcrun -f clang++` -std=c++11 -stdlib=libc++ -arch x86_64"
1163 macos_c11=`pwd`/macos_c11
1164 echo "#!/bin/sh" > $macos_c11
1165 echo "$CXX \$@" >> $macos_c11
1166 chmod 755 $macos_c11
1167 CXX="$macos_c11"
1163 fi
1164 # Don't use OSVERSION until we know no conflicts result from it
1165 _darwin_version="`uname -r | $AWK -F . '{ print $1 }'`"
1166 # FIXME: Assumes 10.x, breaks w/ Big Sur
1167 _osx_version="10.`expr $_darwin_version - 4`"
1168 AC_MSG_NOTICE([Detected Darwin version: $_darwin_version ($_osx_version)])
1169 ;;
1170 os2*)

--- 6328 unchanged lines hidden --- 		1168 fi
1169 # Don't use OSVERSION until we know no conflicts result from it
1170 _darwin_version="`uname -r | $AWK -F . '{ print $1 }'`"
1171 # FIXME: Assumes 10.x, breaks w/ Big Sur
1172 _osx_version="10.`expr $_darwin_version - 4`"
1173 AC_MSG_NOTICE([Detected Darwin version: $_darwin_version ($_osx_version)])
1174 ;;
1175 os2*)

--- 6328 unchanged lines hidden ---