File tree Expand file tree Collapse file tree 3 files changed +16
-0
lines changed Expand file tree Collapse file tree 3 files changed +16
-0
lines changed Original file line number Diff line number Diff line change 4466
4466
{ $as_echo " $as_me :${as_lineno-$LINENO } : result: $fail_if_missing " >&5
4467
4467
$as_echo " $fail_if_missing " >&6 ; }
4468
4468
4469
+ with_x_arg=" $with_x "
4470
+
4469
4471
if test -z " $CFLAGS " ; then
4470
4472
CFLAGS=" -O"
4471
4473
test " $GCC " = yes && CFLAGS=" -O2 -fno-strength-reduce -Wall"
@@ -9003,6 +9005,10 @@ $as_echo "$ac_cv_small_wchar_t" >&6; }
9003
9005
fi
9004
9006
fi
9005
9007
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
+
9006
9012
test " x$with_x " = xno -a " x$MACOS_X " ! = " xyes" -a " x$QNX " ! = " xyes" && enable_gui=no
9007
9013
9008
9014
{ $as_echo " $as_me :${as_lineno-$LINENO } : checking --enable-gui argument" >&5
Original file line number Diff line number Diff line change @@ -72,6 +72,9 @@ AC_ARG_ENABLE(fail_if_missing,
72
72
[ fail_if_missing="no"] )
73
73
AC_MSG_RESULT ( $fail_if_missing )
74
74
75
+ dnl Keep original value to check later.
76
+ with_x_arg="$with_x"
77
+
75
78
dnl Set default value for CFLAGS if none is defined or it's empty
76
79
if test -z "$CFLAGS"; then
77
80
CFLAGS="-O"
@@ -2283,6 +2286,11 @@ else
2283
2286
fi
2284
2287
fi
2285
2288
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
+
2286
2294
test "x$with_x" = xno -a "x$MACOS_X" != "xyes" -a "x$QNX" != "xyes" && enable_gui=no
2287
2295
2288
2296
AC_MSG_CHECKING ( -- enable-gui argument )
Original file line number Diff line number Diff line change @@ -798,6 +798,8 @@ static char *(features[]) =
798
798
799
799
static int included_patches [] =
800
800
{ /* Add new patch number below this line */
801
+ /**/
802
+ 215 ,
801
803
/**/
802
804
214 ,
803
805
/**/
You can’t perform that action at this time.
0 commit comments