X-Git-Url: http://drtracing.org/?a=blobdiff_plain;f=config%2Fzlib.m4;h=afa57d112e74f03948b7c43071f62e48422ced6b;hb=d27c357a5b83773054e85ff3ea5dbfe18b9dd3c0;hp=366429568e99eb2dda46b6470a9ad20531994f96;hpb=fa1f5da0b6ff3622f9bf60e348e149b76920abba;p=deliverable%2Fbinutils-gdb.git

diff --git a/config/zlib.m4 b/config/zlib.m4
index 366429568e..afa57d112e 100644
--- a/config/zlib.m4
+++ b/config/zlib.m4
@@ -5,12 +5,14 @@ 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])],
-  zlibdir=
-  zlibinc=
+  if test x$with_system_zlib = xyes ; then
+    zlibdir=
+    zlibinc=
+  fi
   )
   AC_SUBST(zlibdir)
   AC_SUBST(zlibinc)