patch 8.1.0664: configure "fail-if-missing" does not apply to enable-gui
Problem: Configure "fail-if-missing" does not apply to the enable-gui
argument. (Rhialto)
Solution: Make configure fail if a GUI was specifified and "fail-if-missing"
is enabled and the GUI test fails.
diff --git a/src/auto/configure b/src/auto/configure
index 3a1495b..e9f66ba 100755
--- a/src/auto/configure
+++ b/src/auto/configure
@@ -9115,10 +9115,9 @@
no) { $as_echo "$as_me:${as_lineno-$LINENO}: result: no GUI support" >&5
$as_echo "no GUI support" >&6; }
SKIP_PHOTON=YES ;;
- yes|"") { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes - automatic GUI support" >&5
-$as_echo "yes - automatic GUI support" >&6; } ;;
- auto) { $as_echo "$as_me:${as_lineno-$LINENO}: result: auto - automatic GUI support" >&5
-$as_echo "auto - automatic GUI support" >&6; } ;;
+ yes|""|auto) { $as_echo "$as_me:${as_lineno-$LINENO}: result: automatic GUI support" >&5
+$as_echo "automatic GUI support" >&6; }
+ gui_auto=yes ;;
photon) { $as_echo "$as_me:${as_lineno-$LINENO}: result: Photon GUI support" >&5
$as_echo "Photon GUI support" >&6; } ;;
*) { $as_echo "$as_me:${as_lineno-$LINENO}: result: Sorry, $enable_gui GUI is not supported" >&5
@@ -9133,7 +9132,8 @@
$as_echo "no GUI support" >&6; }
SKIP_CARBON=YES ;;
yes|"") { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes - automatic GUI support" >&5
-$as_echo "yes - automatic GUI support" >&6; } ;;
+$as_echo "yes - automatic GUI support" >&6; }
+ gui_auto=yes ;;
auto) { $as_echo "$as_me:${as_lineno-$LINENO}: result: auto - Carbon GUI is outdated - disable GUI support" >&5
$as_echo "auto - Carbon GUI is outdated - disable GUI support" >&6; }
SKIP_CARBON=YES ;;
@@ -9151,6 +9151,7 @@
$as_echo "no GUI support" >&6; } ;;
yes|""|auto) { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes/auto - automatic GUI support" >&5
$as_echo "yes/auto - automatic GUI support" >&6; }
+ gui_auto=yes
SKIP_GTK2=
SKIP_GNOME=
SKIP_MOTIF=
@@ -9582,6 +9583,9 @@
GTK_CFLAGS=""
GTK_LIBS=""
:
+ if test "$fail_if_missing" = "yes" -a "X$gui_auto" != "Xyes"; then
+ as_fn_error $? "could not configure GTK" "$LINENO" 5
+ fi
}
fi
}
@@ -9933,6 +9937,9 @@
GTK_CFLAGS=""
GTK_LIBS=""
:
+ if test "$fail_if_missing" = "yes" -a "X$gui_auto" != "Xyes"; then
+ as_fn_error $? "could not configure GTK" "$LINENO" 5
+ fi
}
fi
}