diff options
| author | Bram Moolenaar <Bram@vim.org> | 2010-05-20 21:46:00 +0200 |
|---|---|---|
| committer | Bram Moolenaar <Bram@vim.org> | 2010-05-20 21:46:00 +0200 |
| commit | 218116c1d0bacf1bceb93699258c23308617b43c (patch) | |
| tree | 971357927080ba2d1cc08500f0069b3619af5ecb /src/auto | |
| parent | fa7584cb8627e3e4226b26ef1bff42f82b8eee1e (diff) | |
| download | vim-git-218116c1d0bacf1bceb93699258c23308617b43c.tar.gz | |
Various smaller changes. Updated proto files. Updated dependencies.
Diffstat (limited to 'src/auto')
| -rwxr-xr-x | src/auto/configure | 14 |
1 files changed, 9 insertions, 5 deletions
diff --git a/src/auto/configure b/src/auto/configure index cc7d2a17e..34de4f3c5 100755 --- a/src/auto/configure +++ b/src/auto/configure @@ -644,6 +644,7 @@ TCL_SRC vi_cv_path_tcl PYTHON_OBJ PYTHON_SRC +PYTHON_NOPROTO PYTHON_CFLAGS PYTHON_GETPATH_CFLAGS PYTHON_LIBS @@ -4903,7 +4904,7 @@ else tmp_mkf="$pwd/config-PyMake$$" cat -- "${PYTHON_CONFDIR}/Makefile" - <<'eof' >"${tmp_mkf}" __: - @echo "python_MODLIBS='$(MODLIBS)'" + @echo "python_BASEMODLIBS='$(BASEMODLIBS)'" @echo "python_LIBS='$(LIBS)'" @echo "python_SYSLIBS='$(SYSLIBS)'" @echo "python_LINKFORSHARED='$(LINKFORSHARED)'" @@ -4919,7 +4920,7 @@ eof else vi_cv_path_python_plibs="-L${PYTHON_CONFDIR} -lpython${vi_cv_var_python_version}" fi - vi_cv_path_python_plibs="${vi_cv_path_python_plibs} ${python_MODLIBS} ${python_LIBS} ${python_SYSLIBS} ${python_LINKFORSHARED}" + vi_cv_path_python_plibs="${vi_cv_path_python_plibs} ${python_BASEMODLIBS} ${python_LIBS} ${python_SYSLIBS} ${python_LINKFORSHARED}" vi_cv_path_python_plibs=`echo $vi_cv_path_python_plibs | sed s/-ltermcap//` fi @@ -4932,6 +4933,7 @@ fi 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_NOPROTO= PYTHON_SRC="if_python.c" if test "x$MACOSX" = "xyes"; then PYTHON_OBJ="objects/if_python.o" @@ -4943,7 +4945,7 @@ fi fi PYTHON_GETPATH_CFLAGS="-DPYTHONPATH='\"${vi_cv_path_pythonpath}\"' -DPREFIX='\"${vi_cv_path_python_pfx}\"' -DEXEC_PREFIX='\"${vi_cv_path_python_epfx}\"'" - { $as_echo "$as_me:${as_lineno-$LINENO}: checking if -pthread should be used" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking if -pthread should be used" >&5 $as_echo_n "checking if -pthread should be used... " >&6; } threadsafe_flag= thread_lib= @@ -4972,7 +4974,7 @@ main () _ACEOF if ac_fn_c_try_link "$LINENO"; then : { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -$as_echo "yes" >&6; }; PYTHON_CFLAGS="$PYTHON_CFLAGS $threadsafe_flag" +$as_echo "yes" >&6; }; PYTHON_NOPROTO="$threadsafe_flag" else { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 $as_echo "no" >&6; }; LIBS=$libs_save_old @@ -4990,7 +4992,7 @@ $as_echo "no" >&6; } $as_echo_n "checking if compile and link flags for Python are sane... " >&6; } cflags_save=$CFLAGS libs_save=$LIBS - CFLAGS="$CFLAGS $PYTHON_CFLAGS" + CFLAGS="$CFLAGS $PYTHON_CFLAGS $PYTHON_NOPROTO" LIBS="$LIBS $PYTHON_LIBS" cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ @@ -5023,6 +5025,7 @@ rm -f core conftest.err conftest.$ac_objext \ PYTHON_OBJ= PYTHON_LIBS= PYTHON_CFLAGS= + PYTHON_NOPROTO= fi fi @@ -5039,6 +5042,7 @@ fi + { $as_echo "$as_me:${as_lineno-$LINENO}: checking --enable-tclinterp argument" >&5 $as_echo_n "checking --enable-tclinterp argument... " >&6; } # Check whether --enable-tclinterp was given. |