* [PATCH] Sync and use zlib.m4 with binutils-gdb
@ 2015-04-14 19:11 H.J. Lu
2015-07-14 14:20 ` H.J. Lu
0 siblings, 1 reply; 2+ messages in thread
From: H.J. Lu @ 2015-04-14 19:11 UTC (permalink / raw)
To: gcc-patches
This patch syncs zlib.m4 with binutils-gdb and uses AM_ZLIB from zlib.m4
in gcc/configure.ac. OK for trunk?
Thanks.
H.J.
--
config/
* zlib.m4: Sync with binutils-gdb.
gcc/
* Makefile.in (top_srcdir): New.
* configure.ac: Use AM_ZLIB.
* configure: Regeneated.
---
config/zlib.m4 | 27 ++++++++++++++-------------
gcc/Makefile.in | 3 +++
gcc/aclocal.m4 | 1 +
gcc/configure | 13 +++++++++----
gcc/configure.ac | 10 +---------
5 files changed, 28 insertions(+), 26 deletions(-)
diff --git a/config/zlib.m4 b/config/zlib.m4
index b017499..afa57d1 100644
--- a/config/zlib.m4
+++ b/config/zlib.m4
@@ -1,18 +1,19 @@
-dnl A function to check for zlib availability. zlib is used by default
-dnl unless the user configured with --disable-nls.
+dnl A function to check if the system's zlib library should be used. The
+dnl builtin zlib dnl is used by default unless the user configured with
+dnl --with-system-zlib.
AC_DEFUN([AM_ZLIB],
[
- # See if the user specified whether he wants zlib support or not.
- AC_ARG_WITH(zlib,
- [ --with-zlib include zlib support (auto/yes/no) [default=auto]],
- [], [with_zlib=auto])
-
- if test "$with_zlib" != "no"; then
- AC_SEARCH_LIBS(zlibVersion, z, [AC_CHECK_HEADERS(zlib.h)])
- if test "$with_zlib" = "yes" -a "$ac_cv_header_zlib_h" != "yes"; then
- AC_MSG_ERROR([zlib (libz) library was explicitly requested but not found])
- fi
+ # Use the system's zlib library.
+ zlibdir="-L\$(top_builddir)/../zlib"
+ zlibinc="-I\$(top_srcdir)/../zlib"
+ AC_ARG_WITH(system-zlib,
+ [AS_HELP_STRING([--with-system-zlib], [use installed libz])],
+ if test x$with_system_zlib = xyes ; then
+ zlibdir=
+ zlibinc=
fi
+ )
+ AC_SUBST(zlibdir)
+ AC_SUBST(zlibinc)
])
-
diff --git a/gcc/Makefile.in b/gcc/Makefile.in
index 4ab7405..174fc91 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 cb6a48b..9031865 100644
--- a/gcc/aclocal.m4
+++ b/gcc/aclocal.m4
@@ -34,4 +34,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 9523773..8972897 100755
--- a/gcc/configure
+++ b/gcc/configure
@@ -27833,13 +27833,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
@@ -27847,6 +27851,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 68b0ee8..2e6cf8b 100644
--- a/gcc/configure.ac
+++ b/gcc/configure.ac
@@ -5323,15 +5323,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
--
1.9.3
^ permalink raw reply [flat|nested] 2+ messages in thread
* Re: [PATCH] Sync and use zlib.m4 with binutils-gdb
2015-04-14 19:11 [PATCH] Sync and use zlib.m4 with binutils-gdb H.J. Lu
@ 2015-07-14 14:20 ` H.J. Lu
0 siblings, 0 replies; 2+ messages in thread
From: H.J. Lu @ 2015-07-14 14:20 UTC (permalink / raw)
To: GCC Patches
On Tue, Apr 14, 2015 at 12:11 PM, H.J. Lu <hongjiu.lu@intel.com> wrote:
> This patch syncs zlib.m4 with binutils-gdb and uses AM_ZLIB from zlib.m4
> in gcc/configure.ac. OK for trunk?
>
> Thanks.
>
> H.J.
> --
> config/
>
> * zlib.m4: Sync with binutils-gdb.
>
> gcc/
>
> * Makefile.in (top_srcdir): New.
> * configure.ac: Use AM_ZLIB.
> * configure: Regeneated.
> ---
> config/zlib.m4 | 27 ++++++++++++++-------------
> gcc/Makefile.in | 3 +++
> gcc/aclocal.m4 | 1 +
> gcc/configure | 13 +++++++++----
> gcc/configure.ac | 10 +---------
> 5 files changed, 28 insertions(+), 26 deletions(-)
>
I am checking in this patch.
--
H.J.
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2015-07-14 14:20 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2015-04-14 19:11 [PATCH] Sync and use zlib.m4 with binutils-gdb H.J. Lu
2015-07-14 14:20 ` H.J. Lu
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).