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
+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>
* dfp.m4 (enable_decimal_float): Also set to yes for
-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)
])
-
+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
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 = .
m4_include([../config/progtest.m4])
m4_include([../config/stdint.m4])
m4_include([../config/warnings.m4])
+m4_include([../config/zlib.m4])
m4_include([acinclude.m4])
# 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
+
{ $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.
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