diff options
| author | Nick Mathewson <nickm@torproject.org> | 2007-03-04 19:47:53 +0000 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2007-03-04 19:47:53 +0000 |
| commit | 7c671512b81d68b7adc9873a81ed825fb429fc5b (patch) | |
| tree | b22ca8d8c34e3cc54b524added0c261366bf2b52 /acinclude.m4 | |
| parent | 0e44371a337bc4d1154eb65e9b7f2cba96365a13 (diff) | |
| download | tor-7c671512b81d68b7adc9873a81ed825fb429fc5b.tar.gz tor-7c671512b81d68b7adc9873a81ed825fb429fc5b.zip | |
r11612@catbus: nickm | 2007-01-30 18:14:07 -0500
make TOR_SEARCH_LIBRARY work with openssl
svn:r9727
Diffstat (limited to 'acinclude.m4')
| -rw-r--r-- | acinclude.m4 | 14 |
1 files changed, 12 insertions, 2 deletions
diff --git a/acinclude.m4 b/acinclude.m4 index 5e506a3870..249c24fef8 100644 --- a/acinclude.m4 +++ b/acinclude.m4 @@ -4,6 +4,16 @@ 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 @@ -22,7 +32,7 @@ dnl Look for a library, and its associated includes, and how to link dnl against it. dnl dnl TOR_SEARCH_LIBRARY(libname, withlocation, linkargs, headers, prototype, -dnl code, optionname) +dnl code, optionname, searchextra) AC_DEFUN([TOR_SEARCH_LIBRARY], [ tor_saved_LIBS="$LIBS" @@ -32,7 +42,7 @@ 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; do + for tor_trydir in "$2" "(system)" "$prefix" /usr/local /usr/pkg $8; do LDFLAGS="$tor_saved_LDFLAGS" LIBS="$tor_saved_LIBS $3" CPPFLAGS="$tor_saved_CPPFLAGS" |