1From cef3fc90f02ef4fc49515745194bac3d81a2265b Mon Sep 17 00:00:00 2001 2From: "Jose E. Marchesi" <jose.marchesi@oracle.com> 3Date: Fri, 30 Apr 2021 13:17:05 +0200 4Subject: [PATCH] build: do not check for Tcl/Tk if --disable-gui is specified 5 62021-04-30 Jose E. Marchesi <jemarch@gnu.org> 7 8 * configure.ac: Do not check for tcl/tk if --disable-gui is 9 specified at configure time. 10 11(cherry picked from commit 280a5e154287e43c0a40d9530a9cc658a7367a9c) 12[Romain: remove Changelog entry] 13Signed-off-by: Romain Naour <romain.naour@gmail.com> 14--- 15 configure.ac | 9 ++++++--- 16 1 file changed, 6 insertions(+), 3 deletions(-) 17 18diff --git a/configure.ac b/configure.ac 19index c7205513..c2f0760a 100644 20--- a/configure.ac 21+++ b/configure.ac 22@@ -214,12 +214,15 @@ fi 23 dnl The GUI is optional, and depends on the availability of Tcl and 24 dnl Tk. 25 26-POKE_TCLTK 27- 28 AC_ARG_ENABLE([gui], 29 AS_HELP_STRING([--enable-gui], 30 [Enable the GUI (default is YES)]), 31- [gui_enabled=$enableval], [gui_enabled=$has_tcltk]) 32+ [gui_enabled=$enableval], [gui_enabled=yes]) 33+ 34+if test "x$gui_enabled" = "xyes"; then 35+ POKE_TCLTK 36+ gui_enabled=$has_tcltk 37+fi 38 39 AM_CONDITIONAL([GUI], [test "x$gui_enabled" = "xyes"]) 40 41-- 422.30.2 43 44