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.

diff --git a/src/auto/configure b/src/auto/configure
index 1628b940e3f36184e87e7e92a4490d7914d1cbe7..de1fd6059cf90fd2aa1906a4144aadbf316b0ba8 100755 (executable)
--- 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 107c170ecb470551d07a3e664689ea6733deccbc..0d8ea32d34340a556db0a004e6dce2b0c6335800 100644 (file)
--- 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 087bc63a11d0f9925d4d2d66a6410923175cc783..172748b4725ca9bcd31042eb832a8806652ef909 100644 (file)
--- a/src/version.c
+++ b/src/version.c
@@ -798,6 +798,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    215,
 /**/
     214,
 /**/