diff options
| author | Nick Mathewson <nickm@torproject.org> | 2016-03-25 16:28:33 -0400 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2016-03-25 16:28:33 -0400 |
| commit | 049445bca33e8578757639fc8a236540fd0fd154 (patch) | |
| tree | bacf87ab89a2811138867ea1ec51713b7559642f | |
| parent | d5f50cb052a535b5193dc14ccfd3239a722943c2 (diff) | |
| parent | db1352703c281fb5de355f76a00c092b52bcafda (diff) | |
| download | tor-049445bca33e8578757639fc8a236540fd0fd154.tar.gz tor-049445bca33e8578757639fc8a236540fd0fd154.zip | |
Merge branch 'bug18626_027'
| -rw-r--r-- | changes/bug18626 | 5 | ||||
| -rw-r--r-- | configure.ac | 9 |
2 files changed, 9 insertions, 5 deletions
diff --git a/changes/bug18626 b/changes/bug18626 new file mode 100644 index 0000000000..5c1abff6b8 --- /dev/null +++ b/changes/bug18626 @@ -0,0 +1,5 @@ + o Minor bugfixes (build): + - Avoid spurious failures from configure files related + to calling exit(0) in TOR_SEARCH_LIBRARY. + Fixes bug 18625; bugfix on 0.2.0.1-alpha. + Patch from "cypherpunks". diff --git a/configure.ac b/configure.ac index df4b9cdc08..d6d65d463c 100644 --- a/configure.ac +++ b/configure.ac @@ -492,19 +492,18 @@ TOR_SEARCH_LIBRARY(libevent, $trylibeventdir, [-levent $STATIC_LIBEVENT_FLAGS $T #ifdef _WIN32 #include <winsock2.h> #endif -#include <stdlib.h> #include <sys/time.h> #include <sys/types.h> #include <event.h>], [ #ifdef _WIN32 #include <winsock2.h> #endif -void exit(int); void *event_init(void);], +void *event_init(void);], [ #ifdef _WIN32 {WSADATA d; WSAStartup(0x101,&d); } #endif -event_init(); exit(0); +event_init(); ], [--with-libevent-dir], [/opt/libevent]) dnl Now check for particular libevent functions. @@ -644,7 +643,7 @@ AC_ARG_WITH(ssl-dir, TOR_SEARCH_LIBRARY(openssl, $tryssldir, [-lssl -lcrypto $TOR_LIB_GDI], [#include <openssl/rand.h>], [void RAND_add(const void *buf, int num, double entropy);], - [RAND_add((void*)0,0,0); exit(0);], [], + [RAND_add((void*)0,0,0);], [], [/usr/local/openssl /usr/lib/openssl /usr/local/ssl /usr/lib/ssl /usr/local /usr/athena /opt/openssl]) dnl XXXX check for OPENSSL_VERSION_NUMBER == SSLeay() @@ -721,7 +720,7 @@ tor_zlib_devpkg_debian="zlib1g-dev" TOR_SEARCH_LIBRARY(zlib, $tryzlibdir, [-lz], [#include <zlib.h>], [const char * zlibVersion(void);], - [zlibVersion(); exit(0);], [--with-zlib-dir], + [zlibVersion();], [--with-zlib-dir], [/opt/zlib]) if test "$enable_static_zlib" = "yes"; then |