| configure.ac (9e1bc291) | configure.ac (5532af06) |
|---|---|
| 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 --- 2432 unchanged lines hidden (view full) --- 2441 fi 2442fi 2443 2444dnl =================================================================== 2445dnl Set the gcc/gxx include directories 2446dnl =================================================================== 2447# Removed the special FreeBSD treatment. The problem was that with_gxx_include_path 2448# often contains an i386 which is expanded as a macro. | 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 --- 2432 unchanged lines hidden (view full) --- 2441 fi 2442fi 2443 2444dnl =================================================================== 2445dnl Set the gcc/gxx include directories 2446dnl =================================================================== 2447# Removed the special FreeBSD treatment. The problem was that with_gxx_include_path 2448# often contains an i386 which is expanded as a macro. |
| 2449if test "$GXX" = "yes"; then | 2449if test "$GXX" = "yes" -a "$_os" != "Darwin"; then |
| 2450 AC_MSG_CHECKING([for g++ include path]) 2451 if test -z "$with_gxx_include_path"; then 2452 with_gxx_include_path=`echo "#include <cstring>" | $CXX -E -xc++ - | $SED -n '/.*1*"\(.*\)\/cstring".*/s//\1/p' | head -n 1` 2453 if test "$with_gxx_include_path" = "/usr/libexec/(null)/include"; then 2454 with_gxx_include_path="/usr/include" 2455 fi 2456 if test "$WITH_MINGWIN" = "yes"; then 2457 with_gxx_include_path=`cygpath -d "$with_gxx_include_path"` --- 1374 unchanged lines hidden (view full) --- 3832 3833 sdk_minor=`echo $sdk_target | cut -d"." -f2` 3834 3835 if test "$sdk_minor" -lt "7"; then 3836 AC_MSG_ERROR([SDK version < 10.7 is not longer supported]) 3837 else 3838 MACOSX_DEPLOYMENT_TARGET=$sdk_target 3839 | 2450 AC_MSG_CHECKING([for g++ include path]) 2451 if test -z "$with_gxx_include_path"; then 2452 with_gxx_include_path=`echo "#include <cstring>" | $CXX -E -xc++ - | $SED -n '/.*1*"\(.*\)\/cstring".*/s//\1/p' | head -n 1` 2453 if test "$with_gxx_include_path" = "/usr/libexec/(null)/include"; then 2454 with_gxx_include_path="/usr/include" 2455 fi 2456 if test "$WITH_MINGWIN" = "yes"; then 2457 with_gxx_include_path=`cygpath -d "$with_gxx_include_path"` --- 1374 unchanged lines hidden (view full) --- 3832 3833 sdk_minor=`echo $sdk_target | cut -d"." -f2` 3834 3835 if test "$sdk_minor" -lt "7"; then 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.(9|10|11)" | sed -e "s/.*sdk //" | tail -n1` | 3840 sdk_found=`xcodebuild -showsdks | $EGREP "sdk macosx10.(7|8|9|10|11)" | sed -e "s/.*sdk //" | head -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 --- |