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)

diff --git a/src/auto/configure b/src/auto/configure
index ea39c3f259b559c95dd4c5cbbd2d5391510c73e6..e391b1c5045c67567261294030cc04bb02b6218b 100755 (executable)
--- 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 4c3a89b7627dd56b970d25da74554675bc82c070..db07f863c806bc6f0a101870332261a692e67083 100644 (file)
--- 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 52e0600c89e94bea2b5f3c6afff756304b187dc4..b09aa220e950180a170c9e46b61c1e6d766f55a0 100644 (file)
--- 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 7d11c6ffa065e6e9863458e54c9a265c4ca43920..a66bacbf91a5139c88746bb7e1b33257f028a0a5 100644 (file)
--- a/src/version.c
+++ b/src/version.c
@@ -709,6 +709,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    291,
 /**/
     290,
 /**/