From 626b3b72f4c4682cf4dc519624fbd04bad3d0abb Mon Sep 17 00:00:00 2001
From: Bram Moolenaar <bram@vim.org>
Date: Thu, 5 Mar 2015 16:47:20 +0100
Subject: [PATCH] updated for version 7.4.650 Problem: Configure check may fail
 because the dl library is not used. Solution: Put "-ldl" in LIBS rather than
 LDFLAGS. (Oazki Kiichi)

---
 src/auto/configure | 12 ++++++------
 src/configure.in   | 12 ++++++------
 src/version.c      |  2 ++
 3 files changed, 14 insertions(+), 12 deletions(-)

diff --git a/src/auto/configure b/src/auto/configure
index dd92e19b04..296e647057 100755
--- a/src/auto/configure
+++ b/src/auto/configure
@@ -6421,8 +6421,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;}
@@ -6480,14 +6480,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;}
@@ -6546,7 +6546,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 4e0081e0de..e682cb9ea7 100644
--- a/src/configure.in
+++ b/src/configure.in
@@ -1484,9 +1484,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.
@@ -1524,14 +1524,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>
@@ -1570,7 +1570,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 b5970a071b..9552e191dd 100644
--- a/src/version.c
+++ b/src/version.c
@@ -756,6 +756,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    650,
 /**/
     649,
 /**/