aniani/vim
0
0
Fork 1
mirror of https://github.com/vim/vim.git synced 2025-07-26 11:04:33 -04:00
Code

patch 8.1.0215: no error if configure --with-x cannot configure X

Browse Source 
Problem:    No error if configure --with-x cannot configure X.
Solution:   Check that when --with-x is used X can be configured.
This commit is contained in:
Bram Moolenaar 2018-07-27 22:35:15 +02:00
parent 83ec2a7f5f
commit d2a054910b
3 changed files with 16 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/auto/configure vendored
View File

@ -4466,6 +4466,8 @@ fi
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $fail_if_missing" >&5 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $fail_if_missing" >&5
$as_echo "$fail_if_missing" >&6; } $as_echo "$fail_if_missing" >&6; }
with_x_arg="$with_x"
if test -z "$CFLAGS"; then if test -z "$CFLAGS"; then
CFLAGS="-O" CFLAGS="-O"
test "$GCC" = yes && CFLAGS="-O2 -fno-strength-reduce -Wall" test "$GCC" = yes && CFLAGS="-O2 -fno-strength-reduce -Wall"
@ -9003,6 +9005,10 @@ $as_echo "$ac_cv_small_wchar_t" >&6; }
fi fi
fi fi
if test "x$with_x" = xno -a "x$with_x_arg" = xyes; then
as_fn_error $? "could not configure X" "$LINENO" 5
fi
test "x$with_x" = xno -a "x$MACOS_X" != "xyes" -a "x$QNX" != "xyes" && enable_gui=no test "x$with_x" = xno -a "x$MACOS_X" != "xyes" -a "x$QNX" != "xyes" && enable_gui=no
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking --enable-gui argument" >&5 { $as_echo "$as_me:${as_lineno-$LINENO}: checking --enable-gui argument" >&5

8
src/configure.ac
View File

@ -72,6 +72,9 @@ AC_ARG_ENABLE(fail_if_missing,
[fail_if_missing="no"]) [fail_if_missing="no"])
AC_MSG_RESULT($fail_if_missing) AC_MSG_RESULT($fail_if_missing)
dnl Keep original value to check later.
with_x_arg="$with_x"
dnl Set default value for CFLAGS if none is defined or it's empty dnl Set default value for CFLAGS if none is defined or it's empty
if test -z "$CFLAGS"; then if test -z "$CFLAGS"; then
CFLAGS="-O" CFLAGS="-O"
@ -2283,6 +2286,11 @@ else
fi fi
fi fi
dnl Check if --with-x was given but it doesn't work.
if test "x$with_x" = xno -a "x$with_x_arg" = xyes; then
AC_MSG_ERROR([could not configure X])
fi
test "x$with_x" = xno -a "x$MACOS_X" != "xyes" -a "x$QNX" != "xyes" && enable_gui=no test "x$with_x" = xno -a "x$MACOS_X" != "xyes" -a "x$QNX" != "xyes" && enable_gui=no
AC_MSG_CHECKING(--enable-gui argument) AC_MSG_CHECKING(--enable-gui argument)

2
src/version.c
View File

@ -798,6 +798,8 @@ static char *(features[]) =
static int included_patches[] = static int included_patches[] =
{ /* Add new patch number below this line */ { /* Add new patch number below this line */
/**/
215,
/**/ /**/
214, 214,
/**/ /**/