diff options
author | Bram Moolenaar <Bram@vim.org> | 2013-06-02 19:14:17 +0200 |
---|---|---|
committer | Bram Moolenaar <Bram@vim.org> | 2013-06-02 19:14:17 +0200 |
commit | ac499e311677a58b90eadc1f5558e72da5eb1c5f (patch) | |
tree | 9357393e647c66e147ed7802fa93667ae5da99a6 /src/auto | |
parent | 78b595743931457c054156f1c86aa1fae8ba42f5 (diff) |
updated for version 7.3.1101v7.3.1101
Problem: Configure doesn't find Python 3 on Ubuntu 13.04.
Solution: First try distutils.sysconfig. Also fix some indents. (Ken
Takata)
Diffstat (limited to 'src/auto')
-rwxr-xr-x | src/auto/configure | 48 |
1 files changed, 29 insertions, 19 deletions
diff --git a/src/auto/configure b/src/auto/configure index 0559ce23cc..2bbc9cf4ef 100755 --- a/src/auto/configure +++ b/src/auto/configure @@ -5347,14 +5347,19 @@ if test "${vi_cv_path_python_conf+set}" = set; then : else vi_cv_path_python_conf= - for path in "${vi_cv_path_python_pfx}" "${vi_cv_path_python_epfx}"; do - for subdir in lib64 lib share; do - d="${path}/${subdir}/python${vi_cv_var_python_version}/config" - if test -d "$d" && test -f "$d/config.c"; then - vi_cv_path_python_conf="$d" - fi + 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 subdir in lib64 lib share; do + d="${path}/${subdir}/python${vi_cv_var_python_version}/config" + if test -d "$d" && test -f "$d/config.c"; then + vi_cv_path_python_conf="$d" + fi + done done - done + fi fi { $as_echo "$as_me:${as_lineno-$LINENO}: result: $vi_cv_path_python_conf" >&5 @@ -5660,14 +5665,19 @@ else if test "${vi_cv_var_python3_abiflags}" != ""; then config_dir="${config_dir}-${vi_cv_var_python3_version}${vi_cv_var_python3_abiflags}" fi - for path in "${vi_cv_path_python3_pfx}" "${vi_cv_path_python3_epfx}"; do - for subdir in lib64 lib share; do - d="${path}/${subdir}/python${vi_cv_var_python3_version}/${config_dir}" - if test -d "$d" && test -f "$d/config.c"; then - vi_cv_path_python3_conf="$d" - 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 subdir in lib64 lib share; do + d="${path}/${subdir}/python${vi_cv_var_python3_version}/${config_dir}" + if test -d "$d" && test -f "$d/config.c"; then + vi_cv_path_python3_conf="$d" + fi + done done - done + fi fi { $as_echo "$as_me:${as_lineno-$LINENO}: result: $vi_cv_path_python3_conf" >&5 @@ -6408,13 +6418,13 @@ $as_echo "$rubyhdrdir" >&6; } fi librubyarg=`$vi_cv_path_ruby -r rbconfig -e "print $ruby_rbconfig.expand($ruby_rbconfig::CONFIG['LIBRUBYARG'])"` librubya=`$vi_cv_path_ruby -r rbconfig -e "print $ruby_rbconfig.expand($ruby_rbconfig::CONFIG['LIBRUBY_A'])"` - rubylibdir=`$vi_cv_path_ruby -r rbconfig -e "print $ruby_rbconfig.expand($ruby_rbconfig::CONFIG['libdir'])"` + rubylibdir=`$vi_cv_path_ruby -r rbconfig -e "print $ruby_rbconfig.expand($ruby_rbconfig::CONFIG['libdir'])"` if test -f "$rubylibdir/$librubya"; then librubyarg="$librubyarg" - RUBY_LIBS="$RUBY_LIBS -L$rubylibdir" - elif test "$librubyarg" = "libruby.a"; then - librubyarg="-lruby" - RUBY_LIBS="$RUBY_LIBS -L$rubylibdir" + RUBY_LIBS="$RUBY_LIBS -L$rubylibdir" + elif test "$librubyarg" = "libruby.a"; then + librubyarg="-lruby" + RUBY_LIBS="$RUBY_LIBS -L$rubylibdir" fi if test "X$librubyarg" != "X"; then |