From 2ff3e0d06b3d78d3454fae2b24e40532f2faad6e Mon Sep 17 00:00:00 2001 From: pbrook <pbrook@138bc75d-0d04-0410-961f-82ee72b054a4> Date: Thu, 2 Dec 2004 00:42:12 +0000 Subject: [PATCH] 2004-12-01 Aaron W. LaFramboise <aaronavay62@aaronwl.com> * Makefile.am (AM_CPPFLAGS): Use -iquote instead of -I. git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@91602 138bc75d-0d04-0410-961f-82ee72b054a4 --- libgfortran/ChangeLog | 4 ++++ libgfortran/Makefile.am | 4 +++- libgfortran/Makefile.in | 2 +- 3 files changed, 8 insertions(+), 2 deletions(-) diff --git a/libgfortran/ChangeLog b/libgfortran/ChangeLog index 196761946617..59c05eecf591 100644 --- a/libgfortran/ChangeLog +++ b/libgfortran/ChangeLog @@ -1,3 +1,7 @@ +2004-12-01 Aaron W. LaFramboise <aaronavay62@aaronwl.com> + + * Makefile.am (AM_CPPFLAGS): Use -iquote instead of -I. + 2004-11-28 Bud Davis <bdavis9659@comcast.net> * io/unix.c (mmap_alloc_w_a): check for a write to a location diff --git a/libgfortran/Makefile.am b/libgfortran/Makefile.am index 50a3dacb1443..d93b5f308b76 100644 --- a/libgfortran/Makefile.am +++ b/libgfortran/Makefile.am @@ -13,7 +13,9 @@ libgfortran_la_LDFLAGS = -version-info `grep -v '^\#' $(srcdir)/libtool-version` libgfortranbegin_la_SOURCES = fmain.c libgfortranbegin_la_LDFLAGS = -static -AM_CPPFLAGS = -I$(srcdir)/io +## io.h conflicts with some a system header on some platforms, so +## use -iquote +AM_CPPFLAGS = -iquote$(srcdir)/io libgfortranincludedir = $(includedir)/gforio diff --git a/libgfortran/Makefile.in b/libgfortran/Makefile.in index b8d8c74084e5..91c326fa050f 100644 --- a/libgfortran/Makefile.in +++ b/libgfortran/Makefile.in @@ -297,7 +297,7 @@ toolexeclib_LTLIBRARIES = libgfortran.la libgfortranbegin.la libgfortran_la_LDFLAGS = -version-info `grep -v '^\#' $(srcdir)/libtool-version` -lm libgfortranbegin_la_SOURCES = fmain.c libgfortranbegin_la_LDFLAGS = -static -AM_CPPFLAGS = -I$(srcdir)/io +AM_CPPFLAGS = -iquote$(srcdir)/io libgfortranincludedir = $(includedir)/gforio gfor_io_src = \ io/backspace.c \ -- GitLab