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