diff options
Diffstat (limited to 'libgfortran')
| -rw-r--r-- | libgfortran/ChangeLog | 4 | ||||
| -rw-r--r-- | libgfortran/Makefile.am | 4 | ||||
| -rw-r--r-- | libgfortran/Makefile.in | 2 |
3 files changed, 8 insertions, 2 deletions
diff --git a/libgfortran/ChangeLog b/libgfortran/ChangeLog index 19676194661..59c05eecf59 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 50a3dacb144..d93b5f308b7 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 b8d8c74084e..91c326fa050 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 \ |