From: Jacob Nevins <jacobn@chiark.greenend.org.uk>
Date: Sun, 30 Aug 2009 13:16:50 +0000 (+0000)
Subject: Avoid compiling autoconf test programs with -Wall -Werror; doing so causes
X-Git-Tag: 0.61~125
X-Git-Url: https://asedeno.scripts.mit.edu/gitweb/?a=commitdiff_plain;h=b802ee0c169111a1b77b2d9a60d9e1c48fe085c8;hp=adc8a2ca9dafd705206b9df4e24dd9e116243c9c;p=PuTTY.git

Avoid compiling autoconf test programs with -Wall -Werror; doing so causes
trouble on Ubuntu, where the Gtk test programs don't check the return value
from system() and thus fall foul of the combination of our -Werror and
<https://wiki.ubuntu.com/CompilerFlags#-D_FORTIFY_SOURCE=2>.

[originally from svn r8638]
---

diff --git a/mkfiles.pl b/mkfiles.pl
index 75cb538b..9466ffec 100755
--- a/mkfiles.pl
+++ b/mkfiles.pl
@@ -1078,7 +1078,8 @@ if (defined $makefiles{'ac'}) {
     "\n".
     "CC = \@CC\@\n".
     "\n".
-    &splitline("CFLAGS = \@CFLAGS\@ \@CPPFLAGS\@ \@DEFS\@ \@GTK_CFLAGS\@ " .
+    &splitline("CFLAGS = \@CFLAGS\@ \@PUTTYCFLAGS\@ \@CPPFLAGS\@ " .
+               "\@DEFS\@ \@GTK_CFLAGS\@ " .
 	       (join " ", map {"-I$dirpfx$_"} @srcdirs))."\n".
     "XLDFLAGS = \@LDFLAGS\@ \@LIBS\@ \@GTK_LIBS\@\n".
     "ULDFLAGS = \@LDFLAGS\@ \@LIBS\@\n".
diff --git a/unix/configure.ac b/unix/configure.ac
index fc16350c..dcbc1535 100644
--- a/unix/configure.ac
+++ b/unix/configure.ac
@@ -11,8 +11,11 @@ AC_CONFIG_HEADERS([uxconfig.h:uxconfig.in])
 AC_PROG_INSTALL
 AC_PROG_CC
 if test "X$GCC" = Xyes; then
-    CFLAGS="$CFLAGS -Wall -Werror"
+    PUTTYCFLAGS="-Wall -Werror"
+else
+    PUTTYCFLAGS=""
 fi
+AC_SUBST(PUTTYCFLAGS)
 
 AC_ARG_WITH(gssapi,
 [  --without-gssapi        disable GSS-API support])