X-Git-Url: https://git.distorted.org.uk/u/mdw/putty/blobdiff_plain/fedd99b61158fecec2a7d016401d1cf1b9b19b22..3982a765c4ae798e61bcb5ed7415e509718dc445:/Recipe

diff --git a/Recipe b/Recipe
index fab512bc..3702191a 100644
--- a/Recipe
+++ b/Recipe
@@ -18,6 +18,7 @@
 !makefile borland windows/Makefile.bor
 !makefile lcc windows/Makefile.lcc
 !makefile gtk unix/Makefile.gtk
+!makefile unix unix/Makefile.ux
 !makefile ac unix/Makefile.in
 !makefile mpw mac/Makefile.mpw
 !makefile osx macosx/Makefile
@@ -95,6 +96,10 @@
 #      it to compile under development environments which do not
 #      support IPv6 in their header files.
 #
+#  - COMPAT=/DNO_GSSAPI
+#      Disables PuTTY's ability to use GSSAPI functions for
+#      authentication and key exchange.
+#
 #  - COMPAT=/DMSVC4 (Windows only)
 #  - RCFL=/DMSVC4
 #      Makes a couple of minor changes so that PuTTY compiles using
@@ -166,6 +171,7 @@ version.o: FORCE
 # Add VER to Windows resource targets, and force them to be rebuilt every
 # time, on the assumption that they will contain version information.
 !begin vc vars
+CFLAGS = $(CFLAGS) /DHAS_GSSAPI /DSECURITY_WIN32
 RCFLAGS = $(RCFLAGS) $(VER)
 !end
 !begin cygwin vars
@@ -245,7 +251,7 @@ GUITERM  = TERMINAL window windlg winctrls sizetip winucs winprint
 
 # Same thing on Unix.
 UXTERM   = TERMINAL uxcfg sercfg uxucs uxprint timing
-GTKTERM  = UXTERM gtkwin gtkcfg gtkdlg gtkcols xkeysym
+GTKTERM  = UXTERM gtkwin gtkcfg gtkdlg gtkfont gtkcols xkeysym
 OSXTERM  = UXTERM osxwin osxdlg osxctrls
 
 # Non-SSH back ends (putty, puttytel, plink).
@@ -255,8 +261,8 @@ NONSSH   = telnet raw rlogin ldisc pinger
 SSH      = ssh sshcrc sshdes sshmd5 sshrsa sshrand sshsha sshblowf
          + sshdh sshcrcda sshpubk sshzlib sshdss x11fwd portfwd
          + sshaes sshsh256 sshsh512 sshbn wildcard pinger ssharcf
-WINSSH   = SSH winnoise winpgntc
-UXSSH    = SSH uxnoise uxagentc
+WINSSH   = SSH winnoise winpgntc wingss
+UXSSH    = SSH uxnoise uxagentc uxgss
 MACSSH   = SSH macnoise
 
 # SFTP implementation (pscp, psftp).
@@ -297,10 +303,10 @@ U_BE_NOSSH = be_nos_s uxser nocproxy
 # keywords [G] for Windows GUI app, [C] for Console app, [X] for
 # X/GTK Unix app, [U] for command-line Unix app, [M] for Macintosh app.
 
-putty    : [G] GUITERM NONSSH WINSSH W_BE_ALL WINMISC putty.res LIBS
+putty    : [G] GUITERM NONSSH WINSSH W_BE_ALL WINMISC winx11 putty.res LIBS
 puttytel : [G] GUITERM NONSSH W_BE_NOSSH WINMISC puttytel.res LIBS
 plink    : [C] winplink wincons NONSSH WINSSH W_BE_ALL logging WINMISC
-         + plink.res LIBS
+         + winx11 plink.res LIBS
 pscp     : [C] pscp winsftp wincons WINSSH BE_SSH SFTP wildcard WINMISC
          + pscp.res LIBS
 psftp    : [C] psftp winsftp wincons WINSSH BE_SSH SFTP wildcard WINMISC