Mercurial > vim

comparison src/configure.in @ 4708:761e42cc79c2 v7.3.1101

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
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)
author Bram Moolenaar <bram@vim.org>
date Sun, 02 Jun 2013 19:14:17 +0200
parents a6f0544df95e
children 70b1178dec79
comparison
equal deleted inserted replaced
4707:90d88b389c5e 4708:761e42cc79c2
897 [ vi_cv_path_python_conf="${withval}" ] ) 897 [ vi_cv_path_python_conf="${withval}" ] )
898 898
899 AC_CACHE_CHECK(Python's configuration directory,vi_cv_path_python_conf, 899 AC_CACHE_CHECK(Python's configuration directory,vi_cv_path_python_conf,
900 [ 900 [
901 vi_cv_path_python_conf= 901 vi_cv_path_python_conf=
902 for path in "${vi_cv_path_python_pfx}" "${vi_cv_path_python_epfx}"; do 902 d=`${vi_cv_path_python} -c "import distutils.sysconfig; print distutils.sysconfig.get_config_var('LIBPL')"`
903 for subdir in lib64 lib share; do 903 if test -d "$d" && test -f "$d/config.c"; then
904 d="${path}/${subdir}/python${vi_cv_var_python_version}/config" 904 vi_cv_path_python_conf="$d"
905 if test -d "$d" && test -f "$d/config.c"; then 905 else
906 vi_cv_path_python_conf="$d" 906 for path in "${vi_cv_path_python_pfx}" "${vi_cv_path_python_epfx}"; do
907 fi 907 for subdir in lib64 lib share; do
908 d="${path}/${subdir}/python${vi_cv_var_python_version}/config"
909 if test -d "$d" && test -f "$d/config.c"; then
910 vi_cv_path_python_conf="$d"
911 fi
912 done
908 done 913 done
909 done 914 fi
910 ]) 915 ])
911 916
912 PYTHON_CONFDIR="${vi_cv_path_python_conf}" 917 PYTHON_CONFDIR="${vi_cv_path_python_conf}"
913 918
914 if test "X$PYTHON_CONFDIR" = "X"; then 919 if test "X$PYTHON_CONFDIR" = "X"; then
1095 vi_cv_path_python3_conf= 1100 vi_cv_path_python3_conf=
1096 config_dir="config" 1101 config_dir="config"
1097 if test "${vi_cv_var_python3_abiflags}" != ""; then 1102 if test "${vi_cv_var_python3_abiflags}" != ""; then
1098 config_dir="${config_dir}-${vi_cv_var_python3_version}${vi_cv_var_python3_abiflags}" 1103 config_dir="${config_dir}-${vi_cv_var_python3_version}${vi_cv_var_python3_abiflags}"
1099 fi 1104 fi
1100 for path in "${vi_cv_path_python3_pfx}" "${vi_cv_path_python3_epfx}"; do 1105 d=`${vi_cv_path_python3} -c "import distutils.sysconfig; print(distutils.sysconfig.get_config_var('LIBPL'))"`
1101 for subdir in lib64 lib share; do 1106 if test -d "$d" && test -f "$d/config.c"; then
1102 d="${path}/${subdir}/python${vi_cv_var_python3_version}/${config_dir}" 1107 vi_cv_path_python3_conf="$d"
1103 if test -d "$d" && test -f "$d/config.c"; then 1108 else
1104 vi_cv_path_python3_conf="$d" 1109 for path in "${vi_cv_path_python3_pfx}" "${vi_cv_path_python3_epfx}"; do
1105 fi 1110 for subdir in lib64 lib share; do
1111 d="${path}/${subdir}/python${vi_cv_var_python3_version}/${config_dir}"
1112 if test -d "$d" && test -f "$d/config.c"; then
1113 vi_cv_path_python3_conf="$d"
1114 fi
1115 done
1106 done 1116 done
1107 done 1117 fi
1108 ]) 1118 ])
1109 1119
1110 PYTHON3_CONFDIR="${vi_cv_path_python3_conf}" 1120 PYTHON3_CONFDIR="${vi_cv_path_python3_conf}"
1111 1121
1112 if test "X$PYTHON3_CONFDIR" = "X"; then 1122 if test "X$PYTHON3_CONFDIR" = "X"; then
1496 if test "X$rubylibs" != "X"; then 1506 if test "X$rubylibs" != "X"; then
1497 RUBY_LIBS="$rubylibs" 1507 RUBY_LIBS="$rubylibs"
1498 fi 1508 fi
1499 librubyarg=`$vi_cv_path_ruby -r rbconfig -e "print $ruby_rbconfig.expand($ruby_rbconfig::CONFIG[['LIBRUBYARG']])"` 1509 librubyarg=`$vi_cv_path_ruby -r rbconfig -e "print $ruby_rbconfig.expand($ruby_rbconfig::CONFIG[['LIBRUBYARG']])"`
1500 librubya=`$vi_cv_path_ruby -r rbconfig -e "print $ruby_rbconfig.expand($ruby_rbconfig::CONFIG[['LIBRUBY_A']])"` 1510 librubya=`$vi_cv_path_ruby -r rbconfig -e "print $ruby_rbconfig.expand($ruby_rbconfig::CONFIG[['LIBRUBY_A']])"`
1501 rubylibdir=`$vi_cv_path_ruby -r rbconfig -e "print $ruby_rbconfig.expand($ruby_rbconfig::CONFIG[['libdir']])"` 1511 rubylibdir=`$vi_cv_path_ruby -r rbconfig -e "print $ruby_rbconfig.expand($ruby_rbconfig::CONFIG[['libdir']])"`
1502 if test -f "$rubylibdir/$librubya"; then 1512 if test -f "$rubylibdir/$librubya"; then
1503 librubyarg="$librubyarg" 1513 librubyarg="$librubyarg"
1504 RUBY_LIBS="$RUBY_LIBS -L$rubylibdir" 1514 RUBY_LIBS="$RUBY_LIBS -L$rubylibdir"
1505 elif test "$librubyarg" = "libruby.a"; then 1515 elif test "$librubyarg" = "libruby.a"; then
1506 dnl required on Mac OS 10.3 where libruby.a doesn't exist 1516 dnl required on Mac OS 10.3 where libruby.a doesn't exist
1507 librubyarg="-lruby" 1517 librubyarg="-lruby"
1508 RUBY_LIBS="$RUBY_LIBS -L$rubylibdir" 1518 RUBY_LIBS="$RUBY_LIBS -L$rubylibdir"
1509 fi 1519 fi
1510 1520
1511 if test "X$librubyarg" != "X"; then 1521 if test "X$librubyarg" != "X"; then
1512 RUBY_LIBS="$librubyarg $RUBY_LIBS" 1522 RUBY_LIBS="$librubyarg $RUBY_LIBS"
1513 fi 1523 fi