From ac115f9082d36ede34c18485741932ef8182ecbc Mon Sep 17 00:00:00 2001 From: Simon Tatham 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. [originally from svn r9736] --- 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.45.2