summaryrefslogtreecommitdiffstats
path: root/src/auto
diff options
context:
space:
mode:
authorBram Moolenaar <Bram@vim.org>2018-07-27 22:35:15 +0200
committerBram Moolenaar <Bram@vim.org>2018-07-27 22:35:15 +0200
commitd2a054910bf8f0888fac81e46a64a22dd4a763b5 (patch)
treec7d6a6b92751f31f333ba3d99bb75b298bf9bc7e /src/auto
parent83ec2a7f5fb481b30a5d556b6aad49a62585bccd (diff)
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.
Diffstat (limited to 'src/auto')
-rwxr-xr-xsrc/auto/configure6
1 files changed, 6 insertions, 0 deletions
diff --git a/src/auto/configure b/src/auto/configure
index 1628b940e3..de1fd6059c 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