This repository has been archived by the owner on Dec 4, 2020. It is now read-only.
-
Notifications
You must be signed in to change notification settings - Fork 60
/
patch-configure
47 lines (45 loc) · 1.97 KB
/
patch-configure
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
--- auto/configure.orig 2013-07-11 22:23:02.000000000 -0700
+++ auto/configure 2013-07-11 22:51:08.000000000 -0700
@@ -855,7 +855,7 @@ pdfdir='${docdir}'
psdir='${docdir}'
libdir='${exec_prefix}/lib'
localedir='${datarootdir}/locale'
-mandir='${datarootdir}/man'
+mandir='${prefix}/man'
ac_prev=
ac_dashdash=
@@ -4694,7 +4694,7 @@ $as_echo_n "checking Lua version... " >&
if test "${vi_cv_version_lua+set}" = set; then :
$as_echo_n "(cached) " >&6
else
- vi_cv_version_lua=`${vi_cv_path_lua} -e "print(_VERSION)" | sed 's/.* //'`
+ vi_cv_version_lua=`${vi_cv_path_lua} -e "print(_VERSION)" | sed 's/.* //' | tr -d '.'`
fi
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $vi_cv_version_lua" >&5
$as_echo "$vi_cv_version_lua" >&6; }
@@ -4728,6 +4728,7 @@ $as_echo "no" >&6; }
LUA_LIBS="-L${vi_cv_path_lua_pfx}/lib -llua"
fi
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"
@@ -4759,7 +4760,8 @@ $as_echo "no" >&6; }
$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_VER_SH\\\" $LUA_CFLAGS"
fi
fi
if test "$fail_if_missing" = "yes" -a -z "$LUA_SRC"; then
@@ -6285,7 +6287,7 @@ $as_echo_n "checking for location of tcl
$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