summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rwxr-xr-xsrc/auto/configure4
-rw-r--r--src/config.h.in3
-rw-r--r--src/configure.in6
-rw-r--r--src/version.c2
4 files changed, 11 insertions, 4 deletions
diff --git a/src/auto/configure b/src/auto/configure
index ea39c3f25..e391b1c50 100755
--- a/src/auto/configure
+++ b/src/auto/configure
@@ -5733,7 +5733,7 @@ $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="$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 @@ $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="$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;}
diff --git a/src/config.h.in b/src/config.h.in
index 4c3a89b76..db07f863c 100644
--- 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
diff --git a/src/configure.in b/src/configure.in
index 52e0600c8..b09aa220e 100644
--- a/src/configure.in
+++ b/src/configure.in
@@ -1161,7 +1161,8 @@ if test "$python_ok" = yes && test "$python3_ok" = yes; then
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 "$python3_ok" = yes; then
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>
diff --git a/src/version.c b/src/version.c
index 7d11c6ffa..a66bacbf9 100644
--- a/src/version.c
+++ b/src/version.c
@@ -710,6 +710,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 291,
+/**/
290,
/**/
289,