From 1387e90bf3959125b985d41d049f9874d3003ec4 Mon Sep 17 00:00:00 2001 From: simon Date: Mon, 7 Jan 2013 19:08:33 +0000 Subject: [PATCH] Move the -I options for all our source subdirectories out of AM_CFLAGS and into AM_CPPFLAGS. This is more conceptually sensible according to my reading of the automake manual, and also has the specific desirable effect that they move to the front of the command line, ahead of any 'system' type -I options that autoconf might have felt a need for. A user reported that autoconf had added -I/usr/local/include to their command line for the sake of a required header file, but their /usr/local/include also turned out to include a thing called 'proxy.h' (from libproxy, nothing to do with us) which shadowed our own proxy.h and caused a build failure. This should fix that. git-svn-id: svn://svn.tartarus.org/sgt/putty@9736 cda61777-01e9-0310-a592-d414129be87e --- mkfiles.pl | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/mkfiles.pl b/mkfiles.pl index b52bf91d..fd543eb0 100755 --- a/mkfiles.pl +++ b/mkfiles.pl @@ -1155,7 +1155,10 @@ if (defined $makefiles{'am'}) { $objtosrc{$d->{obj}} = $d->{deps}->[0]; } - @amcflags = ("\$(COMPAT)", "\$(XFLAGS)", "\$(WARNINGOPTS)", map {"-I$dirpfx$_"} @srcdirs); + print &splitline(join " ", "AM_CPPFLAGS", "=", + map {"-I$dirpfx$_"} @srcdirs), "\n"; + + @amcflags = ("\$(COMPAT)", "\$(XFLAGS)", "\$(WARNINGOPTS)"); print "if HAVE_GTK\n"; print &splitline(join " ", "AM_CFLAGS", "=", "\$(GTK_CFLAGS)", @amcflags), "\n"; -- 2.11.0