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)

diff --git a/src/auto/configure b/src/auto/configure
index 0559ce23cc936772fbab01411dea799fb883f0ad..2bbc9cf4efe6d7e5b5f71d68084e78dca0450a42 100755 (executable)
--- 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 886c5f3f48a0451a0f6bac70cc03a2a4fca66a82..08b8215fb79fea110560ac1610c1455322083aea 100644 (file)
--- 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 2e61a80795bb5108788f7b00e7d4ebbf552790b2..6799092551b690126d98e1b14837fe432a993550 100644 (file)
--- a/src/version.c
+++ b/src/version.c
@@ -728,6 +728,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    1101,
 /**/
     1100,
 /**/