diff options
| author | Nick Mathewson <nickm@torproject.org> | 2011-03-28 17:49:34 -0400 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2011-03-28 17:49:34 -0400 |
| commit | 22f7042b9184d4463429072d788d52f4fc75e866 (patch) | |
| tree | 0a98c02364c42d91cf2ecbd44fc2ebab611d65cb | |
| parent | 47621188328c19be18a6915f937e4e0f7e04fba8 (diff) | |
| parent | 3a7cee9d2984126ef8378657d6200f711eb58517 (diff) | |
| download | tor-22f7042b9184d4463429072d788d52f4fc75e866.tar.gz tor-22f7042b9184d4463429072d788d52f4fc75e866.zip | |
Merge remote-tracking branch 'origin/maint-0.2.1' into maint-0.2.2
| -rw-r--r-- | changes/zlib_aint_openssl | 3 | ||||
| -rw-r--r-- | configure.in | 8 |
2 files changed, 7 insertions, 4 deletions
diff --git a/changes/zlib_aint_openssl b/changes/zlib_aint_openssl new file mode 100644 index 0000000000..dd8e10a328 --- /dev/null +++ b/changes/zlib_aint_openssl @@ -0,0 +1,3 @@ + o Minor bugfixes + - When warning about missing zlib development packages, give the + correct package names. Bugfix on 0.2.0.1-alpha. diff --git a/configure.in b/configure.in index 6ed43ce23b..2e449ec486 100644 --- a/configure.in +++ b/configure.in @@ -375,10 +375,10 @@ AC_SUBST(TOR_OPENSSL_LIBS) dnl ------------------------------------------------------ dnl Where do you live, zlib? And how do we call you? -tor_openssl_pkg_redhat="zlib" -tor_openssl_pkg_debian="zlib1g" -tor_openssl_devpkg_redhat="zlib-devel" -tor_openssl_devpkg_debian="zlib1g-dev" +tor_zlib_pkg_redhat="zlib" +tor_zlib_pkg_debian="zlib1g" +tor_zlib_devpkg_redhat="zlib-devel" +tor_zlib_devpkg_debian="zlib1g-dev" TOR_SEARCH_LIBRARY(zlib, $tryzlibdir, [-lz], [#include <zlib.h>], |