Skip to content

Commit d2a0549

Browse files
committed
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.
1 parent 83ec2a7 commit d2a0549

File tree

3 files changed

+16
-0
lines changed

3 files changed

+16
-0
lines changed

src/auto/configure

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4466,6 +4466,8 @@ fi
44664466
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $fail_if_missing" >&5
44674467
$as_echo "$fail_if_missing" >&6; }
44684468

4469+
with_x_arg="$with_x"
4470+
44694471
if test -z "$CFLAGS"; then
44704472
CFLAGS="-O"
44714473
test "$GCC" = yes && CFLAGS="-O2 -fno-strength-reduce -Wall"
@@ -9003,6 +9005,10 @@ $as_echo "$ac_cv_small_wchar_t" >&6; }
90039005
fi
90049006
fi
90059007

9008+
if test "x$with_x" = xno -a "x$with_x_arg" = xyes; then
9009+
as_fn_error $? "could not configure X" "$LINENO" 5
9010+
fi
9011+
90069012
test "x$with_x" = xno -a "x$MACOS_X" != "xyes" -a "x$QNX" != "xyes" && enable_gui=no
90079013

90089014
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking --enable-gui argument" >&5

src/configure.ac

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -72,6 +72,9 @@ AC_ARG_ENABLE(fail_if_missing,
7272
[fail_if_missing="no"])
7373
AC_MSG_RESULT($fail_if_missing)
7474

75+
dnl Keep original value to check later.
76+
with_x_arg="$with_x"
77+
7578
dnl Set default value for CFLAGS if none is defined or it's empty
7679
if test -z "$CFLAGS"; then
7780
CFLAGS="-O"
@@ -2283,6 +2286,11 @@ else
22832286
fi
22842287
fi
22852288

2289+
dnl Check if --with-x was given but it doesn't work.
2290+
if test "x$with_x" = xno -a "x$with_x_arg" = xyes; then
2291+
AC_MSG_ERROR([could not configure X])
2292+
fi
2293+
22862294
test "x$with_x" = xno -a "x$MACOS_X" != "xyes" -a "x$QNX" != "xyes" && enable_gui=no
22872295

22882296
AC_MSG_CHECKING(--enable-gui argument)

src/version.c

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -798,6 +798,8 @@ static char *(features[]) =
798798

799799
static int included_patches[] =
800800
{ /* Add new patch number below this line */
801+
/**/
802+
215,
801803
/**/
802804
214,
803805
/**/

0 commit comments

Comments
 (0)