From df7f7547a5cb6455ad07855482797860b71fb532 Mon Sep 17 00:00:00 2001 From: "H.J. Lu" Date: Thu, 2 Apr 2015 05:37:09 -0700 Subject: [PATCH] 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. --- config/ChangeLog | 5 +++++ config/zlib.m4 | 4 ++-- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/config/ChangeLog b/config/ChangeLog index 6dc499891f6..6ffb0ed1e66 100644 --- a/config/ChangeLog +++ b/config/ChangeLog @@ -1,3 +1,8 @@ +2015-04-02 H.J. Lu + + * 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 * zlib.m4 (AM_ZLIB): Unset zlibdir and zlibinc only for diff --git a/config/zlib.m4 b/config/zlib.m4 index aa3ac48692b..afa57d112e7 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 -- 2.30.2