diff options
| author |   H.J. Lu <hjl.tools@gmail.com> | 2015-03-31 03:55:56 -0700 |
|---|---|---|
| committer | H.J. Lu <hjl.tools@gmail.com> | 2015-03-31 03:56:12 -0700 |
| commit | 0138187e9fc351c6d4615bbe2ab020a3ac646b50 (patch) | |
| tree | 5863d905a08e1fca6445b29b1f8aada03c805b86 /gas/Makefile.in | |
| parent | Add --with-system-zlib in binutils (diff) | |
| download | binutils-gdb-0138187e9fc351c6d4615bbe2ab020a3ac646b50.tar.gz binutils-gdb-0138187e9fc351c6d4615bbe2ab020a3ac646b50.tar.bz2 binutils-gdb-0138187e9fc351c6d4615bbe2ab020a3ac646b50.zip | |
Add --with-system-zlib in gas
This patch adds --with-system-zlib and remove --with-zlib in gas.
gas/
* Makefile.am (ZLIBINC): New.
(AM_CFLAGS): Add $(ZLIBINC).
* as.c: (show_usage): Don't check HAVE_ZLIB_H.
(parse_args): Likewise.
* compress-debug.c: Don't check HAVE_ZLIB_H to include <zlib.h>.
(compress_init): Don't check HAVE_ZLIB_H.
(compress_data): Likewise.
(compress_finish): Likewise.
* configure.ac (AM_ZLIB): Removed.
(zlibinc): New. AC_SUBST.
Add --with-system-zlib.
* Makefile.in: Regenerated.
* config.in: Likewise.
* configure: Likewise.
* doc/Makefile.in: Likewise.
gas/testsuite/
* gas/i386/dw2-compress-1.d: Expect .zdebug_info.
Diffstat (limited to 'gas/Makefile.in')
| -rw-r--r-- | gas/Makefile.in | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/gas/Makefile.in b/gas/Makefile.in index edd3638bbcb..240d7d940ab 100644 --- a/gas/Makefile.in +++ b/gas/Makefile.in @@ -66,7 +66,6 @@ DIST_COMMON = NEWS README ChangeLog $(srcdir)/Makefile.in \ $(srcdir)/../ylwrap ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/../bfd/acinclude.m4 \ - $(top_srcdir)/../config/zlib.m4 \ $(top_srcdir)/../bfd/warning.m4 $(top_srcdir)/../config/acx.m4 \ $(top_srcdir)/../config/depstand.m4 \ $(top_srcdir)/../config/gettext-sister.m4 \ @@ -298,16 +297,22 @@ te_file = @te_file@ top_build_prefix = @top_build_prefix@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ +zlibinc = @zlibinc@ AUTOMAKE_OPTIONS = 1.11 dejagnu foreign no-dist ACLOCAL_AMFLAGS = -I .. -I ../config -I ../bfd SUBDIRS = doc po tooldir = $(exec_prefix)/$(target_alias) +# This is where we get zlib from. zlibdir is -L../zlib and zlibinc is +# -I../zlib, unless we were configured with --with-system-zlib, in which +# case both are empty. +ZLIBINC = @zlibinc@ + # Automake 1.10+ disables lex and yacc output file regeneration if # maintainer mode is disabled. Avoid this. am__skiplex = am__skipyacc = -AM_CFLAGS = $(WARN_CFLAGS) +AM_CFLAGS = $(WARN_CFLAGS) $(ZLIBINC) TARG_CPU = @target_cpu_type@ TARG_CPU_C = $(srcdir)/config/tc-@target_cpu_type@.c TARG_CPU_O = tc-@target_cpu_type@.@OBJEXT@ |