diff options
| author | Bram Moolenaar <Bram@vim.org> | 2018-07-27 22:35:15 +0200 |
|---|---|---|
| committer | Bram Moolenaar <Bram@vim.org> | 2018-07-27 22:35:15 +0200 |
| commit | d2a054910bf8f0888fac81e46a64a22dd4a763b5 (patch) | |
| tree | c7d6a6b92751f31f333ba3d99bb75b298bf9bc7e | |
| parent | 83ec2a7f5fb481b30a5d556b6aad49a62585bccd (diff) | |
| download | vim-git-d2a054910bf8f0888fac81e46a64a22dd4a763b5.tar.gz | |
patch 8.1.0215: no error if configure --with-x cannot configure Xv8.1.0215
Problem: No error if configure --with-x cannot configure X.
Solution: Check that when --with-x is used X can be configured.
| -rwxr-xr-x | src/auto/configure | 6 | ||||
| -rw-r--r-- | src/configure.ac | 8 | ||||
| -rw-r--r-- | src/version.c | 2 |
3 files changed, 16 insertions, 0 deletions
diff --git a/src/auto/configure b/src/auto/configure index 1628b940e..de1fd6059 100755 --- a/src/auto/configure +++ b/src/auto/configure @@ -4466,6 +4466,8 @@ fi { $as_echo "$as_me:${as_lineno-$LINENO}: result: $fail_if_missing" >&5 $as_echo "$fail_if_missing" >&6; } +with_x_arg="$with_x" + if test -z "$CFLAGS"; then CFLAGS="-O" test "$GCC" = yes && CFLAGS="-O2 -fno-strength-reduce -Wall" @@ -9003,6 +9005,10 @@ $as_echo "$ac_cv_small_wchar_t" >&6; } 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 { $as_echo "$as_me:${as_lineno-$LINENO}: checking --enable-gui argument" >&5 diff --git a/src/configure.ac b/src/configure.ac index 107c170ec..0d8ea32d3 100644 --- a/src/configure.ac +++ b/src/configure.ac @@ -72,6 +72,9 @@ AC_ARG_ENABLE(fail_if_missing, [fail_if_missing="no"]) 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 if test -z "$CFLAGS"; then CFLAGS="-O" @@ -2283,6 +2286,11 @@ else 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 AC_MSG_CHECKING(--enable-gui argument) diff --git a/src/version.c b/src/version.c index 087bc63a1..172748b47 100644 --- a/src/version.c +++ b/src/version.c @@ -799,6 +799,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 215, +/**/ 214, /**/ 213, |