X-Git-Url: https://git.distorted.org.uk/~mdw/sgt/putty/blobdiff_plain/f160b7b8908cac4a7ca37b49928b7855fe0a11fe..42af6a672d16302ee1b8971a7cc164120f7572ab:/mkfiles.pl diff --git a/mkfiles.pl b/mkfiles.pl index f0a57570..c4760b8f 100755 --- a/mkfiles.pl +++ b/mkfiles.pl @@ -924,6 +924,8 @@ if (defined $makefiles{'gtk'}) { "# You can define this path to point at your tools if you need to\n". "# TOOLPATH = /opt/gcc/bin\n". "CC = \$(TOOLPATH)cc\n". + "# If necessary set the path to krb5-config here\n". + "KRB5CONFIG=krb5-config\n". "# You can manually set this to `gtk-config' or `pkg-config gtk+-1.2'\n". "# (depending on what works on your system) if you want to enforce\n". "# building with GTK 1.2, or you can set it to `pkg-config gtk+-2.0'\n". @@ -931,12 +933,19 @@ if (defined $makefiles{'gtk'}) { "# to 1.2 if it isn't found.\n". "GTK_CONFIG = sh -c 'pkg-config gtk+-2.0 \$\$0 2>/dev/null || gtk-config \$\$0'\n". "\n". + "-include Makefile.local\n". + "\n". &splitline("CFLAGS = -O2 -Wall -Werror -g " . (join " ", map {"-I$dirpfx$_"} @srcdirs) . " `\$(GTK_CONFIG) --cflags`"). " -D _FILE_OFFSET_BITS=64\n". "XLDFLAGS = \$(LDFLAGS) `\$(GTK_CONFIG) --libs`\n". "ULDFLAGS = \$(LDFLAGS)\n". + "ifeq (,\$(findstring NO_GSSAPI,\$(COMPAT)))\n". + "CFLAGS+= `\$(KRB5CONFIG) --cflags gssapi`\n". + "XLDFLAGS+= `\$(KRB5CONFIG) --libs gssapi`\n". + "ULDFLAGS = `\$(KRB5CONFIG) --libs gssapi`\n". + "endif\n"; "INSTALL=install\n", "INSTALL_PROGRAM=\$(INSTALL)\n", "INSTALL_DATA=\$(INSTALL)\n",