]> asedeno.scripts.mit.edu Git - PuTTY.git/commitdiff
Fix the '--without-gtk' mode in configure.
authorSimon Tatham <anakin@pobox.com>
Sat, 18 Feb 2017 16:50:48 +0000 (16:50 +0000)
committerSimon Tatham <anakin@pobox.com>
Sat, 18 Feb 2017 17:09:38 +0000 (17:09 +0000)
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.

mkfiles.pl

index 5b7ebc1d0ccc09b1b1fd91e6516e96f1b77c557d..ae15ac488d66caec8b68db0c021c490058b4d2d9 100755 (executable)
@@ -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")) {