averello/macvim-mirror
1
0
Fork 0
mirror of https://github.com/macvim-dev/macvim.git synced 2026-06-07 15:37:14 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #181 from macvim-dev/fix/enable_python2_and_python3

Browse Source 
Add --with-properly-linked-python2-python3
This commit is contained in:
Kazuki Sakamoto
2015-12-19 11:38:18 -08:00
parent f595588011 be450c3825
commit 6ea9b4ad26
2 changed files with 18 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/auto/configure
Vendored
+12 -1
View File
@@ -803,6 +803,7 @@ enable_pythoninterp
with_python_config_dir
enable_python3interp
with_python3_config_dir
with_properly_linked_python2_python3
enable_tclinterp
with_tclsh
enable_rubyinterp
@@ -1515,6 +1516,7 @@ Optional Packages:
--with-plthome=PLTHOME Use PLTHOME.
--with-python-config-dir=PATH Python's config directory
--with-python3-config-dir=PATH Python's config directory
--with-properly-linked-python2-python3 Link with properly linked Python 2 and Python 3.
--with-tclsh=PATH which tclsh to use (default: tclsh8.0)
--with-ruby-command=RUBY name of the Ruby command (default: ruby)
--with-x use the X Window System
@@ -6443,6 +6445,15 @@ fi
# Check whether --with-properly-linked-python2-python3 was given.
if test "${with_properly_linked_python2_python3+set}" = set; then :
withval=$with_properly_linked_python2_python3; vi_cv_with_properly_linked_python2_python3="yes"
else
vi_cv_with_properly_linked_python2_python3="no"
fi
if test "$python_ok" = yes && test "$python3_ok" = yes; then
$as_echo "#define DYNAMIC_PYTHON 1" >>confdefs.h
@@ -6454,7 +6465,7 @@ $as_echo_n "checking whether we can do without RTLD_GLOBAL for Python... " >&6;
CFLAGS="$CFLAGS $PYTHON_CFLAGS"
libs_save=$LIBS
LIBS="-ldl $LIBS"
if test "x$MACOSX" != "xyes"; then
if test "x$MACOSX" != "xyes" || test "$vi_cv_with_properly_linked_python2_python3" = "yes"; then
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/configure.in
+6 -1
View File
@@ -1510,6 +1510,11 @@ AC_SUBST(PYTHON3_CFLAGS)
AC_SUBST(PYTHON3_SRC)
AC_SUBST(PYTHON3_OBJ)
AC_ARG_WITH(properly-linked-python2-python3,
[ --with-properly-linked-python2-python3 Link with properly linked Python 2 and Python 3.],
[vi_cv_with_properly_linked_python2_python3="yes"],
[vi_cv_with_properly_linked_python2_python3="no"])
dnl if python2.x and python3.x are enabled one can only link in code
dnl with dlopen(), dlsym(), dlclose()
if test "$python_ok" = yes && test "$python3_ok" = yes; then
@@ -1521,7 +1526,7 @@ if test "$python_ok" = yes && test "$python3_ok" = yes; then
libs_save=$LIBS
dnl -ldl must go first to make this work on Archlinux (Roland Puntaier)
LIBS="-ldl $LIBS"
if test "x$MACOSX" != "xyes"; then
if test "x$MACOSX" != "xyes" || test "$vi_cv_with_properly_linked_python2_python3" = "yes"; then
AC_RUN_IFELSE([AC_LANG_SOURCE([
#include <dlfcn.h>
/* If this program fails, then RTLD_GLOBAL is needed.