Colin Watson reports a strange problem whereby krb5-config

[u/mdw/putty] / mkfiles.pl

diff --git a/mkfiles.pl b/mkfiles.pl
index c4760b8..77836b6 100755 (executable)
--- a/mkfiles.pl
+++ b/mkfiles.pl
@@ -935,6 +935,8 @@ if (defined $makefiles{'gtk'}) {
     "\n".
     "-include Makefile.local\n".
     "\n".
+    "unexport CFLAGS # work around a weird issue with krb5-config\n".
+    "\n".
     &splitline("CFLAGS = -O2 -Wall -Werror -g " .
               (join " ", map {"-I$dirpfx$_"} @srcdirs) .
               " `\$(GTK_CONFIG) --cflags`").
@@ -945,15 +947,15 @@ if (defined $makefiles{'gtk'}) {
     "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",
-    "prefix=/usr/local\n",
-    "exec_prefix=\$(prefix)\n",
-    "bindir=\$(exec_prefix)/bin\n",
-    "mandir=\$(prefix)/man\n",
-    "man1dir=\$(mandir)/man1\n",
+    "endif\n".
+    "INSTALL=install\n".
+    "INSTALL_PROGRAM=\$(INSTALL)\n".
+    "INSTALL_DATA=\$(INSTALL)\n".
+    "prefix=/usr/local\n".
+    "exec_prefix=\$(prefix)\n".
+    "bindir=\$(exec_prefix)/bin\n".
+    "mandir=\$(prefix)/man\n".
+    "man1dir=\$(mandir)/man1\n".
     "\n".
     $makefile_extra{'gtk'}->{'vars'} .
     "\n".
@@ -1007,14 +1009,14 @@ if (defined $makefiles{'ac'}) {
               (join " ", map {"-I$dirpfx$_"} @srcdirs))."\n".
     "XLDFLAGS = \@LDFLAGS\@ \@LIBS\@ \@GTK_LIBS\@\n".
     "ULDFLAGS = \@LDFLAGS\@ \@LIBS\@\n".
-    "INSTALL=\@INSTALL\@\n",
-    "INSTALL_PROGRAM=\$(INSTALL)\n",
-    "INSTALL_DATA=\$(INSTALL)\n",
-    "prefix=\@prefix\@\n",
-    "exec_prefix=\@exec_prefix\@\n",
-    "bindir=\@bindir\@\n",
-    "mandir=\@mandir\@\n",
-    "man1dir=\$(mandir)/man1\n",
+    "INSTALL=\@INSTALL\@\n".
+    "INSTALL_PROGRAM=\$(INSTALL)\n".
+    "INSTALL_DATA=\$(INSTALL)\n".
+    "prefix=\@prefix\@\n".
+    "exec_prefix=\@exec_prefix\@\n".
+    "bindir=\@bindir\@\n".
+    "mandir=\@mandir\@\n".
+    "man1dir=\$(mandir)/man1\n".
     "\n".
     $makefile_extra{'gtk'}->{'vars'} .
     "\n".