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 | 018aedb54d46f89a2e09126398490f3742c7b7b1 (patch) | |
tree | 856b03331f4df00daa7b1945cb843e01ccd8c8b0 | |
parent | d9fd1db1864e3458e1c3676db7a68d63aa37ae26 (diff) | |
download | vim-018aedb54d46f89a2e09126398490f3742c7b7b1.tar.gz |
Problem: Configure doesn't find Python 3 on Ubuntu 13.04.
Solution: First try distutils.sysconfig. Also fix some indents. (Ken
Takata)
-rwxr-xr-x | src/auto/configure | 48 | ||||
-rw-r--r-- | src/configure.in | 50 | ||||
-rw-r--r-- | src/version.c | 2 |
3 files changed, 61 insertions, 39 deletions
diff --git a/src/auto/configure b/src/auto/configure index 0559ce23..2bbc9cf4 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 diff --git a/src/configure.in b/src/configure.in index 886c5f3f..08b8215f 100644 --- a/src/configure.in +++ b/src/configure.in @@ -899,14 +899,19 @@ if test "$enable_pythoninterp" = "yes" -o "$enable_pythoninterp" = "dynamic"; th AC_CACHE_CHECK(Python's configuration directory,vi_cv_path_python_conf, [ 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 ]) PYTHON_CONFDIR="${vi_cv_path_python_conf}" @@ -1097,14 +1102,19 @@ if test "$enable_python3interp" = "yes" -o "$enable_python3interp" = "dynamic"; 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 ]) PYTHON3_CONFDIR="${vi_cv_path_python3_conf}" @@ -1498,14 +1508,14 @@ if test "$enable_rubyinterp" = "yes" -o "$enable_rubyinterp" = "dynamic"; then 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 - dnl required on Mac OS 10.3 where libruby.a doesn't exist - librubyarg="-lruby" - RUBY_LIBS="$RUBY_LIBS -L$rubylibdir" + RUBY_LIBS="$RUBY_LIBS -L$rubylibdir" + elif test "$librubyarg" = "libruby.a"; then + dnl required on Mac OS 10.3 where libruby.a doesn't exist + librubyarg="-lruby" + RUBY_LIBS="$RUBY_LIBS -L$rubylibdir" fi if test "X$librubyarg" != "X"; then diff --git a/src/version.c b/src/version.c index 2e61a807..67990925 100644 --- a/src/version.c +++ b/src/version.c @@ -729,6 +729,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 1101, +/**/ 1100, /**/ 1099, |