This is the mail archive of the
binutils-cvs@sourceware.org
mailing list for the binutils project.
[binutils-gdb] Set zlibdir/zlibinc with top_builddir/top_srcdir
- From: H.J.Lu <hjl at sourceware dot org>
- To: bfd-cvs at sourceware dot org, gdb-cvs at sourceware dot org
- Date: 2 Apr 2015 12:47:47 -0000
- Subject: [binutils-gdb] Set zlibdir/zlibinc with top_builddir/top_srcdir
https://sourceware.org/git/gitweb.cgi?p=binutils-gdb.git;h=df7f7547a5cb6455ad07855482797860b71fb532
commit df7f7547a5cb6455ad07855482797860b71fb532
Author: H.J. Lu <hjl.tools@gmail.com>
Date: Thu Apr 2 05:37:09 2015 -0700
Set zlibdir/zlibinc with top_builddir/top_srcdir
* zlib.m4 (AM_ZLIB): Set zlibdir to -L\$(top_builddir)/../zlib
and set zlibinc to -I\$(top_srcdir)/../zlib.
Diff:
---
config/ChangeLog | 5 +++++
config/zlib.m4 | 4 ++--
2 files changed, 7 insertions(+), 2 deletions(-)
diff --git a/config/ChangeLog b/config/ChangeLog
index 6dc4998..6ffb0ed 100644
--- a/config/ChangeLog
+++ b/config/ChangeLog
@@ -1,3 +1,8 @@
+2015-04-02 H.J. Lu <hongjiu.lu@intel.com>
+
+ * zlib.m4 (AM_ZLIB): Set zlibdir to -L\$(top_builddir)/../zlib
+ and set zlibinc to -I\$(top_srcdir)/../zlib.
+
2015-04-01 H.J. Lu <hongjiu.lu@intel.com>
* zlib.m4 (AM_ZLIB): Unset zlibdir and zlibinc only for
diff --git a/config/zlib.m4 b/config/zlib.m4
index aa3ac48..afa57d1 100644
--- a/config/zlib.m4
+++ b/config/zlib.m4
@@ -5,8 +5,8 @@ dnl --with-system-zlib.
AC_DEFUN([AM_ZLIB],
[
# Use the system's zlib library.
- zlibdir=-L../zlib
- zlibinc="-I\$(srcdir)/../zlib"
+ 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