From: Simon Tatham <anakin@pobox.com>
Date: Sat, 18 Feb 2017 16:50:48 +0000 (+0000)
Subject: Fix the '--without-gtk' mode in configure.
X-Git-Tag: 0.68~2
X-Git-Url: https://asedeno.scripts.mit.edu/gitweb/?a=commitdiff_plain;h=826c52144a2257ac52ee7ed21021c48bd24bd006;p=PuTTY.git

Fix the '--without-gtk' mode in configure.

I had accidentally included the experimental "XT" app class (the
GtkApplication-based packaging of Unix PuTTY/pterm for OS X) among the
things that should still be built even when GTK is absent. That's
definitely wrong.
---

diff --git a/mkfiles.pl b/mkfiles.pl
index 5b7ebc1d..ae15ac48 100755
--- a/mkfiles.pl
+++ b/mkfiles.pl
@@ -1660,11 +1660,20 @@ if (defined $makefiles{'am'}) {
     print "endif\n\n";
 
     @noinstcliprogs = ("noinst_PROGRAMS", "=");
-    foreach $p (&prognames("XT:UT")) {
+    foreach $p (&prognames("UT")) {
       ($prog, $type) = split ",", $p;
       push @noinstcliprogs, $prog;
     }
+    @noinstallprogs = @noinstcliprogs;
+    foreach $p (&prognames("XT")) {
+      ($prog, $type) = split ",", $p;
+      push @noinstallprogs, $prog;
+    }
+    print "if HAVE_GTK\n";
+    print &splitline(join " ", @noinstallprogs), "\n";
+    print "else\n";
     print &splitline(join " ", @noinstcliprogs), "\n";
+    print "endif\n\n";
 
     %objtosrc = ();
     foreach $d (&deps("X", undef, "", "/", "am")) {