e1c732e1da
On 5 August, 2023, Bram Moolenaar, the long-time maintainer and architect of Vim, passed away. In addition to being a legendary software engineer and open-source advocate, he was a major philanthropist. His impact on the OSS world was immense, as was his dedication to speaking out for those whose voices are too often missed.. The Vim project remains in good hands with the Vim community.
48 lines
1.9 KiB
Text
48 lines
1.9 KiB
Text
--- src/auto/configure.orig 2023-09-03 18:37:03 UTC
|
|
+++ src/auto/configure
|
|
@@ -938,7 +938,7 @@ pdfdir='${docdir}'
|
|
psdir='${docdir}'
|
|
libdir='${exec_prefix}/lib'
|
|
localedir='${datarootdir}/locale'
|
|
-mandir='${datarootdir}/man'
|
|
+mandir='${prefix}/man'
|
|
|
|
ac_prev=
|
|
ac_dashdash=
|
|
@@ -5659,7 +5659,7 @@ if test ${vi_cv_version_lua_luajit+y}
|
|
then :
|
|
printf %s "(cached) " >&6
|
|
else $as_nop
|
|
- 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
|
|
{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $vi_cv_version_lua_luajit" >&5
|
|
printf "%s\n" "$vi_cv_version_lua_luajit" >&6; }
|
|
@@ -5719,7 +5719,7 @@ if test ${vi_cv_version_plain_lua+y}
|
|
then :
|
|
printf %s "(cached) " >&6
|
|
else $as_nop
|
|
- 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
|
|
{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $vi_cv_version_plain_lua" >&5
|
|
printf "%s\n" "$vi_cv_version_plain_lua" >&6; }
|
|
@@ -5838,7 +5838,7 @@ rm -f core conftest.err conftest.$ac_objext conftest.b
|
|
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"
|
|
@@ -5895,7 +5895,8 @@ printf "%s\n" "yes" >&6; }
|
|
printf "%s\n" "#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_dll_name_lua}.so\\\" $LUA_CFLAGS"
|
|
fi
|
|
if test "X$LUA_CFLAGS$LUA_LIBS" != "X" && \
|
|
test "x$MACOS_X" = "xyes" && test "x$vi_cv_with_luajit" != "xno" && \
|