Mercurial > vim

diff src/auto/configure @ 14401:6b3ad2849e24 v8.1.0215

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
patch 8.1.0215: no error if configure --with-x cannot configure X commit https://github.com/vim/vim/commit/d2a054910bf8f0888fac81e46a64a22dd4a763b5 Author: Bram Moolenaar <Bram@vim.org> Date: Fri Jul 27 22:35:15 2018 +0200 patch 8.1.0215: no error if configure --with-x cannot configure X Problem: No error if configure --with-x cannot configure X. Solution: Check that when --with-x is used X can be configured.
author Christian Brabandt <cb@256bit.org>
date Fri, 27 Jul 2018 22:45:05 +0200
parents e4d5726e1678
children f103c66ea515
line wrap: on
line diff
--- 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 @@ 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
 
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking --enable-gui argument" >&5