diff options
| author | Bram Moolenaar <Bram@vim.org> | 2018-12-30 22:55:47 +0100 |
|---|---|---|
| committer | Bram Moolenaar <Bram@vim.org> | 2018-12-30 22:55:47 +0100 |
| commit | af0839acec403379627a4bc50cbeca588344cea5 (patch) | |
| tree | 285e6ff13bf503a0945b8618984235b86bf2319e /src/auto/configure | |
| parent | 8caa10a8ec6e398fd67c30b8a2bf20638d3c6c0a (diff) | |
| download | vim-git-af0839acec403379627a4bc50cbeca588344cea5.tar.gz | |
patch 8.1.0664: configure "fail-if-missing" does not apply to enable-guiv8.1.0664
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.
Diffstat (limited to 'src/auto/configure')
| -rwxr-xr-x | src/auto/configure | 17 |
1 files changed, 12 insertions, 5 deletions
diff --git a/src/auto/configure b/src/auto/configure index 3a1495b91..e9f66ba57 100755 --- a/src/auto/configure +++ b/src/auto/configure @@ -9115,10 +9115,9 @@ if test "x$QNX" = "xyes" -a "x$with_x" = "xno" ; then 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 @@ elif test "x$MACOS_X" = "xyes" -a "x$with_x" = "xno" ; then $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 @@ else $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 @@ $as_echo "no" >&6; } 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 @@ $as_echo "no" >&6; } 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 } |