|
 |
22c937 |
To: vim_dev@googlegroups.com
|
|
|
22c937 |
Subject: Patch 7.4.299
|
|
|
22c937 |
Fcc: outbox
|
|
|
22c937 |
From: Bram Moolenaar <Bram@moolenaar.net>
|
|
|
22c937 |
Mime-Version: 1.0
|
|
|
22c937 |
Content-Type: text/plain; charset=UTF-8
|
|
|
22c937 |
Content-Transfer-Encoding: 8bit
|
|
|
22c937 |
------------
|
|
|
22c937 |
|
|
|
22c937 |
Patch 7.4.299
|
|
|
22c937 |
Problem: When running configure twice DYNAMIC_PYTHON_DLL may become empty.
|
|
|
22c937 |
Solution: Use AC_CACHE_VAL. (Ken Takata)
|
|
|
22c937 |
Files: src/configure.in, src/auto/configure
|
|
|
22c937 |
|
|
|
22c937 |
|
|
|
22c937 |
*** ../vim-7.4.298/src/configure.in 2014-04-12 13:11:58.260430356 +0200
|
|
|
22c937 |
--- src/configure.in 2014-05-22 14:39:39.326486611 +0200
|
|
|
22c937 |
***************
|
|
|
22c937 |
*** 1132,1141 ****
|
|
|
22c937 |
vi_cv_path_python_plibs=`echo $vi_cv_path_python_plibs | sed s/-ltermcap//`
|
|
|
22c937 |
fi
|
|
|
22c937 |
])
|
|
|
22c937 |
|
|
|
22c937 |
- if test "X$python_DLLLIBRARY" != "X"; then
|
|
|
22c937 |
- python_INSTSONAME="$python_DLLLIBRARY"
|
|
|
22c937 |
- fi
|
|
|
22c937 |
PYTHON_LIBS="${vi_cv_path_python_plibs}"
|
|
|
22c937 |
if test "${vi_cv_path_python_pfx}" = "${vi_cv_path_python_epfx}"; then
|
|
|
22c937 |
PYTHON_CFLAGS="-I${vi_cv_path_python_pfx}/include/python${vi_cv_var_python_version} -DPYTHON_HOME='\"${vi_cv_path_python_pfx}\"'"
|
|
|
22c937 |
--- 1132,1146 ----
|
|
|
22c937 |
vi_cv_path_python_plibs=`echo $vi_cv_path_python_plibs | sed s/-ltermcap//`
|
|
|
22c937 |
fi
|
|
|
22c937 |
])
|
|
|
22c937 |
+ AC_CACHE_VAL(vi_cv_dll_name_python,
|
|
|
22c937 |
+ [
|
|
|
22c937 |
+ if test "X$python_DLLLIBRARY" != "X"; then
|
|
|
22c937 |
+ vi_cv_dll_name_python="$python_DLLLIBRARY"
|
|
|
22c937 |
+ else
|
|
|
22c937 |
+ vi_cv_dll_name_python="$python_INSTSONAME"
|
|
|
22c937 |
+ fi
|
|
|
22c937 |
+ ])
|
|
|
22c937 |
|
|
|
22c937 |
PYTHON_LIBS="${vi_cv_path_python_plibs}"
|
|
|
22c937 |
if test "${vi_cv_path_python_pfx}" = "${vi_cv_path_python_epfx}"; then
|
|
|
22c937 |
PYTHON_CFLAGS="-I${vi_cv_path_python_pfx}/include/python${vi_cv_var_python_version} -DPYTHON_HOME='\"${vi_cv_path_python_pfx}\"'"
|
|
|
22c937 |
***************
|
|
|
22c937 |
*** 1323,1341 ****
|
|
|
22c937 |
@echo "python3_DLLLIBRARY='$(DLLLIBRARY)'"
|
|
|
22c937 |
@echo "python3_INSTSONAME='$(INSTSONAME)'"
|
|
|
22c937 |
eof
|
|
|
22c937 |
! dnl -- delete the lines from make about Entering/Leaving directory
|
|
|
22c937 |
! eval "`cd ${PYTHON3_CONFDIR} && make -f "${tmp_mkf}" __ | sed '/ directory /d'`"
|
|
|
22c937 |
! rm -f -- "${tmp_mkf}"
|
|
|
22c937 |
vi_cv_path_python3_plibs="-L${PYTHON3_CONFDIR} -lpython${vi_cv_var_python3_version}${vi_cv_var_python3_abiflags}"
|
|
|
22c937 |
! vi_cv_path_python3_plibs="${vi_cv_path_python3_plibs} ${python3_BASEMODLIBS} ${python3_LIBS} ${python3_SYSLIBS}"
|
|
|
22c937 |
! dnl remove -ltermcap, it can conflict with an earlier -lncurses
|
|
|
22c937 |
! vi_cv_path_python3_plibs=`echo $vi_cv_path_python3_plibs | sed s/-ltermcap//`
|
|
|
22c937 |
! vi_cv_path_python3_plibs=`echo $vi_cv_path_python3_plibs | sed s/-lffi//`
|
|
|
22c937 |
! ])
|
|
|
22c937 |
!
|
|
|
22c937 |
! if test "X$python3_DLLLIBRARY" != "X"; then
|
|
|
22c937 |
! python3_INSTSONAME="$python3_DLLLIBRARY"
|
|
|
22c937 |
! fi
|
|
|
22c937 |
PYTHON3_LIBS="${vi_cv_path_python3_plibs}"
|
|
|
22c937 |
if test "${vi_cv_path_python3_pfx}" = "${vi_cv_path_python3_epfx}"; then
|
|
|
22c937 |
PYTHON3_CFLAGS="-I${vi_cv_path_python3_pfx}/include/python${vi_cv_var_python3_version}${vi_cv_var_python3_abiflags} -DPYTHON3_HOME='L\"${vi_cv_path_python3_pfx}\"'"
|
|
|
22c937 |
--- 1328,1351 ----
|
|
|
22c937 |
@echo "python3_DLLLIBRARY='$(DLLLIBRARY)'"
|
|
|
22c937 |
@echo "python3_INSTSONAME='$(INSTSONAME)'"
|
|
|
22c937 |
eof
|
|
|
22c937 |
! dnl -- delete the lines from make about Entering/Leaving directory
|
|
|
22c937 |
! eval "`cd ${PYTHON3_CONFDIR} && make -f "${tmp_mkf}" __ | sed '/ directory /d'`"
|
|
|
22c937 |
! rm -f -- "${tmp_mkf}"
|
|
|
22c937 |
vi_cv_path_python3_plibs="-L${PYTHON3_CONFDIR} -lpython${vi_cv_var_python3_version}${vi_cv_var_python3_abiflags}"
|
|
|
22c937 |
! vi_cv_path_python3_plibs="${vi_cv_path_python3_plibs} ${python3_BASEMODLIBS} ${python3_LIBS} ${python3_SYSLIBS}"
|
|
|
22c937 |
! dnl remove -ltermcap, it can conflict with an earlier -lncurses
|
|
|
22c937 |
! vi_cv_path_python3_plibs=`echo $vi_cv_path_python3_plibs | sed s/-ltermcap//`
|
|
|
22c937 |
! vi_cv_path_python3_plibs=`echo $vi_cv_path_python3_plibs | sed s/-lffi//`
|
|
|
22c937 |
! ])
|
|
|
22c937 |
! AC_CACHE_VAL(vi_cv_dll_name_python3,
|
|
|
22c937 |
! [
|
|
|
22c937 |
! if test "X$python3_DLLLIBRARY" != "X"; then
|
|
|
22c937 |
! vi_cv_dll_name_python3="$python3_DLLLIBRARY"
|
|
|
22c937 |
! else
|
|
|
22c937 |
! vi_cv_dll_name_python3="$python3_INSTSONAME"
|
|
|
22c937 |
! fi
|
|
|
22c937 |
! ])
|
|
|
22c937 |
!
|
|
|
22c937 |
PYTHON3_LIBS="${vi_cv_path_python3_plibs}"
|
|
|
22c937 |
if test "${vi_cv_path_python3_pfx}" = "${vi_cv_path_python3_epfx}"; then
|
|
|
22c937 |
PYTHON3_CFLAGS="-I${vi_cv_path_python3_pfx}/include/python${vi_cv_var_python3_version}${vi_cv_var_python3_abiflags} -DPYTHON3_HOME='L\"${vi_cv_path_python3_pfx}\"'"
|
|
|
22c937 |
***************
|
|
|
22c937 |
*** 1458,1464 ****
|
|
|
22c937 |
int main(int argc, char** argv)
|
|
|
22c937 |
{
|
|
|
22c937 |
int not_needed = 0;
|
|
|
22c937 |
! if (no_rtl_global_needed_for("${python_INSTSONAME}", "${vi_cv_path_python_pfx}"))
|
|
|
22c937 |
not_needed = 1;
|
|
|
22c937 |
return !not_needed;
|
|
|
22c937 |
}])],
|
|
|
22c937 |
--- 1468,1474 ----
|
|
|
22c937 |
int main(int argc, char** argv)
|
|
|
22c937 |
{
|
|
|
22c937 |
int not_needed = 0;
|
|
|
22c937 |
! if (no_rtl_global_needed_for("${vi_cv_dll_name_python}", "${vi_cv_path_python_pfx}"))
|
|
|
22c937 |
not_needed = 1;
|
|
|
22c937 |
return !not_needed;
|
|
|
22c937 |
}])],
|
|
|
22c937 |
***************
|
|
|
22c937 |
*** 1504,1510 ****
|
|
|
22c937 |
int main(int argc, char** argv)
|
|
|
22c937 |
{
|
|
|
22c937 |
int not_needed = 0;
|
|
|
22c937 |
! if (no_rtl_global_needed_for("${python3_INSTSONAME}", L"${vi_cv_path_python3_pfx}"))
|
|
|
22c937 |
not_needed = 1;
|
|
|
22c937 |
return !not_needed;
|
|
|
22c937 |
}])],
|
|
|
22c937 |
--- 1514,1520 ----
|
|
|
22c937 |
int main(int argc, char** argv)
|
|
|
22c937 |
{
|
|
|
22c937 |
int not_needed = 0;
|
|
|
22c937 |
! if (no_rtl_global_needed_for("${vi_cv_dll_name_python3}", L"${vi_cv_path_python3_pfx}"))
|
|
|
22c937 |
not_needed = 1;
|
|
|
22c937 |
return !not_needed;
|
|
|
22c937 |
}])],
|
|
|
22c937 |
***************
|
|
|
22c937 |
*** 1515,1531 ****
|
|
|
22c937 |
|
|
|
22c937 |
PYTHON_SRC="if_python.c"
|
|
|
22c937 |
PYTHON_OBJ="objects/if_python.o"
|
|
|
22c937 |
! PYTHON_CFLAGS="$PYTHON_CFLAGS -DDYNAMIC_PYTHON_DLL=\\\"${python_INSTSONAME}\\\""
|
|
|
22c937 |
PYTHON_LIBS=
|
|
|
22c937 |
PYTHON3_SRC="if_python3.c"
|
|
|
22c937 |
PYTHON3_OBJ="objects/if_python3.o"
|
|
|
22c937 |
! PYTHON3_CFLAGS="$PYTHON3_CFLAGS -DDYNAMIC_PYTHON3_DLL=\\\"${python3_INSTSONAME}\\\""
|
|
|
22c937 |
PYTHON3_LIBS=
|
|
|
22c937 |
elif test "$python_ok" = yes && test "$enable_pythoninterp" = "dynamic"; then
|
|
|
22c937 |
AC_DEFINE(DYNAMIC_PYTHON)
|
|
|
22c937 |
PYTHON_SRC="if_python.c"
|
|
|
22c937 |
PYTHON_OBJ="objects/if_python.o"
|
|
|
22c937 |
! PYTHON_CFLAGS="$PYTHON_CFLAGS -DDYNAMIC_PYTHON_DLL=\\\"${python_INSTSONAME}\\\""
|
|
|
22c937 |
PYTHON_LIBS=
|
|
|
22c937 |
elif test "$python_ok" = yes; then
|
|
|
22c937 |
dnl Check that adding -fPIE works. It may be needed when using a static
|
|
|
22c937 |
--- 1525,1541 ----
|
|
|
22c937 |
|
|
|
22c937 |
PYTHON_SRC="if_python.c"
|
|
|
22c937 |
PYTHON_OBJ="objects/if_python.o"
|
|
|
22c937 |
! PYTHON_CFLAGS="$PYTHON_CFLAGS -DDYNAMIC_PYTHON_DLL=\\\"${vi_cv_dll_name_python}\\\""
|
|
|
22c937 |
PYTHON_LIBS=
|
|
|
22c937 |
PYTHON3_SRC="if_python3.c"
|
|
|
22c937 |
PYTHON3_OBJ="objects/if_python3.o"
|
|
|
22c937 |
! PYTHON3_CFLAGS="$PYTHON3_CFLAGS -DDYNAMIC_PYTHON3_DLL=\\\"${vi_cv_dll_name_python3}\\\""
|
|
|
22c937 |
PYTHON3_LIBS=
|
|
|
22c937 |
elif test "$python_ok" = yes && test "$enable_pythoninterp" = "dynamic"; then
|
|
|
22c937 |
AC_DEFINE(DYNAMIC_PYTHON)
|
|
|
22c937 |
PYTHON_SRC="if_python.c"
|
|
|
22c937 |
PYTHON_OBJ="objects/if_python.o"
|
|
|
22c937 |
! PYTHON_CFLAGS="$PYTHON_CFLAGS -DDYNAMIC_PYTHON_DLL=\\\"${vi_cv_dll_name_python}\\\""
|
|
|
22c937 |
PYTHON_LIBS=
|
|
|
22c937 |
elif test "$python_ok" = yes; then
|
|
|
22c937 |
dnl Check that adding -fPIE works. It may be needed when using a static
|
|
|
22c937 |
***************
|
|
|
22c937 |
*** 1547,1553 ****
|
|
|
22c937 |
AC_DEFINE(DYNAMIC_PYTHON3)
|
|
|
22c937 |
PYTHON3_SRC="if_python3.c"
|
|
|
22c937 |
PYTHON3_OBJ="objects/if_python3.o"
|
|
|
22c937 |
! PYTHON3_CFLAGS="$PYTHON3_CFLAGS -DDYNAMIC_PYTHON3_DLL=\\\"${python3_INSTSONAME}\\\""
|
|
|
22c937 |
PYTHON3_LIBS=
|
|
|
22c937 |
elif test "$python3_ok" = yes; then
|
|
|
22c937 |
dnl Check that adding -fPIE works. It may be needed when using a static
|
|
|
22c937 |
--- 1557,1563 ----
|
|
|
22c937 |
AC_DEFINE(DYNAMIC_PYTHON3)
|
|
|
22c937 |
PYTHON3_SRC="if_python3.c"
|
|
|
22c937 |
PYTHON3_OBJ="objects/if_python3.o"
|
|
|
22c937 |
! PYTHON3_CFLAGS="$PYTHON3_CFLAGS -DDYNAMIC_PYTHON3_DLL=\\\"${vi_cv_dll_name_python3}\\\""
|
|
|
22c937 |
PYTHON3_LIBS=
|
|
|
22c937 |
elif test "$python3_ok" = yes; then
|
|
|
22c937 |
dnl Check that adding -fPIE works. It may be needed when using a static
|
|
|
22c937 |
*** ../vim-7.4.298/src/auto/configure 2014-04-12 13:11:58.268430356 +0200
|
|
|
22c937 |
--- src/auto/configure 2014-05-22 14:40:05.146486086 +0200
|
|
|
22c937 |
***************
|
|
|
22c937 |
*** 5893,5902 ****
|
|
|
22c937 |
|
|
|
22c937 |
fi
|
|
|
22c937 |
|
|
|
22c937 |
|
|
|
22c937 |
- if test "X$python_DLLLIBRARY" != "X"; then
|
|
|
22c937 |
- python_INSTSONAME="$python_DLLLIBRARY"
|
|
|
22c937 |
- fi
|
|
|
22c937 |
PYTHON_LIBS="${vi_cv_path_python_plibs}"
|
|
|
22c937 |
if test "${vi_cv_path_python_pfx}" = "${vi_cv_path_python_epfx}"; then
|
|
|
22c937 |
PYTHON_CFLAGS="-I${vi_cv_path_python_pfx}/include/python${vi_cv_var_python_version} -DPYTHON_HOME='\"${vi_cv_path_python_pfx}\"'"
|
|
|
22c937 |
--- 5893,5911 ----
|
|
|
22c937 |
|
|
|
22c937 |
fi
|
|
|
22c937 |
|
|
|
22c937 |
+ if ${vi_cv_dll_name_python+:} false; then :
|
|
|
22c937 |
+ $as_echo_n "(cached) " >&6
|
|
|
22c937 |
+ else
|
|
|
22c937 |
+
|
|
|
22c937 |
+ if test "X$python_DLLLIBRARY" != "X"; then
|
|
|
22c937 |
+ vi_cv_dll_name_python="$python_DLLLIBRARY"
|
|
|
22c937 |
+ else
|
|
|
22c937 |
+ vi_cv_dll_name_python="$python_INSTSONAME"
|
|
|
22c937 |
+ fi
|
|
|
22c937 |
+
|
|
|
22c937 |
+ fi
|
|
|
22c937 |
+
|
|
|
22c937 |
|
|
|
22c937 |
PYTHON_LIBS="${vi_cv_path_python_plibs}"
|
|
|
22c937 |
if test "${vi_cv_path_python_pfx}" = "${vi_cv_path_python_epfx}"; then
|
|
|
22c937 |
PYTHON_CFLAGS="-I${vi_cv_path_python_pfx}/include/python${vi_cv_var_python_version} -DPYTHON_HOME='\"${vi_cv_path_python_pfx}\"'"
|
|
|
22c937 |
***************
|
|
|
22c937 |
*** 6200,6218 ****
|
|
|
22c937 |
@echo "python3_DLLLIBRARY='$(DLLLIBRARY)'"
|
|
|
22c937 |
@echo "python3_INSTSONAME='$(INSTSONAME)'"
|
|
|
22c937 |
eof
|
|
|
22c937 |
! eval "`cd ${PYTHON3_CONFDIR} && make -f "${tmp_mkf}" __ | sed '/ directory /d'`"
|
|
|
22c937 |
! rm -f -- "${tmp_mkf}"
|
|
|
22c937 |
vi_cv_path_python3_plibs="-L${PYTHON3_CONFDIR} -lpython${vi_cv_var_python3_version}${vi_cv_var_python3_abiflags}"
|
|
|
22c937 |
! vi_cv_path_python3_plibs="${vi_cv_path_python3_plibs} ${python3_BASEMODLIBS} ${python3_LIBS} ${python3_SYSLIBS}"
|
|
|
22c937 |
! vi_cv_path_python3_plibs=`echo $vi_cv_path_python3_plibs | sed s/-ltermcap//`
|
|
|
22c937 |
! vi_cv_path_python3_plibs=`echo $vi_cv_path_python3_plibs | sed s/-lffi//`
|
|
|
22c937 |
|
|
|
22c937 |
fi
|
|
|
22c937 |
|
|
|
22c937 |
|
|
|
22c937 |
- if test "X$python3_DLLLIBRARY" != "X"; then
|
|
|
22c937 |
- python3_INSTSONAME="$python3_DLLLIBRARY"
|
|
|
22c937 |
- fi
|
|
|
22c937 |
PYTHON3_LIBS="${vi_cv_path_python3_plibs}"
|
|
|
22c937 |
if test "${vi_cv_path_python3_pfx}" = "${vi_cv_path_python3_epfx}"; then
|
|
|
22c937 |
PYTHON3_CFLAGS="-I${vi_cv_path_python3_pfx}/include/python${vi_cv_var_python3_version}${vi_cv_var_python3_abiflags} -DPYTHON3_HOME='L\"${vi_cv_path_python3_pfx}\"'"
|
|
|
22c937 |
--- 6209,6236 ----
|
|
|
22c937 |
@echo "python3_DLLLIBRARY='$(DLLLIBRARY)'"
|
|
|
22c937 |
@echo "python3_INSTSONAME='$(INSTSONAME)'"
|
|
|
22c937 |
eof
|
|
|
22c937 |
! eval "`cd ${PYTHON3_CONFDIR} && make -f "${tmp_mkf}" __ | sed '/ directory /d'`"
|
|
|
22c937 |
! rm -f -- "${tmp_mkf}"
|
|
|
22c937 |
vi_cv_path_python3_plibs="-L${PYTHON3_CONFDIR} -lpython${vi_cv_var_python3_version}${vi_cv_var_python3_abiflags}"
|
|
|
22c937 |
! vi_cv_path_python3_plibs="${vi_cv_path_python3_plibs} ${python3_BASEMODLIBS} ${python3_LIBS} ${python3_SYSLIBS}"
|
|
|
22c937 |
! vi_cv_path_python3_plibs=`echo $vi_cv_path_python3_plibs | sed s/-ltermcap//`
|
|
|
22c937 |
! vi_cv_path_python3_plibs=`echo $vi_cv_path_python3_plibs | sed s/-lffi//`
|
|
|
22c937 |
!
|
|
|
22c937 |
! fi
|
|
|
22c937 |
!
|
|
|
22c937 |
! if ${vi_cv_dll_name_python3+:} false; then :
|
|
|
22c937 |
! $as_echo_n "(cached) " >&6
|
|
|
22c937 |
! else
|
|
|
22c937 |
!
|
|
|
22c937 |
! if test "X$python3_DLLLIBRARY" != "X"; then
|
|
|
22c937 |
! vi_cv_dll_name_python3="$python3_DLLLIBRARY"
|
|
|
22c937 |
! else
|
|
|
22c937 |
! vi_cv_dll_name_python3="$python3_INSTSONAME"
|
|
|
22c937 |
! fi
|
|
|
22c937 |
|
|
|
22c937 |
fi
|
|
|
22c937 |
|
|
|
22c937 |
|
|
|
22c937 |
PYTHON3_LIBS="${vi_cv_path_python3_plibs}"
|
|
|
22c937 |
if test "${vi_cv_path_python3_pfx}" = "${vi_cv_path_python3_epfx}"; then
|
|
|
22c937 |
PYTHON3_CFLAGS="-I${vi_cv_path_python3_pfx}/include/python${vi_cv_var_python3_version}${vi_cv_var_python3_abiflags} -DPYTHON3_HOME='L\"${vi_cv_path_python3_pfx}\"'"
|
|
|
22c937 |
***************
|
|
|
22c937 |
*** 6372,6378 ****
|
|
|
22c937 |
int main(int argc, char** argv)
|
|
|
22c937 |
{
|
|
|
22c937 |
int not_needed = 0;
|
|
|
22c937 |
! if (no_rtl_global_needed_for("${python_INSTSONAME}", "${vi_cv_path_python_pfx}"))
|
|
|
22c937 |
not_needed = 1;
|
|
|
22c937 |
return !not_needed;
|
|
|
22c937 |
}
|
|
|
22c937 |
--- 6390,6396 ----
|
|
|
22c937 |
int main(int argc, char** argv)
|
|
|
22c937 |
{
|
|
|
22c937 |
int not_needed = 0;
|
|
|
22c937 |
! if (no_rtl_global_needed_for("${vi_cv_dll_name_python}", "${vi_cv_path_python_pfx}"))
|
|
|
22c937 |
not_needed = 1;
|
|
|
22c937 |
return !not_needed;
|
|
|
22c937 |
}
|
|
|
22c937 |
***************
|
|
|
22c937 |
*** 6438,6444 ****
|
|
|
22c937 |
int main(int argc, char** argv)
|
|
|
22c937 |
{
|
|
|
22c937 |
int not_needed = 0;
|
|
|
22c937 |
! if (no_rtl_global_needed_for("${python3_INSTSONAME}", L"${vi_cv_path_python3_pfx}"))
|
|
|
22c937 |
not_needed = 1;
|
|
|
22c937 |
return !not_needed;
|
|
|
22c937 |
}
|
|
|
22c937 |
--- 6456,6462 ----
|
|
|
22c937 |
int main(int argc, char** argv)
|
|
|
22c937 |
{
|
|
|
22c937 |
int not_needed = 0;
|
|
|
22c937 |
! if (no_rtl_global_needed_for("${vi_cv_dll_name_python3}", L"${vi_cv_path_python3_pfx}"))
|
|
|
22c937 |
not_needed = 1;
|
|
|
22c937 |
return !not_needed;
|
|
|
22c937 |
}
|
|
|
22c937 |
***************
|
|
|
22c937 |
*** 6461,6478 ****
|
|
|
22c937 |
|
|
|
22c937 |
PYTHON_SRC="if_python.c"
|
|
|
22c937 |
PYTHON_OBJ="objects/if_python.o"
|
|
|
22c937 |
! PYTHON_CFLAGS="$PYTHON_CFLAGS -DDYNAMIC_PYTHON_DLL=\\\"${python_INSTSONAME}\\\""
|
|
|
22c937 |
PYTHON_LIBS=
|
|
|
22c937 |
PYTHON3_SRC="if_python3.c"
|
|
|
22c937 |
PYTHON3_OBJ="objects/if_python3.o"
|
|
|
22c937 |
! PYTHON3_CFLAGS="$PYTHON3_CFLAGS -DDYNAMIC_PYTHON3_DLL=\\\"${python3_INSTSONAME}\\\""
|
|
|
22c937 |
PYTHON3_LIBS=
|
|
|
22c937 |
elif test "$python_ok" = yes && test "$enable_pythoninterp" = "dynamic"; then
|
|
|
22c937 |
$as_echo "#define DYNAMIC_PYTHON 1" >>confdefs.h
|
|
|
22c937 |
|
|
|
22c937 |
PYTHON_SRC="if_python.c"
|
|
|
22c937 |
PYTHON_OBJ="objects/if_python.o"
|
|
|
22c937 |
! PYTHON_CFLAGS="$PYTHON_CFLAGS -DDYNAMIC_PYTHON_DLL=\\\"${python_INSTSONAME}\\\""
|
|
|
22c937 |
PYTHON_LIBS=
|
|
|
22c937 |
elif test "$python_ok" = yes; then
|
|
|
22c937 |
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if -fPIE can be added for Python" >&5
|
|
|
22c937 |
--- 6479,6496 ----
|
|
|
22c937 |
|
|
|
22c937 |
PYTHON_SRC="if_python.c"
|
|
|
22c937 |
PYTHON_OBJ="objects/if_python.o"
|
|
|
22c937 |
! PYTHON_CFLAGS="$PYTHON_CFLAGS -DDYNAMIC_PYTHON_DLL=\\\"${vi_cv_dll_name_python}\\\""
|
|
|
22c937 |
PYTHON_LIBS=
|
|
|
22c937 |
PYTHON3_SRC="if_python3.c"
|
|
|
22c937 |
PYTHON3_OBJ="objects/if_python3.o"
|
|
|
22c937 |
! PYTHON3_CFLAGS="$PYTHON3_CFLAGS -DDYNAMIC_PYTHON3_DLL=\\\"${vi_cv_dll_name_python3}\\\""
|
|
|
22c937 |
PYTHON3_LIBS=
|
|
|
22c937 |
elif test "$python_ok" = yes && test "$enable_pythoninterp" = "dynamic"; then
|
|
|
22c937 |
$as_echo "#define DYNAMIC_PYTHON 1" >>confdefs.h
|
|
|
22c937 |
|
|
|
22c937 |
PYTHON_SRC="if_python.c"
|
|
|
22c937 |
PYTHON_OBJ="objects/if_python.o"
|
|
|
22c937 |
! PYTHON_CFLAGS="$PYTHON_CFLAGS -DDYNAMIC_PYTHON_DLL=\\\"${vi_cv_dll_name_python}\\\""
|
|
|
22c937 |
PYTHON_LIBS=
|
|
|
22c937 |
elif test "$python_ok" = yes; then
|
|
|
22c937 |
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if -fPIE can be added for Python" >&5
|
|
|
22c937 |
***************
|
|
|
22c937 |
*** 6511,6517 ****
|
|
|
22c937 |
|
|
|
22c937 |
PYTHON3_SRC="if_python3.c"
|
|
|
22c937 |
PYTHON3_OBJ="objects/if_python3.o"
|
|
|
22c937 |
! PYTHON3_CFLAGS="$PYTHON3_CFLAGS -DDYNAMIC_PYTHON3_DLL=\\\"${python3_INSTSONAME}\\\""
|
|
|
22c937 |
PYTHON3_LIBS=
|
|
|
22c937 |
elif test "$python3_ok" = yes; then
|
|
|
22c937 |
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if -fPIE can be added for Python3" >&5
|
|
|
22c937 |
--- 6529,6535 ----
|
|
|
22c937 |
|
|
|
22c937 |
PYTHON3_SRC="if_python3.c"
|
|
|
22c937 |
PYTHON3_OBJ="objects/if_python3.o"
|
|
|
22c937 |
! PYTHON3_CFLAGS="$PYTHON3_CFLAGS -DDYNAMIC_PYTHON3_DLL=\\\"${vi_cv_dll_name_python3}\\\""
|
|
|
22c937 |
PYTHON3_LIBS=
|
|
|
22c937 |
elif test "$python3_ok" = yes; then
|
|
|
22c937 |
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if -fPIE can be added for Python3" >&5
|
|
|
22c937 |
***************
|
|
|
22c937 |
*** 11420,11426 ****
|
|
|
22c937 |
We can't simply define LARGE_OFF_T to be 9223372036854775807,
|
|
|
22c937 |
since some C++ compilers masquerading as C compilers
|
|
|
22c937 |
incorrectly reject 9223372036854775807. */
|
|
|
22c937 |
! #define LARGE_OFF_T (((off_t) 1 << 62) - 1 + ((off_t) 1 << 62))
|
|
|
22c937 |
int off_t_is_large[(LARGE_OFF_T % 2147483629 == 721
|
|
|
22c937 |
&& LARGE_OFF_T % 2147483647 == 1)
|
|
|
22c937 |
? 1 : -1];
|
|
|
22c937 |
--- 11438,11444 ----
|
|
|
22c937 |
We can't simply define LARGE_OFF_T to be 9223372036854775807,
|
|
|
22c937 |
since some C++ compilers masquerading as C compilers
|
|
|
22c937 |
incorrectly reject 9223372036854775807. */
|
|
|
22c937 |
! #define LARGE_OFF_T ((((off_t) 1 << 31) << 31) - 1 + (((off_t) 1 << 31) << 31))
|
|
|
22c937 |
int off_t_is_large[(LARGE_OFF_T % 2147483629 == 721
|
|
|
22c937 |
&& LARGE_OFF_T % 2147483647 == 1)
|
|
|
22c937 |
? 1 : -1];
|
|
|
22c937 |
***************
|
|
|
22c937 |
*** 11466,11472 ****
|
|
|
22c937 |
We can't simply define LARGE_OFF_T to be 9223372036854775807,
|
|
|
22c937 |
since some C++ compilers masquerading as C compilers
|
|
|
22c937 |
incorrectly reject 9223372036854775807. */
|
|
|
22c937 |
! #define LARGE_OFF_T (((off_t) 1 << 62) - 1 + ((off_t) 1 << 62))
|
|
|
22c937 |
int off_t_is_large[(LARGE_OFF_T % 2147483629 == 721
|
|
|
22c937 |
&& LARGE_OFF_T % 2147483647 == 1)
|
|
|
22c937 |
? 1 : -1];
|
|
|
22c937 |
--- 11484,11490 ----
|
|
|
22c937 |
We can't simply define LARGE_OFF_T to be 9223372036854775807,
|
|
|
22c937 |
since some C++ compilers masquerading as C compilers
|
|
|
22c937 |
incorrectly reject 9223372036854775807. */
|
|
|
22c937 |
! #define LARGE_OFF_T ((((off_t) 1 << 31) << 31) - 1 + (((off_t) 1 << 31) << 31))
|
|
|
22c937 |
int off_t_is_large[(LARGE_OFF_T % 2147483629 == 721
|
|
|
22c937 |
&& LARGE_OFF_T % 2147483647 == 1)
|
|
|
22c937 |
? 1 : -1];
|
|
|
22c937 |
***************
|
|
|
22c937 |
*** 11490,11496 ****
|
|
|
22c937 |
We can't simply define LARGE_OFF_T to be 9223372036854775807,
|
|
|
22c937 |
since some C++ compilers masquerading as C compilers
|
|
|
22c937 |
incorrectly reject 9223372036854775807. */
|
|
|
22c937 |
! #define LARGE_OFF_T (((off_t) 1 << 62) - 1 + ((off_t) 1 << 62))
|
|
|
22c937 |
int off_t_is_large[(LARGE_OFF_T % 2147483629 == 721
|
|
|
22c937 |
&& LARGE_OFF_T % 2147483647 == 1)
|
|
|
22c937 |
? 1 : -1];
|
|
|
22c937 |
--- 11508,11514 ----
|
|
|
22c937 |
We can't simply define LARGE_OFF_T to be 9223372036854775807,
|
|
|
22c937 |
since some C++ compilers masquerading as C compilers
|
|
|
22c937 |
incorrectly reject 9223372036854775807. */
|
|
|
22c937 |
! #define LARGE_OFF_T ((((off_t) 1 << 31) << 31) - 1 + (((off_t) 1 << 31) << 31))
|
|
|
22c937 |
int off_t_is_large[(LARGE_OFF_T % 2147483629 == 721
|
|
|
22c937 |
&& LARGE_OFF_T % 2147483647 == 1)
|
|
|
22c937 |
? 1 : -1];
|
|
|
22c937 |
***************
|
|
|
22c937 |
*** 11535,11541 ****
|
|
|
22c937 |
We can't simply define LARGE_OFF_T to be 9223372036854775807,
|
|
|
22c937 |
since some C++ compilers masquerading as C compilers
|
|
|
22c937 |
incorrectly reject 9223372036854775807. */
|
|
|
22c937 |
! #define LARGE_OFF_T (((off_t) 1 << 62) - 1 + ((off_t) 1 << 62))
|
|
|
22c937 |
int off_t_is_large[(LARGE_OFF_T % 2147483629 == 721
|
|
|
22c937 |
&& LARGE_OFF_T % 2147483647 == 1)
|
|
|
22c937 |
? 1 : -1];
|
|
|
22c937 |
--- 11553,11559 ----
|
|
|
22c937 |
We can't simply define LARGE_OFF_T to be 9223372036854775807,
|
|
|
22c937 |
since some C++ compilers masquerading as C compilers
|
|
|
22c937 |
incorrectly reject 9223372036854775807. */
|
|
|
22c937 |
! #define LARGE_OFF_T ((((off_t) 1 << 31) << 31) - 1 + (((off_t) 1 << 31) << 31))
|
|
|
22c937 |
int off_t_is_large[(LARGE_OFF_T % 2147483629 == 721
|
|
|
22c937 |
&& LARGE_OFF_T % 2147483647 == 1)
|
|
|
22c937 |
? 1 : -1];
|
|
|
22c937 |
***************
|
|
|
22c937 |
*** 11559,11565 ****
|
|
|
22c937 |
We can't simply define LARGE_OFF_T to be 9223372036854775807,
|
|
|
22c937 |
since some C++ compilers masquerading as C compilers
|
|
|
22c937 |
incorrectly reject 9223372036854775807. */
|
|
|
22c937 |
! #define LARGE_OFF_T (((off_t) 1 << 62) - 1 + ((off_t) 1 << 62))
|
|
|
22c937 |
int off_t_is_large[(LARGE_OFF_T % 2147483629 == 721
|
|
|
22c937 |
&& LARGE_OFF_T % 2147483647 == 1)
|
|
|
22c937 |
? 1 : -1];
|
|
|
22c937 |
--- 11577,11583 ----
|
|
|
22c937 |
We can't simply define LARGE_OFF_T to be 9223372036854775807,
|
|
|
22c937 |
since some C++ compilers masquerading as C compilers
|
|
|
22c937 |
incorrectly reject 9223372036854775807. */
|
|
|
22c937 |
! #define LARGE_OFF_T ((((off_t) 1 << 31) << 31) - 1 + (((off_t) 1 << 31) << 31))
|
|
|
22c937 |
int off_t_is_large[(LARGE_OFF_T % 2147483629 == 721
|
|
|
22c937 |
&& LARGE_OFF_T % 2147483647 == 1)
|
|
|
22c937 |
? 1 : -1];
|
|
|
22c937 |
*** ../vim-7.4.298/src/version.c 2014-05-22 14:19:51.674510749 +0200
|
|
|
22c937 |
--- src/version.c 2014-05-22 14:36:44.634490162 +0200
|
|
|
22c937 |
***************
|
|
|
22c937 |
*** 736,737 ****
|
|
|
22c937 |
--- 736,739 ----
|
|
|
22c937 |
{ /* Add new patch number below this line */
|
|
|
22c937 |
+ /**/
|
|
|
22c937 |
+ 299,
|
|
|
22c937 |
/**/
|
|
|
22c937 |
|
|
|
22c937 |
--
|
|
|
22c937 |
hundred-and-one symptoms of being an internet addict:
|
|
|
22c937 |
190. You quickly hand over your wallet, leather jacket, and car keys
|
|
|
22c937 |
during a mugging, then proceed to beat the crap out of your
|
|
|
22c937 |
assailant when he asks for your laptop.
|
|
|
22c937 |
|
|
|
22c937 |
/// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net \\\
|
|
|
22c937 |
/// sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\
|
|
|
22c937 |
\\\ an exciting new programming language -- http://www.Zimbu.org ///
|
|
|
22c937 |
\\\ help me help AIDS victims -- http://ICCF-Holland.org ///
|