diff options
| -rw-r--r-- | acinclude.m4 | 22 | ||||
| -rw-r--r-- | configure.in | 13 | ||||
| -rw-r--r-- | doc/TODO | 5 | ||||
| -rw-r--r-- | src/or/or.h | 4 |
4 files changed, 9 insertions, 35 deletions
diff --git a/acinclude.m4 b/acinclude.m4 index 281af84f99..31814c0297 100644 --- a/acinclude.m4 +++ b/acinclude.m4 @@ -4,16 +4,6 @@ dnl Copyright (c) 2001-2004, Roger Dingledine dnl Copyright (c) 2004-2007, Roger Dingledine, Nick Mathewson dnl See LICENSE for licensing information -dnl TODO -dnl - Stop requiring gethostbyname_r entirely when we're building with -dnl eventdns? -dnl - Remove redundant event.h check. -dnl - Make the "no longe strictly accurate" message accurate. -dnl - Tell the user what -dev package to install based on OS. -dnl - Detect correct version of library. -dnl - After merge: -dnl Run autoupdate - AC_DEFUN([TOR_EXTEND_CODEPATH], [ if test -d "$1/lib"; then @@ -30,8 +20,8 @@ AC_DEFUN([TOR_EXTEND_CODEPATH], dnl Look for a library, and its associated includes, and how to link dnl against it. -dnl -dnl TOR_SEARCH_LIBRARY(1:libname, 2:withlocation, 3:linkargs, 4:headers, +dnl +dnl TOR_SEARCH_LIBRARY(1:libname, 2:withlocation, 3:linkargs, 4:headers, dnl 5:prototype, dnl 6:code, 7:optionname, 8:searchextra) @@ -42,7 +32,7 @@ tor_saved_CPPFLAGS="$CPPFLAGS" AC_CACHE_CHECK([for $1 directory], tor_cv_library_$1_dir, [ tor_$1_dir_found=no tor_$1_any_linkable=no - + for tor_trydir in "$2" "(system)" "$prefix" /usr/local /usr/pkg $8; do LDFLAGS="$tor_saved_LDFLAGS" LIBS="$tor_saved_LIBS $3" @@ -63,12 +53,14 @@ AC_CACHE_CHECK([for $1 directory], tor_cv_library_$1_dir, [ TOR_EXTEND_CODEPATH($tor_trydir) fi - # Can we link against (but not necessarily compile) the binary? + # Can we link against (but not necessarily run, or find the headers for) + # the binary? AC_LINK_IFELSE(AC_LANG_PROGRAM([$5], [$6]), [linkable=yes], [linkable=no]) if test $linkable = yes; then tor_$1_any_linkable=yes + # Okay, we can link against it. Can we find the headers? AC_COMPILE_IFELSE(AC_LANG_PROGRAM([$4], [$6]), [buildable=yes], [buildable=no]) if test $buildable = yes; then @@ -132,5 +124,3 @@ fi # cross-compile ]) dnl end defun -#XXXX Check for right version -#XXXX accept list of search paths as options diff --git a/configure.in b/configure.in index acc5bc02c8..f0aebe0ea3 100644 --- a/configure.in +++ b/configure.in @@ -229,19 +229,6 @@ AC_CHECK_HEADERS(unistd.h string.h signal.h ctype.h sys/stat.h sys/types.h fcntl AC_CHECK_HEADERS(netdb.h sys/ioctl.h sys/socket.h arpa/inet.h netinet/in.h pwd.h grp.h) -AC_CHECK_HEADERS(event.h, , AC_MSG_ERROR(Libevent header (event.h) not found. Tor requires libevent to build.), -[#ifdef HAVE_SYS_TYPES_H -#include <sys/types.h> -#endif -#ifdef HAVE_SYS_TIME_H -#include <sys/time.h> -#else - struct timeval { - long tv_sec; - long tv_usec; - }; -#endif]) - AC_CHECK_HEADERS(zlib.h, , AC_MSG_ERROR(Zlib header (zlib.h) not found. Tor requires zlib to build. You may need to install a zlib development package.)) dnl These headers are not essential @@ -84,10 +84,11 @@ Things we'd like to do in 0.2.0.x: - Implement TLS shutdown properly when possible. - Maybe move NT services into their own module. - Autoconf cleanups and improvements: - - Remove redundant event.h check. + o Remove redundant event.h check. + - Check for zlib with the same machinery as for libevent and openssl. - Make the "no longer strictly accurate" message accurate. - Tell the user what -dev package to install based on OS. - - Detect correct version of library. + - Detect correct version of libraries. o Run autoupdate - Refactor networkstatus generation: - Use networkstatus_getinfo_helper_single() as base of diff --git a/src/or/or.h b/src/or/or.h index 4af9e05c02..ffb173136b 100644 --- a/src/or/or.h +++ b/src/or/or.h @@ -113,11 +113,7 @@ #define snprintf _snprintf #endif -#ifdef HAVE_EVENT_H #include <event.h> -#else -#error "Tor requires libevent to build." -#endif #include "../common/crypto.h" #include "../common/tortls.h" |