diff options
author | Darren Tucker <dtucker@zip.com.au> | 2005-03-21 09:55:17 +1100 |
---|---|---|
committer | Darren Tucker <dtucker@zip.com.au> | 2005-03-21 09:55:17 +1100 |
commit | 86a5f8dd0afd10c8b844c81b04b436dd2bb852a3 (patch) | |
tree | 5ed8a7824085a1605330458938e3c4aaedc8edf7 | |
parent | eae17cc80ec1083a06eaa062547b926d01b91798 (diff) |
- (dtucker) [configure.ac] Prevent configure --with-zlib from adding -Iyes
and -Lyes to CFLAGS and LIBS. Pointed out by peter at slagheap.net,
with & ok tim@
-rw-r--r-- | ChangeLog | 7 | ||||
-rw-r--r-- | configure.ac | 11 |
2 files changed, 11 insertions, 7 deletions
@@ -1,3 +1,8 @@ | |||
1 | 20050321 | ||
2 | - (dtucker) [configure.ac] Prevent configure --with-zlib from adding -Iyes | ||
3 | and -Lyes to CFLAGS and LIBS. Pointed out by peter at slagheap.net, | ||
4 | with & ok tim@ | ||
5 | |||
1 | 20050317 | 6 | 20050317 |
2 | - (tim) [configure.ac] Bug 998. Make path for --with-opensc optional. | 7 | - (tim) [configure.ac] Bug 998. Make path for --with-opensc optional. |
3 | Make --without-opensc work. | 8 | Make --without-opensc work. |
@@ -2372,4 +2377,4 @@ | |||
2372 | - (djm) Trim deprecated options from INSTALL. Mention UsePAM | 2377 | - (djm) Trim deprecated options from INSTALL. Mention UsePAM |
2373 | - (djm) Fix quote handling in sftp; Patch from admorten AT umich.edu | 2378 | - (djm) Fix quote handling in sftp; Patch from admorten AT umich.edu |
2374 | 2379 | ||
2375 | $Id: ChangeLog,v 1.3724 2005/03/18 00:52:20 tim Exp $ | 2380 | $Id: ChangeLog,v 1.3725 2005/03/20 22:55:17 dtucker Exp $ |
diff --git a/configure.ac b/configure.ac index 9dce893a1..d77138505 100644 --- a/configure.ac +++ b/configure.ac | |||
@@ -1,4 +1,4 @@ | |||
1 | # $Id: configure.ac,v 1.254 2005/03/18 00:52:21 tim Exp $ | 1 | # $Id: configure.ac,v 1.255 2005/03/20 22:55:17 dtucker Exp $ |
2 | # | 2 | # |
3 | # Copyright (c) 1999-2004 Damien Miller | 3 | # Copyright (c) 1999-2004 Damien Miller |
4 | # | 4 | # |
@@ -587,10 +587,9 @@ AC_SEARCH_LIBS(basename, gen, AC_DEFINE(HAVE_BASENAME)) | |||
587 | dnl zlib is required | 587 | dnl zlib is required |
588 | AC_ARG_WITH(zlib, | 588 | AC_ARG_WITH(zlib, |
589 | [ --with-zlib=PATH Use zlib in PATH], | 589 | [ --with-zlib=PATH Use zlib in PATH], |
590 | [ | 590 | [ if test "x$withval" = "xno" ; then |
591 | if test "x$withval" = "xno" ; then | 591 | AC_MSG_ERROR([*** zlib is required ***]) |
592 | AC_MSG_ERROR([*** zlib is required ***]) | 592 | elif test "x$withval" != "xyes"; then |
593 | fi | ||
594 | if test -d "$withval/lib"; then | 593 | if test -d "$withval/lib"; then |
595 | if test -n "${need_dash_r}"; then | 594 | if test -n "${need_dash_r}"; then |
596 | LDFLAGS="-L${withval}/lib -R${withval}/lib ${LDFLAGS}" | 595 | LDFLAGS="-L${withval}/lib -R${withval}/lib ${LDFLAGS}" |
@@ -609,7 +608,7 @@ AC_ARG_WITH(zlib, | |||
609 | else | 608 | else |
610 | CPPFLAGS="-I${withval} ${CPPFLAGS}" | 609 | CPPFLAGS="-I${withval} ${CPPFLAGS}" |
611 | fi | 610 | fi |
612 | ] | 611 | fi ] |
613 | ) | 612 | ) |
614 | 613 | ||
615 | AC_CHECK_LIB(z, deflate, , | 614 | AC_CHECK_LIB(z, deflate, , |