patch 7.4.1221
Problem: Including netbeans and channel support in small and tiny builds.
Build fails with some interfaces.
Solution: Only include these features in small build and above. Let
configure fail if trying to enable an interface that won't build.
diff --git a/src/configure.in b/src/configure.in
index 08ba562..467ea6b 100644
--- a/src/configure.in
+++ b/src/configure.in
@@ -490,6 +490,10 @@
AC_MSG_RESULT($enable_luainterp)
if test "$enable_luainterp" = "yes" -o "$enable_luainterp" = "dynamic"; then
+ if test "x$features" = "xtiny" -o "x$features" = "xsmall"; then
+ AC_MSG_ERROR([cannot use Lua with tiny or small features])
+ fi
+
dnl -- find the lua executable
AC_SUBST(vi_cv_path_lua)
@@ -950,6 +954,9 @@
[enable_perlinterp="no"])
AC_MSG_RESULT($enable_perlinterp)
if test "$enable_perlinterp" = "yes" -o "$enable_perlinterp" = "dynamic"; then
+ if test "x$features" = "xtiny" -o "x$features" = "xsmall"; then
+ AC_MSG_ERROR([cannot use Perl with tiny or small features])
+ fi
AC_SUBST(vi_cv_path_perl)
AC_PATH_PROG(vi_cv_path_perl, perl)
if test "X$vi_cv_path_perl" != "X"; then
@@ -1937,7 +1944,12 @@
[ --disable-netbeans Disable NetBeans integration support.],
, [enable_netbeans="yes"])
if test "$enable_netbeans" = "yes"; then
- AC_MSG_RESULT(no)
+ if test "x$features" = "xtiny" -o "x$features" = "xsmall"; then
+ AC_MSG_RESULT([cannot use NetBeans with tiny or small features])
+ enable_netbeans="no"
+ else
+ AC_MSG_RESULT(no)
+ fi
else
AC_MSG_RESULT(yes)
fi
@@ -1947,7 +1959,12 @@
[ --disable-channel Disable process communication support.],
, [enable_channel="yes"])
if test "$enable_channel" = "yes"; then
- AC_MSG_RESULT(no)
+ if test "x$features" = "xtiny" -o "x$features" = "xsmall"; then
+ AC_MSG_RESULT([cannot use channels with tiny or small features])
+ enable_channel="no"
+ else
+ AC_MSG_RESULT(no)
+ fi
else
if test "$enable_netbeans" = "yes"; then
AC_MSG_RESULT([yes, netbeans also disabled])