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/configure.in | |
| parent | fa7584cb8627e3e4226b26ef1bff42f82b8eee1e (diff) | |
Various smaller changes. Updated proto files. Updated dependencies.
Diffstat (limited to 'src/configure.in')
| -rw-r--r-- | src/configure.in | 13 |
1 files changed, 9 insertions, 4 deletions
diff --git a/src/configure.in b/src/configure.in index 0068d34fa0..1d8cb09e1b 100644 --- a/src/configure.in +++ b/src/configure.in @@ -725,7 +725,7 @@ if test "$enable_pythoninterp" = "yes"; then 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)'" @@ -742,7 +742,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}" dnl remove -ltermcap, it can conflict with an earlier -lncurses vi_cv_path_python_plibs=`echo $vi_cv_path_python_plibs | sed s/-ltermcap//` fi @@ -754,6 +754,7 @@ eof 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" dnl For Mac OSX 10.2 config.o is included in the Python library. if test "x$MACOSX" = "xyes"; then @@ -773,6 +774,8 @@ eof dnl Otherwise, when using GCC, try adding -pthread to $CFLAGS. GCC dnl will then define target-specific defines, e.g., -D_REENTRANT. dnl Don't do this for Mac OSX, -pthread will generate a warning. + dnl Need to put -pthread in PYTHON_NOPROTO, because it cannot be used + dnl for cproto. AC_MSG_CHECKING([if -pthread should be used]) threadsafe_flag= thread_lib= @@ -790,7 +793,7 @@ eof CFLAGS="$CFLAGS $threadsafe_flag" LIBS="$LIBS $thread_lib" AC_TRY_LINK(,[ ], - AC_MSG_RESULT(yes); PYTHON_CFLAGS="$PYTHON_CFLAGS $threadsafe_flag", + AC_MSG_RESULT(yes); PYTHON_NOPROTO="$threadsafe_flag", AC_MSG_RESULT(no); LIBS=$libs_save_old ) CFLAGS=$cflags_save @@ -803,7 +806,7 @@ eof AC_MSG_CHECKING([if compile and link flags for Python are sane]) cflags_save=$CFLAGS libs_save=$LIBS - CFLAGS="$CFLAGS $PYTHON_CFLAGS" + CFLAGS="$CFLAGS $PYTHON_CFLAGS $PYTHON_NOPROTO" LIBS="$LIBS $PYTHON_LIBS" AC_TRY_LINK(,[ ], AC_MSG_RESULT(yes); python_ok=yes, @@ -818,6 +821,7 @@ eof PYTHON_OBJ= PYTHON_LIBS= PYTHON_CFLAGS= + PYTHON_NOPROTO= fi fi @@ -830,6 +834,7 @@ AC_SUBST(PYTHON_CONFDIR) AC_SUBST(PYTHON_LIBS) AC_SUBST(PYTHON_GETPATH_CFLAGS) AC_SUBST(PYTHON_CFLAGS) +AC_SUBST(PYTHON_NOPROTO) AC_SUBST(PYTHON_SRC) AC_SUBST(PYTHON_OBJ) |