diff options
| author | Sebastian Hahn <sebastian@torproject.org> | 2011-03-27 05:29:00 +0200 |
|---|---|---|
| committer | Sebastian Hahn <sebastian@torproject.org> | 2011-04-02 12:15:08 +0200 |
| commit | e97f78d7899372238c04bc6de019996ed9968f5d (patch) | |
| tree | 82fff407a3263847a3263394f0e7343fe28ce04e /configure.in | |
| parent | fe051a43c1fc5d8528ed46deaa818031b16a79eb (diff) | |
| download | tor-e97f78d7899372238c04bc6de019996ed9968f5d.tar.gz tor-e97f78d7899372238c04bc6de019996ed9968f5d.zip | |
Small fixes for the 2702 implementation
Improve the INSTALL documentation for static builds, remove a few
unnecessary lines from configure.in and tweak the changelog message
slightly.
Diffstat (limited to 'configure.in')
| -rw-r--r-- | configure.in | 18 |
1 files changed, 1 insertions, 17 deletions
diff --git a/configure.in b/configure.in index f7875df71e..b7e418050b 100644 --- a/configure.in +++ b/configure.in @@ -33,14 +33,12 @@ AC_ARG_ENABLE(static-libevent, AC_ARG_ENABLE(static-zlib, AS_HELP_STRING(--enable-static-zlib, Link against a static zlib library. Requires --with-zlib-dir)) AC_ARG_ENABLE(static-tor, - AS_HELP_STRING(--enable-static-tor, Create an entirely static Tor binary. Requires --static-openssl - --static-libevent and --static-zlib)) + AS_HELP_STRING(--enable-static-tor, Create an entirely static Tor binary. Requires --with-openssl-dir and --with-libevent-dir and --with-zlib-dir)) if test "$enable_static_tor" = "yes"; then enable_static_libevent="yes"; enable_static_openssl="yes"; enable_static_zlib="yes"; - AC_MSG_NOTICE("We're attempting to build a static Tor.") CFLAGS="$CFLAGS -static" fi @@ -527,20 +525,6 @@ else fi AC_SUBST(TOR_ZLIB_LIBS) -if test "$enable_static_tor" = "yes"; then - if test "$enable_static_libevent" = "no"; then - AC_MSG_ERROR("You must configure with --enable-static-libevent") - fi - if test "$enable_static_openssl" = "no"; then - AC_MSG_ERROR("You must configure with --enable-static-openssl") - fi - if test "$enable_static_zlib" = "no"; then - AC_MSG_ERROR("You must configure with --enable-static-zlib") - fi - AC_MSG_NOTICE("We're attempting to build a static Tor.") - CFLAGS="$CFLAGS -static" -fi - dnl Make sure to enable support for large off_t if available. |