Mercurial > vim
changeset 3038:e8ee4b4ebf41 v7.3.291
updated for version 7.3.291
Problem: Configure doesn't work properly with Python3.
Solution: Put -ldl before $LDFLAGS. Add PY3_NO_RTLD_GLOBAL. (Roland
Puntaier)
| author | Bram Moolenaar <bram@vim.org> |
|---|---|
| date | Fri, 02 Sep 2011 12:27:25 +0200 |
| parents | 5dc0dbe052c0 |
| children | ba4c4df5c958 |
| files | src/auto/configure src/config.h.in src/configure.in src/version.c |
| diffstat | 4 files changed, 11 insertions(+), 4 deletions(-) [+] |
line wrap: on
line diff
--- a/src/auto/configure +++ b/src/auto/configure @@ -5733,7 +5733,7 @@ if test "$python_ok" = yes && test "$pyt cflags_save=$CFLAGS CFLAGS="$CFLAGS $PYTHON_CFLAGS" ldflags_save=$LDFLAGS - LDFLAGS="$LDFLAGS -ldl" + LDFLAGS="-ldl $LDFLAGS" if test "$cross_compiling" = yes; then : { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;} @@ -5798,7 +5798,7 @@ fi cflags_save=$CFLAGS CFLAGS="$CFLAGS $PYTHON3_CFLAGS" ldflags_save=$LDFLAGS - LDFLAGS="$LDFLAGS -ldl" + LDFLAGS="-ldl $LDFLAGS" if test "$cross_compiling" = yes; then : { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
--- a/src/config.h.in +++ b/src/config.h.in @@ -346,6 +346,9 @@ /* Define if dynamic python does not require RTLD_GLOBAL */ #undef PY_NO_RTLD_GLOBAL +/* Define if dynamic python3 does not require RTLD_GLOBAL */ +#undef PY3_NO_RTLD_GLOBAL + /* Define if you want to include the Ruby interpreter. */ #undef FEAT_RUBY
--- a/src/configure.in +++ b/src/configure.in @@ -1161,7 +1161,8 @@ if test "$python_ok" = yes && test "$pyt cflags_save=$CFLAGS CFLAGS="$CFLAGS $PYTHON_CFLAGS" ldflags_save=$LDFLAGS - LDFLAGS="$LDFLAGS -ldl" + dnl -ldl must go first to make this work on Archlinux (Roland Puntaier) + LDFLAGS="-ldl $LDFLAGS" AC_RUN_IFELSE([ #include <dlfcn.h> /* If this program fails, then RTLD_GLOBAL is needed. @@ -1205,7 +1206,8 @@ if test "$python_ok" = yes && test "$pyt cflags_save=$CFLAGS CFLAGS="$CFLAGS $PYTHON3_CFLAGS" ldflags_save=$LDFLAGS - LDFLAGS="$LDFLAGS -ldl" + dnl -ldl must go first to make this work on Archlinux (Roland Puntaier) + LDFLAGS="-ldl $LDFLAGS" AC_RUN_IFELSE([ #include <dlfcn.h> #include <wchar.h>