To: vim-dev@vim.org Subject: patch 5.5.006 Fcc: outbox From: Bram Moolenaar ------------ Patch 5.5.006 Problem: Python: When platform-dependent files are in another directory than the platform-independent files it doesn't work. Solution: Also check the executable directory, and add it to CFLAGS. (Tessa Lau) Files: src/configure.in, src/configure *** ../vim-5.5.5/src/configure.in Thu Sep 23 10:12:21 1999 --- src/configure.in Sat Sep 25 21:00:14 1999 *************** *** 203,213 **** AC_CACHE_CHECK(Python's configuration directory,vi_cv_path_python_conf, [ vi_cv_path_python_conf= ! for subdir in lib share; do ! d="${vi_cv_path_python_pfx}/${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 ]) --- 203,215 ---- 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 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 ]) *************** *** 242,248 **** ]) PYTHON_LIBS="${vi_cv_path_python_plibs}" ! PYTHON_CFLAGS="-I${vi_cv_path_python_pfx}/include/python${vi_cv_var_python_version}" PYTHON_SRC="if_python.c" PYTHON_OBJ="if_python.o py_config.o" if test "${vi_cv_var_python_version}" = "1.4"; then --- 244,254 ---- ]) PYTHON_LIBS="${vi_cv_path_python_plibs}" ! if test "${vi_cv_path_python_pfx}" = "${vi_cv_path_python_epfx}"; then ! PYTHON_CFLAGS="-I${vi_cv_path_python_pfx}/include/python${vi_cv_var_python_version}" ! else ! PYTHON_CFLAGS="-I${vi_cv_path_python_pfx}/include/python${vi_cv_var_python_version} -I${vi_cv_path_python_epfx}/include/python${vi_cv_var_python_version}" ! fi PYTHON_SRC="if_python.c" PYTHON_OBJ="if_python.o py_config.o" if test "${vi_cv_var_python_version}" = "1.4"; then *** ../vim-5.5.5/src/configure Thu Sep 23 10:12:21 1999 --- src/configure Sat Sep 25 21:00:16 1999 *************** *** 1336,1346 **** else vi_cv_path_python_conf= ! for subdir in lib share; do ! d="${vi_cv_path_python_pfx}/${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 fi --- 1336,1348 ---- else vi_cv_path_python_conf= ! for path in "${vi_cv_path_python_pfx}" "${vi_cv_path_python_epfx}"; do ! for subdir in 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 fi *************** *** 1378,1384 **** PYTHON_LIBS="${vi_cv_path_python_plibs}" ! PYTHON_CFLAGS="-I${vi_cv_path_python_pfx}/include/python${vi_cv_var_python_version}" PYTHON_SRC="if_python.c" PYTHON_OBJ="if_python.o py_config.o" if test "${vi_cv_var_python_version}" = "1.4"; then --- 1380,1390 ---- PYTHON_LIBS="${vi_cv_path_python_plibs}" ! if test "${vi_cv_path_python_pfx}" = "${vi_cv_path_python_epfx}"; then ! PYTHON_CFLAGS="-I${vi_cv_path_python_pfx}/include/python${vi_cv_var_python_version}" ! else ! PYTHON_CFLAGS="-I${vi_cv_path_python_pfx}/include/python${vi_cv_var_python_version} -I${vi_cv_path_python_epfx}/include/python${vi_cv_var_python_version}" ! fi PYTHON_SRC="if_python.c" PYTHON_OBJ="if_python.o py_config.o" if test "${vi_cv_var_python_version}" = "1.4"; then *** ../vim-5.5.5/src/version.c Sat Sep 25 20:56:51 1999 --- src/version.c Sat Sep 25 20:55:45 1999 *************** *** 420,420 **** --- 420,421 ---- { /* Add new patch number below this line */ + 6, -- hundred-and-one symptoms of being an internet addict: 174. You know what a listserv is. --/-/---- Bram Moolenaar ---- Bram@moolenaar.net ---- Bram@vim.org ---\-\-- \ \ www.vim.org/iccf www.moolenaar.net www.vim.org / /