commit 6fabcbe26002fd75f87c6775239b0e51e1169d68
author Bram Moolenaar <Bram@vim.org> Fri Sep 02 12:27:25 2011 +0200
committer Bram Moolenaar <Bram@vim.org> Fri Sep 02 12:27:25 2011 +0200
tree 1c6fe3358becce900864de6cdcaa323ae94aadc6
parent 39fc42ef9d3d255d775198f47f0ba53caa078441

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)

src/auto/configure

diff --git a/src/auto/configure b/src/auto/configure
index ea39c3f..e391b1c 100755
--- a/src/auto/configure
+++ b/src/auto/configure
@@ -5733,7 +5733,7 @@
   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 @@
   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;}

src/config.h.in

diff --git a/src/config.h.in b/src/config.h.in
index 4c3a89b..db07f86 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
 

src/configure.in

diff --git a/src/configure.in b/src/configure.in
index 52e0600..b09aa22 100644
--- a/src/configure.in
+++ b/src/configure.in
@@ -1161,7 +1161,8 @@
   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 @@
   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>

src/version.c

diff --git a/src/version.c b/src/version.c
index 7d11c6f..a66bacb 100644
--- a/src/version.c
+++ b/src/version.c
@@ -710,6 +710,8 @@
 static int included_patches[] =
 {   /* Add new patch number below this line */
 /**/
+    291,
+/**/
     290,
 /**/
     289,