diff options
| author | Peter Johansson <trojkan@gmail.com> | 2012-07-22 19:59:33 +0200 |
|---|---|---|
| committer | Peter Simons <simons@cryp.to> | 2012-07-22 20:08:50 +0200 |
| commit | 58e0be75ddc0d8f82ccba5a86313365719980bd2 (patch) | |
| tree | d3743ad5c5ecff0018f604e443bb01ed16107cca /m4/ax_check_zlib.m4 | |
| parent | 7d5e9315f7b93843f7d65699eebfec742323a483 (diff) | |
| download | autoconf-archive-58e0be75ddc0d8f82ccba5a86313365719980bd2.tar.gz | |
AX_CHECK_ZLIB: the current version only looks for zlib if --with-zlib
was provided [by user]. This patch changes that so the search and test
are also performed in default mode.
Diffstat (limited to 'm4/ax_check_zlib.m4')
| -rw-r--r-- | m4/ax_check_zlib.m4 | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/m4/ax_check_zlib.m4 b/m4/ax_check_zlib.m4 index d308183..0e81916 100644 --- a/m4/ax_check_zlib.m4 +++ b/m4/ax_check_zlib.m4 @@ -57,7 +57,7 @@ # modified version of the Autoconf Macro, you may extend this special # exception to the GPL to apply to your modified version as well. -#serial 8 +#serial 9 AU_ALIAS([CHECK_ZLIB], [AX_CHECK_ZLIB]) AC_DEFUN([AX_CHECK_ZLIB], @@ -65,12 +65,12 @@ AC_DEFUN([AX_CHECK_ZLIB], # Handle user hints # [AC_MSG_CHECKING(if zlib is wanted) +zlib_places="/usr/local /usr /opt/local /sw" AC_ARG_WITH(zlib, [ --with-zlib=DIR root directory path of zlib installation [defaults to /usr/local or /usr if not found in /usr/local] --without-zlib to disable zlib usage completely], [if test "$withval" != no ; then - zlib_places="/usr/local /usr /opt/local /sw" AC_MSG_RESULT(yes) if test -d "$withval" then @@ -79,6 +79,7 @@ AC_ARG_WITH(zlib, AC_MSG_WARN([Sorry, $withval does not exist, checking usual places]) fi else + zlib_places= AC_MSG_RESULT(no) fi], [AC_MSG_RESULT(yes)]) |