summaryrefslogtreecommitdiff
path: root/zlib/Makefile.in
diff options
context:
space:
mode:
authortromey <tromey@138bc75d-0d04-0410-961f-82ee72b054a4>2007-01-17 19:48:52 +0000
committertromey <tromey@138bc75d-0d04-0410-961f-82ee72b054a4>2007-01-17 19:48:52 +0000
commitbdbb27ba1f09bdaf457ecc673f73a89d7b23baed (patch)
treeba422ba5a50ae9a3f5256c25bd733545c65207e6 /zlib/Makefile.in
parent76c0a846a59a1fc05aa6a2a975287e9ce9b16476 (diff)
downloadgcc-bdbb27ba1f09bdaf457ecc673f73a89d7b23baed.tar.gz
2007-01-17 Jack Howarth <howarth@bromo.med.uc.edu>
boehm-gc/ * aclocal.m4: Regenerate to use multi.m4. * configure: Regenerate. * Makefile.in: Regenerate. zlib/ * Makefile.am: Add ACLOCAL_AMFLAGS to use multi.m4. * aclocal.m4: Regenerate. * configure: Regenerate. * Makefile.in: Regenerate. libffi/ * Makefile.am: Add ACLOCAL_AMFLAGS to use multi.m4. * aclocal.m4: Regenerate. * configure: Regenerate. * Makefile.in: Regenerate. libjava/ * configure.ac: Use multi.m4 from aclocal rather than custom code. Use multi_basedir instead libgcj_basedir. Test for /proc/self/exe when not cross-compiling. * aclocal.m4: Regenerate. * configure: Regenerate. * Makefile.in: Regenerate. libjava/classpath/ * configure.ac: Use multi.m4 from aclocal rather than custom code. Use multi_basedir instead libgcj_basedir. * aclocal.m4: Regenerate. * configure: Regenerate. * Makefile.in: Regenerate. libjava/libltdl/ * Makefile.am: Add ACLOCAL_AMFLAGS to use multi.m4. * configure.ac: Use multi.m4 from aclocal rather than custom code. * aclocal.m4: Regenerate. * configure: Regenerate. * Makefile.in: Regenerate. git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@120870 138bc75d-0d04-0410-961f-82ee72b054a4
Diffstat (limited to 'zlib/Makefile.in')
-rw-r--r--zlib/Makefile.in4
1 files changed, 3 insertions, 1 deletions
diff --git a/zlib/Makefile.in b/zlib/Makefile.in
index 42a1df1f325..4f105e55634 100644
--- a/zlib/Makefile.in
+++ b/zlib/Makefile.in
@@ -51,7 +51,8 @@ DIST_COMMON = $(srcdir)/../config.guess $(srcdir)/../config.sub README \
subdir = .
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
am__aclocal_m4_deps = $(top_srcdir)/../config/depstand.m4 \
- $(top_srcdir)/../config/lead-dot.m4 $(top_srcdir)/acinclude.m4 \
+ $(top_srcdir)/../config/lead-dot.m4 \
+ $(top_srcdir)/../config/multi.m4 $(top_srcdir)/acinclude.m4 \
$(top_srcdir)/../config/no-executables.m4 \
$(top_srcdir)/../libtool.m4 $(top_srcdir)/configure.ac
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
@@ -207,6 +208,7 @@ target_vendor = @target_vendor@
toolexecdir = @toolexecdir@
toolexeclibdir = @toolexeclibdir@
AUTOMAKE_OPTIONS = 1.8 cygnus
+ACLOCAL_AMFLAGS = -I ../config
ZLIB_SOURCES = adler32.c compress.c crc32.c crc32.h deflate.c \
deflate.h gzio.c infback.c inffast.c inffast.h inffixed.h inflate.c \
inflate.h inftrees.c inftrees.h trees.c trees.h uncompr.c zconf.h \