diff options
| author | H.J. Lu <hongjiu.lu@intel.com> | 2015-07-14 14:25:35 +0000 |
|---|---|---|
| committer | H.J. Lu <hjl@gcc.gnu.org> | 2015-07-14 07:25:35 -0700 |
| commit | 96a58590dd57e67e7ef65f1dee8ee9fa2c460457 (patch) | |
| tree | 283d05c62f478517a553de7fb4c73d0181b4189d /gcc | |
| parent | 6ed80e1e5116abd6a8119b9c187bcd261ac55b1b (diff) | |
| download | gcc-96a58590dd57e67e7ef65f1dee8ee9fa2c460457.zip gcc-96a58590dd57e67e7ef65f1dee8ee9fa2c460457.tar.gz gcc-96a58590dd57e67e7ef65f1dee8ee9fa2c460457.tar.bz2 | |
This patch syncs zlib.m4 with binutils-gdb and uses AM_ZLIB from zlib.m4
in gcc/configure.ac.
config/
* zlib.m4: Sync with binutils-gdb.
gcc/
* Makefile.in (top_srcdir): New.
* configure.ac: Use AM_ZLIB.
* configure: Regeneated.
From-SVN: r225774
Diffstat (limited to 'gcc')
| -rw-r--r-- | gcc/ChangeLog | 6 | ||||
| -rw-r--r-- | gcc/Makefile.in | 3 | ||||
| -rw-r--r-- | gcc/aclocal.m4 | 1 | ||||
| -rwxr-xr-x | gcc/configure | 13 | ||||
| -rw-r--r-- | gcc/configure.ac | 10 |
5 files changed, 20 insertions, 13 deletions
diff --git a/gcc/ChangeLog b/gcc/ChangeLog index f31f648..a34eb8d 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,3 +1,9 @@ +2015-07-14 H.J. Lu <hongjiu.lu@intel.com> + + * Makefile.in (top_srcdir): New. + * configure.ac: Use AM_ZLIB. + * configure: Regeneated. + 2015-07-14 Matthias Klose <doko@ubuntu.com> PR target/66840 diff --git a/gcc/Makefile.in b/gcc/Makefile.in index 1817025..bf2186a 100644 --- a/gcc/Makefile.in +++ b/gcc/Makefile.in @@ -79,6 +79,9 @@ gcc_docdir = @srcdir@/doc abs_srcdir = @abs_srcdir@ abs_docdir = @abs_srcdir@/doc +# Directory where sources are, relative to here. +top_srcdir = @top_srcdir@ + # Top build directory for this package, relative to here. top_builddir = . diff --git a/gcc/aclocal.m4 b/gcc/aclocal.m4 index 49fea10..84f8abb 100644 --- a/gcc/aclocal.m4 +++ b/gcc/aclocal.m4 @@ -35,4 +35,5 @@ m4_include([../config/picflag.m4]) m4_include([../config/progtest.m4]) m4_include([../config/stdint.m4]) m4_include([../config/warnings.m4]) +m4_include([../config/zlib.m4]) m4_include([acinclude.m4]) diff --git a/gcc/configure b/gcc/configure index 9561e5c..e0755f9 100755 --- a/gcc/configure +++ b/gcc/configure @@ -28108,13 +28108,17 @@ fi # Use the system's zlib library. -zlibdir=-L../zlib -zlibinc="-I\$(srcdir)/../zlib" + + # Use the system's zlib library. + zlibdir="-L\$(top_builddir)/../zlib" + zlibinc="-I\$(top_srcdir)/../zlib" # Check whether --with-system-zlib was given. if test "${with_system_zlib+set}" = set; then : - withval=$with_system_zlib; zlibdir= -zlibinc= + withval=$with_system_zlib; if test x$with_system_zlib = xyes ; then + zlibdir= + zlibinc= + fi fi @@ -28122,6 +28126,7 @@ fi + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to enable maintainer-specific portions of Makefiles" >&5 $as_echo_n "checking whether to enable maintainer-specific portions of Makefiles... " >&6; } # Check whether --enable-maintainer-mode was given. diff --git a/gcc/configure.ac b/gcc/configure.ac index cb14639..7af6dbd 100644 --- a/gcc/configure.ac +++ b/gcc/configure.ac @@ -5385,15 +5385,7 @@ fi AC_SUBST(HOST_LIBS) # Use the system's zlib library. -zlibdir=-L../zlib -zlibinc="-I\$(srcdir)/../zlib" -AC_ARG_WITH(system-zlib, -[AS_HELP_STRING([--with-system-zlib], [use installed libz])], -zlibdir= -zlibinc= -) -AC_SUBST(zlibdir) -AC_SUBST(zlibinc) +AM_ZLIB dnl Very limited version of automake's enable-maintainer-mode |