mirror of
https://git.freebsd.org/ports.git
synced 2025-06-06 21:30:31 -04:00
cd6e9a9547
- Fix patch: merge patch-configure into patch-src-auto-configure Changes: https://code.google.com/p/vim/source/list
75 lines
3.2 KiB
Text
75 lines
3.2 KiB
Text
--- src/auto/configure.orig 2014-05-31 15:02:24.446323494 +0800
|
|
+++ src/auto/configure 2014-05-31 15:02:24.593321540 +0800
|
|
@@ -888,7 +888,7 @@
|
|
psdir='${docdir}'
|
|
libdir='${exec_prefix}/lib'
|
|
localedir='${datarootdir}/locale'
|
|
-mandir='${datarootdir}/man'
|
|
+mandir='${prefix}/man'
|
|
|
|
ac_prev=
|
|
ac_dashdash=
|
|
@@ -4951,7 +4951,7 @@
|
|
if ${vi_cv_version_lua_luajit+:} false; then :
|
|
$as_echo_n "(cached) " >&6
|
|
else
|
|
- vi_cv_version_lua_luajit=`${vi_cv_path_luajit} -e "print(_VERSION)" | sed 's/.* //'`
|
|
+ vi_cv_version_lua_luajit=`${vi_cv_path_luajit} -e "print(_VERSION)" | sed 's/.* //' | tr d '.'`
|
|
fi
|
|
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $vi_cv_version_lua_luajit" >&5
|
|
$as_echo "$vi_cv_version_lua_luajit" >&6; }
|
|
@@ -5005,7 +5005,7 @@
|
|
if ${vi_cv_version_plain_lua+:} false; then :
|
|
$as_echo_n "(cached) " >&6
|
|
else
|
|
- vi_cv_version_plain_lua=`${vi_cv_path_plain_lua} -e "print(_VERSION)" | sed 's/.* //'`
|
|
+ vi_cv_version_plain_lua=`${vi_cv_path_plain_lua} -e "print(_VERSION)" | sed 's/.* //' | tr -d '.'`
|
|
fi
|
|
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $vi_cv_version_plain_lua" >&5
|
|
$as_echo "$vi_cv_version_plain_lua" >&6; }
|
|
@@ -5096,7 +5096,7 @@
|
|
LIBS=$libs_save
|
|
fi
|
|
if test "x$lua_ok" = "xyes"; then
|
|
- LUA_CFLAGS="-I${vi_cv_path_lua_pfx}/include${LUA_INC}"
|
|
+ LUA_CFLAGS="-I${LUA_INCDIR}"
|
|
LUA_SRC="if_lua.c"
|
|
LUA_OBJ="objects/if_lua.o"
|
|
LUA_PRO="if_lua.pro"
|
|
@@ -5153,7 +5153,8 @@
|
|
$as_echo "#define DYNAMIC_LUA 1" >>confdefs.h
|
|
|
|
LUA_LIBS=""
|
|
- LUA_CFLAGS="-DDYNAMIC_LUA_DLL=\\\"${vi_cv_dll_name_lua}\\\" $LUA_CFLAGS"
|
|
+ vi_cv_version_lua=${LUA_VER}
|
|
+ LUA_CFLAGS="-DDYNAMIC_LUA_DLL=\\\"liblua-${vi_cv_version_lua}.so\\\" $LUA_CFLAGS"
|
|
fi
|
|
if test "X$LUA_CFLAGS$LUA_LIBS" != "X" && \
|
|
test "x$MACOSX" = "xyes" && test "x$vi_cv_with_luajit" != "xno" && \
|
|
@@ -5719,7 +5720,7 @@
|
|
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $enable_pythoninterp" >&5
|
|
$as_echo "$enable_pythoninterp" >&6; }
|
|
if test "$enable_pythoninterp" = "yes" -o "$enable_pythoninterp" = "dynamic"; then
|
|
- for ac_prog in python2 python
|
|
+ for ac_prog in python2.7
|
|
do
|
|
# Extract the first word of "$ac_prog", so it can be a program name with args.
|
|
set dummy $ac_prog; ac_word=$2
|
|
@@ -6035,7 +6036,7 @@
|
|
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $enable_python3interp" >&5
|
|
$as_echo "$enable_python3interp" >&6; }
|
|
if test "$enable_python3interp" = "yes" -o "$enable_python3interp" = "dynamic"; then
|
|
- for ac_prog in python3 python
|
|
+ for ac_prog in python3.3 python3.2 python3.1
|
|
do
|
|
# Extract the first word of "$ac_prog", so it can be a program name with args.
|
|
set dummy $ac_prog; ac_word=$2
|
|
@@ -6850,7 +6851,7 @@
|
|
$as_echo "$try/tclConfig.sh" >&6; }
|
|
. $try/tclConfig.sh
|
|
TCL_LIBS=`eval echo "$TCL_LIB_SPEC $TCL_LIBS"`
|
|
- TCL_DEFS=`echo $TCL_DEFS | sed -e 's/\\\\ /\\\\X/g' | tr ' ' '\012' | sed -e '/^[^-]/d' -e '/^-[^D]/d' -e '/-D[^_]/d' -e 's/-D_/ -D_/' | tr '\012' ' ' | sed -e 's/\\\\X/\\\\ /g'`
|
|
+ TCL_DEFS=`echo $TCL_DEFS | sed -e 's/\\ /\\\\X/g' | tr ' ' '\012' | sed -e '/^-[^D]/d' -e '/-D[^_]/d' -e 's/-D_/ -D_/' | tr '\012' ' ' | sed -e 's/\\\\X/\\\\ /g'`
|
|
break
|
|
fi
|
|
done
|