mirror/gcc
1
0
Fork 0
mirror of https://github.com/gcc-mirror/gcc.git synced 2024-11-21 13:40:47 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

This patch syncs zlib.m4 with binutils-gdb and uses AM_ZLIB from zlib.m4

Browse Source 
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
This commit is contained in:
H.J. Lu 2015-07-14 14:25:35 +00:00 committed by H.J. Lu
parent 6ed80e1e51
commit 96a58590dd
7 changed files with 38 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
config/ChangeLog
View File

@ -1,3 +1,7 @@
2015-07-14 H.J. Lu <hongjiu.lu@intel.com>
* zlib.m4: Sync with binutils-gdb.
2015-06-30 H.J. Lu <hongjiu.lu@intel.com> 2015-06-30 H.J. Lu <hongjiu.lu@intel.com>
* dfp.m4 (enable_decimal_float): Also set to yes for * dfp.m4 (enable_decimal_float): Also set to yes for

27
config/zlib.m4
View File

@ -1,18 +1,19 @@
dnl A function to check for zlib availability. zlib is used by default dnl A function to check if the system's zlib library should be used. The
dnl unless the user configured with --disable-nls. dnl builtin zlib dnl is used by default unless the user configured with
dnl --with-system-zlib.
AC_DEFUN([AM_ZLIB], AC_DEFUN([AM_ZLIB],
[ [
# See if the user specified whether he wants zlib support or not. # Use the system's zlib library.
AC_ARG_WITH(zlib, zlibdir="-L\$(top_builddir)/../zlib"
[ --with-zlib include zlib support (auto/yes/no) [default=auto]], zlibinc="-I\$(top_srcdir)/../zlib"
[], [with_zlib=auto]) AC_ARG_WITH(system-zlib,
[AS_HELP_STRING([--with-system-zlib], [use installed libz])],
if test "$with_zlib" != "no"; then if test x$with_system_zlib = xyes ; then
AC_SEARCH_LIBS(zlibVersion, z, [AC_CHECK_HEADERS(zlib.h)]) zlibdir=
if test "$with_zlib" = "yes" -a "$ac_cv_header_zlib_h" != "yes"; then zlibinc=
AC_MSG_ERROR([zlib (libz) library was explicitly requested but not found])
fi
fi fi
)
AC_SUBST(zlibdir)
AC_SUBST(zlibinc)
]) ])

6
gcc/ChangeLog
View File

@ -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> 2015-07-14 Matthias Klose <doko@ubuntu.com>
PR target/66840 PR target/66840

3
gcc/Makefile.in
View File

@ -79,6 +79,9 @@ gcc_docdir = @srcdir@/doc
abs_srcdir = @abs_srcdir@ abs_srcdir = @abs_srcdir@
abs_docdir = @abs_srcdir@/doc 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 build directory for this package, relative to here.
top_builddir = . top_builddir = .

1
gcc/aclocal.m4 vendored
View File

@ -35,4 +35,5 @@ m4_include([../config/picflag.m4])
m4_include([../config/progtest.m4]) m4_include([../config/progtest.m4])
m4_include([../config/stdint.m4]) m4_include([../config/stdint.m4])
m4_include([../config/warnings.m4]) m4_include([../config/warnings.m4])
m4_include([../config/zlib.m4])
m4_include([acinclude.m4]) m4_include([acinclude.m4])

13
gcc/configure vendored
View File

@ -28108,13 +28108,17 @@ fi
# Use the system's zlib library. # 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. # Check whether --with-system-zlib was given.
if test "${with_system_zlib+set}" = set; then : if test "${with_system_zlib+set}" = set; then :
withval=$with_system_zlib; zlibdir= withval=$with_system_zlib; if test x$with_system_zlib = xyes ; then
zlibinc= zlibdir=
zlibinc=
fi
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 "$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; } $as_echo_n "checking whether to enable maintainer-specific portions of Makefiles... " >&6; }
# Check whether --enable-maintainer-mode was given. # Check whether --enable-maintainer-mode was given.

10
gcc/configure.ac
View File

@ -5385,15 +5385,7 @@ fi
AC_SUBST(HOST_LIBS) AC_SUBST(HOST_LIBS)
# Use the system's zlib library. # Use the system's zlib library.
zlibdir=-L../zlib AM_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)
dnl Very limited version of automake's enable-maintainer-mode dnl Very limited version of automake's enable-maintainer-mode