home *** CD-ROM | disk | FTP | other *** search
/ vim.ftp.fu-berlin.de / 2015-02-03.vim.ftp.fu-berlin.de.tar / vim.ftp.fu-berlin.de / patches / 7.3 / 7.3.1101 < prev    next >
Encoding:
Internet Message Format  |  2013-06-01  |  9.2 KB
  1. To: vim_dev@googlegroups.com
  2. Subject: Patch 7.3.1101
  3. Fcc: outbox
  4. From: Bram Moolenaar <Bram@moolenaar.net>
  5. Mime-Version: 1.0
  6. Content-Type: text/plain; charset=UTF-8
  7. Content-Transfer-Encoding: 8bit
  8. ------------
  9.  
  10. Patch 7.3.1101
  11. Problem:    Configure doesn't find Python 3 on Ubuntu 13.04.
  12. Solution:   First try distutils.sysconfig. Also fix some indents.  (Ken
  13.         Takata)
  14. Files:        src/configure.in, src/auto/configure
  15.  
  16.  
  17. *** ../vim-7.3.1100/src/configure.in    2013-05-15 14:51:31.000000000 +0200
  18. --- src/configure.in    2013-06-02 19:02:31.000000000 +0200
  19. ***************
  20. *** 899,912 ****
  21.         AC_CACHE_CHECK(Python's configuration directory,vi_cv_path_python_conf,
  22.         [
  23.       vi_cv_path_python_conf=
  24. !     for path in "${vi_cv_path_python_pfx}" "${vi_cv_path_python_epfx}"; do
  25. !       for subdir in lib64 lib share; do
  26. !         d="${path}/${subdir}/python${vi_cv_var_python_version}/config"
  27. !         if test -d "$d" && test -f "$d/config.c"; then
  28. !           vi_cv_path_python_conf="$d"
  29. !         fi
  30.         done
  31. !     done
  32.         ])
  33.   
  34.         PYTHON_CONFDIR="${vi_cv_path_python_conf}"
  35. --- 899,917 ----
  36.         AC_CACHE_CHECK(Python's configuration directory,vi_cv_path_python_conf,
  37.         [
  38.       vi_cv_path_python_conf=
  39. !     d=`${vi_cv_path_python} -c "import distutils.sysconfig; print distutils.sysconfig.get_config_var('LIBPL')"`
  40. !     if test -d "$d" && test -f "$d/config.c"; then
  41. !       vi_cv_path_python_conf="$d"
  42. !     else
  43. !       for path in "${vi_cv_path_python_pfx}" "${vi_cv_path_python_epfx}"; do
  44. !         for subdir in lib64 lib share; do
  45. !           d="${path}/${subdir}/python${vi_cv_var_python_version}/config"
  46. !           if test -d "$d" && test -f "$d/config.c"; then
  47. !         vi_cv_path_python_conf="$d"
  48. !           fi
  49. !         done
  50.         done
  51. !     fi
  52.         ])
  53.   
  54.         PYTHON_CONFDIR="${vi_cv_path_python_conf}"
  55. ***************
  56. *** 1097,1110 ****
  57.        if test "${vi_cv_var_python3_abiflags}" != ""; then
  58.          config_dir="${config_dir}-${vi_cv_var_python3_version}${vi_cv_var_python3_abiflags}"
  59.        fi
  60. !      for path in "${vi_cv_path_python3_pfx}" "${vi_cv_path_python3_epfx}"; do
  61. !        for subdir in lib64 lib share; do
  62. !          d="${path}/${subdir}/python${vi_cv_var_python3_version}/${config_dir}"
  63. !          if test -d "$d" && test -f "$d/config.c"; then
  64. !            vi_cv_path_python3_conf="$d"
  65. !          fi
  66.          done
  67. !      done
  68.       ])
  69.   
  70.       PYTHON3_CONFDIR="${vi_cv_path_python3_conf}"
  71. --- 1102,1120 ----
  72.        if test "${vi_cv_var_python3_abiflags}" != ""; then
  73.          config_dir="${config_dir}-${vi_cv_var_python3_version}${vi_cv_var_python3_abiflags}"
  74.        fi
  75. !      d=`${vi_cv_path_python3} -c "import distutils.sysconfig; print(distutils.sysconfig.get_config_var('LIBPL'))"`
  76. !      if test -d "$d" && test -f "$d/config.c"; then
  77. !        vi_cv_path_python3_conf="$d"
  78. !      else
  79. !        for path in "${vi_cv_path_python3_pfx}" "${vi_cv_path_python3_epfx}"; do
  80. !      for subdir in lib64 lib share; do
  81. !        d="${path}/${subdir}/python${vi_cv_var_python3_version}/${config_dir}"
  82. !        if test -d "$d" && test -f "$d/config.c"; then
  83. !          vi_cv_path_python3_conf="$d"
  84. !        fi
  85. !      done
  86.          done
  87. !      fi
  88.       ])
  89.   
  90.       PYTHON3_CONFDIR="${vi_cv_path_python3_conf}"
  91. ***************
  92. *** 1498,1511 ****
  93.       fi
  94.       librubyarg=`$vi_cv_path_ruby -r rbconfig -e "print $ruby_rbconfig.expand($ruby_rbconfig::CONFIG[['LIBRUBYARG']])"`
  95.       librubya=`$vi_cv_path_ruby -r rbconfig -e "print $ruby_rbconfig.expand($ruby_rbconfig::CONFIG[['LIBRUBY_A']])"`
  96. !   rubylibdir=`$vi_cv_path_ruby -r rbconfig -e "print $ruby_rbconfig.expand($ruby_rbconfig::CONFIG[['libdir']])"`
  97.       if test -f "$rubylibdir/$librubya"; then
  98.         librubyarg="$librubyarg"
  99. !     RUBY_LIBS="$RUBY_LIBS -L$rubylibdir"
  100. !   elif test "$librubyarg" = "libruby.a"; then
  101. !     dnl required on Mac OS 10.3 where libruby.a doesn't exist
  102. !     librubyarg="-lruby"
  103. !     RUBY_LIBS="$RUBY_LIBS -L$rubylibdir"
  104.       fi
  105.   
  106.       if test "X$librubyarg" != "X"; then
  107. --- 1508,1521 ----
  108.       fi
  109.       librubyarg=`$vi_cv_path_ruby -r rbconfig -e "print $ruby_rbconfig.expand($ruby_rbconfig::CONFIG[['LIBRUBYARG']])"`
  110.       librubya=`$vi_cv_path_ruby -r rbconfig -e "print $ruby_rbconfig.expand($ruby_rbconfig::CONFIG[['LIBRUBY_A']])"`
  111. !     rubylibdir=`$vi_cv_path_ruby -r rbconfig -e "print $ruby_rbconfig.expand($ruby_rbconfig::CONFIG[['libdir']])"`
  112.       if test -f "$rubylibdir/$librubya"; then
  113.         librubyarg="$librubyarg"
  114. !       RUBY_LIBS="$RUBY_LIBS -L$rubylibdir"
  115. !     elif test "$librubyarg" = "libruby.a"; then
  116. !       dnl required on Mac OS 10.3 where libruby.a doesn't exist
  117. !       librubyarg="-lruby"
  118. !       RUBY_LIBS="$RUBY_LIBS -L$rubylibdir"
  119.       fi
  120.   
  121.       if test "X$librubyarg" != "X"; then
  122. *** ../vim-7.3.1100/src/auto/configure    2013-05-15 14:51:31.000000000 +0200
  123. --- src/auto/configure    2013-06-02 19:03:17.000000000 +0200
  124. ***************
  125. *** 5347,5360 ****
  126.   else
  127.   
  128.       vi_cv_path_python_conf=
  129. !     for path in "${vi_cv_path_python_pfx}" "${vi_cv_path_python_epfx}"; do
  130. !       for subdir in lib64 lib share; do
  131. !         d="${path}/${subdir}/python${vi_cv_var_python_version}/config"
  132. !         if test -d "$d" && test -f "$d/config.c"; then
  133. !           vi_cv_path_python_conf="$d"
  134. !         fi
  135.         done
  136. !     done
  137.   
  138.   fi
  139.   { $as_echo "$as_me:${as_lineno-$LINENO}: result: $vi_cv_path_python_conf" >&5
  140. --- 5347,5365 ----
  141.   else
  142.   
  143.       vi_cv_path_python_conf=
  144. !     d=`${vi_cv_path_python} -c "import distutils.sysconfig; print distutils.sysconfig.get_config_var('LIBPL')"`
  145. !     if test -d "$d" && test -f "$d/config.c"; then
  146. !       vi_cv_path_python_conf="$d"
  147. !     else
  148. !       for path in "${vi_cv_path_python_pfx}" "${vi_cv_path_python_epfx}"; do
  149. !         for subdir in lib64 lib share; do
  150. !           d="${path}/${subdir}/python${vi_cv_var_python_version}/config"
  151. !           if test -d "$d" && test -f "$d/config.c"; then
  152. !         vi_cv_path_python_conf="$d"
  153. !           fi
  154. !         done
  155.         done
  156. !     fi
  157.   
  158.   fi
  159.   { $as_echo "$as_me:${as_lineno-$LINENO}: result: $vi_cv_path_python_conf" >&5
  160. ***************
  161. *** 5660,5673 ****
  162.        if test "${vi_cv_var_python3_abiflags}" != ""; then
  163.          config_dir="${config_dir}-${vi_cv_var_python3_version}${vi_cv_var_python3_abiflags}"
  164.        fi
  165. !      for path in "${vi_cv_path_python3_pfx}" "${vi_cv_path_python3_epfx}"; do
  166. !        for subdir in lib64 lib share; do
  167. !          d="${path}/${subdir}/python${vi_cv_var_python3_version}/${config_dir}"
  168. !          if test -d "$d" && test -f "$d/config.c"; then
  169. !            vi_cv_path_python3_conf="$d"
  170. !          fi
  171.          done
  172. !      done
  173.   
  174.   fi
  175.   { $as_echo "$as_me:${as_lineno-$LINENO}: result: $vi_cv_path_python3_conf" >&5
  176. --- 5665,5683 ----
  177.        if test "${vi_cv_var_python3_abiflags}" != ""; then
  178.          config_dir="${config_dir}-${vi_cv_var_python3_version}${vi_cv_var_python3_abiflags}"
  179.        fi
  180. !      d=`${vi_cv_path_python3} -c "import distutils.sysconfig; print(distutils.sysconfig.get_config_var('LIBPL'))"`
  181. !      if test -d "$d" && test -f "$d/config.c"; then
  182. !        vi_cv_path_python3_conf="$d"
  183. !      else
  184. !        for path in "${vi_cv_path_python3_pfx}" "${vi_cv_path_python3_epfx}"; do
  185. !      for subdir in lib64 lib share; do
  186. !        d="${path}/${subdir}/python${vi_cv_var_python3_version}/${config_dir}"
  187. !        if test -d "$d" && test -f "$d/config.c"; then
  188. !          vi_cv_path_python3_conf="$d"
  189. !        fi
  190. !      done
  191.          done
  192. !      fi
  193.   
  194.   fi
  195.   { $as_echo "$as_me:${as_lineno-$LINENO}: result: $vi_cv_path_python3_conf" >&5
  196. ***************
  197. *** 6408,6420 ****
  198.       fi
  199.       librubyarg=`$vi_cv_path_ruby -r rbconfig -e "print $ruby_rbconfig.expand($ruby_rbconfig::CONFIG['LIBRUBYARG'])"`
  200.       librubya=`$vi_cv_path_ruby -r rbconfig -e "print $ruby_rbconfig.expand($ruby_rbconfig::CONFIG['LIBRUBY_A'])"`
  201. !   rubylibdir=`$vi_cv_path_ruby -r rbconfig -e "print $ruby_rbconfig.expand($ruby_rbconfig::CONFIG['libdir'])"`
  202.       if test -f "$rubylibdir/$librubya"; then
  203.         librubyarg="$librubyarg"
  204. !     RUBY_LIBS="$RUBY_LIBS -L$rubylibdir"
  205. !   elif test "$librubyarg" = "libruby.a"; then
  206. !         librubyarg="-lruby"
  207. !     RUBY_LIBS="$RUBY_LIBS -L$rubylibdir"
  208.       fi
  209.   
  210.       if test "X$librubyarg" != "X"; then
  211. --- 6418,6430 ----
  212.       fi
  213.       librubyarg=`$vi_cv_path_ruby -r rbconfig -e "print $ruby_rbconfig.expand($ruby_rbconfig::CONFIG['LIBRUBYARG'])"`
  214.       librubya=`$vi_cv_path_ruby -r rbconfig -e "print $ruby_rbconfig.expand($ruby_rbconfig::CONFIG['LIBRUBY_A'])"`
  215. !     rubylibdir=`$vi_cv_path_ruby -r rbconfig -e "print $ruby_rbconfig.expand($ruby_rbconfig::CONFIG['libdir'])"`
  216.       if test -f "$rubylibdir/$librubya"; then
  217.         librubyarg="$librubyarg"
  218. !       RUBY_LIBS="$RUBY_LIBS -L$rubylibdir"
  219. !     elif test "$librubyarg" = "libruby.a"; then
  220. !             librubyarg="-lruby"
  221. !       RUBY_LIBS="$RUBY_LIBS -L$rubylibdir"
  222.       fi
  223.   
  224.       if test "X$librubyarg" != "X"; then
  225. *** ../vim-7.3.1100/src/version.c    2013-06-02 18:54:16.000000000 +0200
  226. --- src/version.c    2013-06-02 19:01:39.000000000 +0200
  227. ***************
  228. *** 730,731 ****
  229. --- 730,733 ----
  230.   {   /* Add new patch number below this line */
  231. + /**/
  232. +     1101,
  233.   /**/
  234.  
  235. -- 
  236. hundred-and-one symptoms of being an internet addict:
  237. 49. You never have to deal with busy signals when calling your ISP...because
  238.     you never log off.
  239.  
  240.  /// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net   \\\
  241. ///        sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\
  242. \\\  an exciting new programming language -- http://www.Zimbu.org        ///
  243.  \\\            help me help AIDS victims -- http://ICCF-Holland.org    ///
  244.