Author: danielsh
Date: Fri Sep 23 14:23:31 2011
New Revision: 1174798
URL: http://svn.apache.org/viewvc?rev=1174798&view=rev
Log:
* build/ac-macros/zlib.m4
(SVN_LIB_Z): DTRT when --with-zlib is passed without an argument.
Found by: philip
Modified:
subversion/trunk/build/ac-macros/zlib.m4
Modified: subversion/trunk/build/ac-macros/zlib.m4
URL:
http://svn.apache.org/viewvc/subversion/trunk/build/ac-macros/zlib.m4?rev=1174798&r1=1174797&r2=1174798&view=diff
==============================================================================
--- subversion/trunk/build/ac-macros/zlib.m4 (original)
+++ subversion/trunk/build/ac-macros/zlib.m4 Fri Sep 23 14:23:31 2011
@@ -31,7 +31,9 @@ AC_DEFUN(SVN_LIB_Z,
[zlib compression library]),
[
if test "$withval" = "yes" ; then
- AC_MSG_ERROR([--with-zlib requires an argument.])
+ AC_CHECK_HEADER(zlib.h, [
+ AC_CHECK_LIB(z, inflate, [zlib_found="builtin"])
+ ])
elif test "$withval" = "no" ; then
AC_MSG_ERROR([cannot compile without zlib.])
else
