On Darwin, should not build readline if there is brewed readline

This commit is contained in:
Yamashita Yuu 2013-12-16 16:27:45 +09:00
parent db141f66a4
commit aa76fd2f9c

View file

@ -920,19 +920,17 @@ use_homebrew_yaml() {
} }
has_broken_mac_readline() { has_broken_mac_readline() {
if [ "$(uname -s)" = "Darwin" ]; then if [ "$(uname -s)" = "Darwin" ] && ! use_homebrew_readline; then
use_homebrew_readline || { # MacOSX 10.4 has a broken readline.
# MacOSX 10.4 has a broken readline. # https://github.com/yyuu/pyenv/issues/23
# https://github.com/yyuu/pyenv/issues/23 local retval=1
local retval=1 local conftest="$BUILD_PATH/has_broken_mac_readline.h"
local conftest="$BUILD_PATH/has_broken_mac_readline.h" if [ "$(uname -s)" = "Darwin" ]; then
if [ "$(uname -s)" = "Darwin" ]; then echo "#include <readline/rlconf.h>" > "$conftest"
echo "#include <readline/rlconf.h>" > "$conftest" "${CPP:-cpp}" $CPPFLAGS "$conftest" 1>/dev/null 2>&1 || retval=0
"${CPP:-cpp}" $CPPFLAGS "$conftest" 1>/dev/null 2>&1 || retval=0 rm -f "$conftest"
rm -f "$conftest" fi
fi return "$retval"
return "$retval"
}
else else
return 1 return 1
fi fi