forked from aniani/vim
updated for version 7.3.1101
Problem: Configure doesn't find Python 3 on Ubuntu 13.04. Solution: First try distutils.sysconfig. Also fix some indents. (Ken Takata)
This commit is contained in:
10
src/auto/configure
vendored
10
src/auto/configure
vendored
@@ -5347,6 +5347,10 @@ if test "${vi_cv_path_python_conf+set}" = set; then :
|
|||||||
else
|
else
|
||||||
|
|
||||||
vi_cv_path_python_conf=
|
vi_cv_path_python_conf=
|
||||||
|
d=`${vi_cv_path_python} -c "import distutils.sysconfig; print distutils.sysconfig.get_config_var('LIBPL')"`
|
||||||
|
if test -d "$d" && test -f "$d/config.c"; then
|
||||||
|
vi_cv_path_python_conf="$d"
|
||||||
|
else
|
||||||
for path in "${vi_cv_path_python_pfx}" "${vi_cv_path_python_epfx}"; do
|
for path in "${vi_cv_path_python_pfx}" "${vi_cv_path_python_epfx}"; do
|
||||||
for subdir in lib64 lib share; do
|
for subdir in lib64 lib share; do
|
||||||
d="${path}/${subdir}/python${vi_cv_var_python_version}/config"
|
d="${path}/${subdir}/python${vi_cv_var_python_version}/config"
|
||||||
@@ -5355,6 +5359,7 @@ else
|
|||||||
fi
|
fi
|
||||||
done
|
done
|
||||||
done
|
done
|
||||||
|
fi
|
||||||
|
|
||||||
fi
|
fi
|
||||||
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $vi_cv_path_python_conf" >&5
|
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $vi_cv_path_python_conf" >&5
|
||||||
@@ -5660,6 +5665,10 @@ else
|
|||||||
if test "${vi_cv_var_python3_abiflags}" != ""; then
|
if test "${vi_cv_var_python3_abiflags}" != ""; then
|
||||||
config_dir="${config_dir}-${vi_cv_var_python3_version}${vi_cv_var_python3_abiflags}"
|
config_dir="${config_dir}-${vi_cv_var_python3_version}${vi_cv_var_python3_abiflags}"
|
||||||
fi
|
fi
|
||||||
|
d=`${vi_cv_path_python3} -c "import distutils.sysconfig; print(distutils.sysconfig.get_config_var('LIBPL'))"`
|
||||||
|
if test -d "$d" && test -f "$d/config.c"; then
|
||||||
|
vi_cv_path_python3_conf="$d"
|
||||||
|
else
|
||||||
for path in "${vi_cv_path_python3_pfx}" "${vi_cv_path_python3_epfx}"; do
|
for path in "${vi_cv_path_python3_pfx}" "${vi_cv_path_python3_epfx}"; do
|
||||||
for subdir in lib64 lib share; do
|
for subdir in lib64 lib share; do
|
||||||
d="${path}/${subdir}/python${vi_cv_var_python3_version}/${config_dir}"
|
d="${path}/${subdir}/python${vi_cv_var_python3_version}/${config_dir}"
|
||||||
@@ -5668,6 +5677,7 @@ else
|
|||||||
fi
|
fi
|
||||||
done
|
done
|
||||||
done
|
done
|
||||||
|
fi
|
||||||
|
|
||||||
fi
|
fi
|
||||||
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $vi_cv_path_python3_conf" >&5
|
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $vi_cv_path_python3_conf" >&5
|
||||||
|
@@ -899,6 +899,10 @@ if test "$enable_pythoninterp" = "yes" -o "$enable_pythoninterp" = "dynamic"; th
|
|||||||
AC_CACHE_CHECK(Python's configuration directory,vi_cv_path_python_conf,
|
AC_CACHE_CHECK(Python's configuration directory,vi_cv_path_python_conf,
|
||||||
[
|
[
|
||||||
vi_cv_path_python_conf=
|
vi_cv_path_python_conf=
|
||||||
|
d=`${vi_cv_path_python} -c "import distutils.sysconfig; print distutils.sysconfig.get_config_var('LIBPL')"`
|
||||||
|
if test -d "$d" && test -f "$d/config.c"; then
|
||||||
|
vi_cv_path_python_conf="$d"
|
||||||
|
else
|
||||||
for path in "${vi_cv_path_python_pfx}" "${vi_cv_path_python_epfx}"; do
|
for path in "${vi_cv_path_python_pfx}" "${vi_cv_path_python_epfx}"; do
|
||||||
for subdir in lib64 lib share; do
|
for subdir in lib64 lib share; do
|
||||||
d="${path}/${subdir}/python${vi_cv_var_python_version}/config"
|
d="${path}/${subdir}/python${vi_cv_var_python_version}/config"
|
||||||
@@ -907,6 +911,7 @@ if test "$enable_pythoninterp" = "yes" -o "$enable_pythoninterp" = "dynamic"; th
|
|||||||
fi
|
fi
|
||||||
done
|
done
|
||||||
done
|
done
|
||||||
|
fi
|
||||||
])
|
])
|
||||||
|
|
||||||
PYTHON_CONFDIR="${vi_cv_path_python_conf}"
|
PYTHON_CONFDIR="${vi_cv_path_python_conf}"
|
||||||
@@ -1097,6 +1102,10 @@ if test "$enable_python3interp" = "yes" -o "$enable_python3interp" = "dynamic";
|
|||||||
if test "${vi_cv_var_python3_abiflags}" != ""; then
|
if test "${vi_cv_var_python3_abiflags}" != ""; then
|
||||||
config_dir="${config_dir}-${vi_cv_var_python3_version}${vi_cv_var_python3_abiflags}"
|
config_dir="${config_dir}-${vi_cv_var_python3_version}${vi_cv_var_python3_abiflags}"
|
||||||
fi
|
fi
|
||||||
|
d=`${vi_cv_path_python3} -c "import distutils.sysconfig; print(distutils.sysconfig.get_config_var('LIBPL'))"`
|
||||||
|
if test -d "$d" && test -f "$d/config.c"; then
|
||||||
|
vi_cv_path_python3_conf="$d"
|
||||||
|
else
|
||||||
for path in "${vi_cv_path_python3_pfx}" "${vi_cv_path_python3_epfx}"; do
|
for path in "${vi_cv_path_python3_pfx}" "${vi_cv_path_python3_epfx}"; do
|
||||||
for subdir in lib64 lib share; do
|
for subdir in lib64 lib share; do
|
||||||
d="${path}/${subdir}/python${vi_cv_var_python3_version}/${config_dir}"
|
d="${path}/${subdir}/python${vi_cv_var_python3_version}/${config_dir}"
|
||||||
@@ -1105,6 +1114,7 @@ if test "$enable_python3interp" = "yes" -o "$enable_python3interp" = "dynamic";
|
|||||||
fi
|
fi
|
||||||
done
|
done
|
||||||
done
|
done
|
||||||
|
fi
|
||||||
])
|
])
|
||||||
|
|
||||||
PYTHON3_CONFDIR="${vi_cv_path_python3_conf}"
|
PYTHON3_CONFDIR="${vi_cv_path_python3_conf}"
|
||||||
|
@@ -728,6 +728,8 @@ static char *(features[]) =
|
|||||||
|
|
||||||
static int included_patches[] =
|
static int included_patches[] =
|
||||||
{ /* Add new patch number below this line */
|
{ /* Add new patch number below this line */
|
||||||
|
/**/
|
||||||
|
1101,
|
||||||
/**/
|
/**/
|
||||||
1100,
|
1100,
|
||||||
/**/
|
/**/
|
||||||
|
Reference in New Issue
Block a user