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)
diff --git a/src/auto/configure b/src/auto/configure
index ddc5c1e..0258a9e 100755
--- a/src/auto/configure
+++ b/src/auto/configure
@@ -6367,8 +6367,8 @@
$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 @@
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 @@
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 033138c..7fa4297 100644
--- a/src/configure.in
+++ b/src/configure.in
@@ -1451,9 +1451,9 @@
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 @@
[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 @@
[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 4397456..92fec40 100644
--- a/src/version.c
+++ b/src/version.c
@@ -742,6 +742,8 @@
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 650,
+/**/
649,
/**/
648,
