diff options
| author | Bram Moolenaar <bram@vim.org> | 2015-03-05 16:47:20 +0100 |
|---|---|---|
| committer | Bram Moolenaar <bram@vim.org> | 2015-03-05 16:47:20 +0100 |
| commit | 19a30d6e386164f0b226d44d9fa17da279674406 (patch) | |
| tree | 6905929d4f7e7c6a311b9c0c408367f80fc5f744 | |
| parent | a2db68a1dbca31c44377662128de8c84c62cd7a8 (diff) | |
| download | vim-19a30d6e386164f0b226d44d9fa17da279674406.tar.gz | |
Problem: Configure check may fail because the dl library is not used.
Solution: Put "-ldl" in LIBS rather than LDFLAGS. (Oazki Kiichi)
| -rwxr-xr-x | src/auto/configure | 12 | ||||
| -rw-r--r-- | src/configure.in | 12 | ||||
| -rw-r--r-- | src/version.c | 2 |
3 files changed, 14 insertions, 12 deletions
diff --git a/src/auto/configure b/src/auto/configure index ddc5c1e0..0258a9ed 100755 --- a/src/auto/configure +++ b/src/auto/configure @@ -6367,8 +6367,8 @@ if test "$python_ok" = yes && test "$python3_ok" = yes; then $as_echo_n "checking whether we can do without RTLD_GLOBAL for Python... " >&6; } cflags_save=$CFLAGS CFLAGS="$CFLAGS $PYTHON_CFLAGS" - ldflags_save=$LDFLAGS - LDFLAGS="-ldl $LDFLAGS" + libs_save=$LIBS + LIBS="-ldl $LIBS" 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;} @@ -6426,14 +6426,14 @@ fi CFLAGS=$cflags_save - LDFLAGS=$ldflags_save + LIBS=$libs_save { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we can do without RTLD_GLOBAL for Python3" >&5 $as_echo_n "checking whether we can do without RTLD_GLOBAL for Python3... " >&6; } cflags_save=$CFLAGS CFLAGS="$CFLAGS $PYTHON3_CFLAGS" - ldflags_save=$LDFLAGS - LDFLAGS="-ldl $LDFLAGS" + libs_save=$LIBS + LIBS="-ldl $LIBS" 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;} @@ -6492,7 +6492,7 @@ fi CFLAGS=$cflags_save - LDFLAGS=$ldflags_save + LIBS=$libs_save PYTHON_SRC="if_python.c" PYTHON_OBJ="objects/if_python.o" diff --git a/src/configure.in b/src/configure.in index 033138c1..7fa42973 100644 --- a/src/configure.in +++ b/src/configure.in @@ -1451,9 +1451,9 @@ if test "$python_ok" = yes && test "$python3_ok" = yes; then AC_MSG_CHECKING(whether we can do without RTLD_GLOBAL for Python) cflags_save=$CFLAGS CFLAGS="$CFLAGS $PYTHON_CFLAGS" - ldflags_save=$LDFLAGS + libs_save=$LIBS dnl -ldl must go first to make this work on Archlinux (Roland Puntaier) - LDFLAGS="-ldl $LDFLAGS" + LIBS="-ldl $LIBS" AC_RUN_IFELSE([AC_LANG_SOURCE([ #include <dlfcn.h> /* If this program fails, then RTLD_GLOBAL is needed. @@ -1491,14 +1491,14 @@ if test "$python_ok" = yes && test "$python3_ok" = yes; then [AC_MSG_RESULT(yes);AC_DEFINE(PY_NO_RTLD_GLOBAL)], [AC_MSG_RESULT(no)]) CFLAGS=$cflags_save - LDFLAGS=$ldflags_save + LIBS=$libs_save AC_MSG_CHECKING(whether we can do without RTLD_GLOBAL for Python3) cflags_save=$CFLAGS CFLAGS="$CFLAGS $PYTHON3_CFLAGS" - ldflags_save=$LDFLAGS + libs_save=$LIBS dnl -ldl must go first to make this work on Archlinux (Roland Puntaier) - LDFLAGS="-ldl $LDFLAGS" + LIBS="-ldl $LIBS" AC_RUN_IFELSE([AC_LANG_SOURCE([ #include <dlfcn.h> #include <wchar.h> @@ -1537,7 +1537,7 @@ if test "$python_ok" = yes && test "$python3_ok" = yes; then [AC_MSG_RESULT(yes);AC_DEFINE(PY3_NO_RTLD_GLOBAL)], [AC_MSG_RESULT(no)]) CFLAGS=$cflags_save - LDFLAGS=$ldflags_save + LIBS=$libs_save PYTHON_SRC="if_python.c" PYTHON_OBJ="objects/if_python.o" diff --git a/src/version.c b/src/version.c index 43974561..92fec408 100644 --- a/src/version.c +++ b/src/version.c @@ -742,6 +742,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 650, +/**/ 649, /**/ 648, |