Commit c9e2766e authored by Nick Mathewson's avatar Nick Mathewson 🎨
Browse files

r12461@Kushana: nickm | 2007-03-06 13:26:17 -0500

 More autoconf fixes and updates. Maybe the bsd buildbots will be happy again.


svn:r9747
parent 754811fb
......@@ -31,8 +31,9 @@ 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(libname, withlocation, linkargs, headers, prototype,
dnl code, optionname, searchextra)
dnl TOR_SEARCH_LIBRARY(1:libname, 2:withlocation, 3:linkargs, 4:headers,
dnl 5:prototype,
dnl 6:code, 7:optionname, 8:searchextra)
AC_DEFUN([TOR_SEARCH_LIBRARY], [
tor_saved_LIBS="$LIBS"
......@@ -87,7 +88,7 @@ AC_CACHE_CHECK([for $1 directory], tor_cv_library_$1_dir, [
fi
LDFLAGS="$tor_saved_LDFLAGS"
LIBS="$tor_saved_LIBS $3"
LIBS="$tor_saved_LIBS"
CPPFLAGS="$tor_saved_CPPFLAGS"
]) dnl end cache check
......@@ -104,11 +105,11 @@ if test -z "$CROSS_COMPILE"; then
runs=no
linked_with=nothing
for tor_tryextra in "(none)" "-Wl,-R$tor_trydir" "-R$tor_trydir" \
"-Wl,-rpath,$le_libdir" ; do
"-Wl,-rpath,$tor_trydir" ; do
if test "$tor_tryextra" = "(none)"; then
LDFLAGS="$saved_LDFLAGS"
LDFLAGS="$tor_saved_LDFLAGS"
else
LDFLAGS="$tor_tryextra $saved_LDFLAGS"
LDFLAGS="$tor_tryextra $tor_saved_LDFLAGS"
fi
AC_RUN_IFELSE(AC_LANG_PROGRAM([$5], [$6]),
[runnable=yes], [runnable=no])
......@@ -121,7 +122,8 @@ if test -z "$CROSS_COMPILE"; then
if test "$runnable" = no; then
AC_MSG_ERROR([Found linkable $1 in $tor_cv_library_$1_dir, but it does not seem to run, even with -R. Maybe specify another using $7}])
fi
]) dnl check for extra options.
LDFLAGS="$tor_saved_LDFLAGS"
]) dnl end cache check check for extra options.
if test "$tor_cv_library_$1_linker_option" != "(none)" ; then
LDFLAGS="$tor_cv_library_$1_linker_option $LDFLAGS"
......
......@@ -199,9 +199,10 @@ else
fi
TOR_SEARCH_LIBRARY(libevent, $trylibeventdir, [-levent $WS32lib], [
#include <stdlib.h>
#include <sys/time.h>
#include <sys/types.h>
#include <event.h>], [void *event_init(void);],
#include <event.h>], [void exit(int); void *event_init(void);],
[event_init(); exit(0);], [--with-libevent-dir], [/opt/libevent])
dnl Now check for particular libevent functions.
......
......@@ -13,7 +13,7 @@ tor_SOURCES = buffers.c circuitbuild.c circuitlist.c \
eventdns.c \
tor_main.c
tor_LDADD = ../common/libor.a ../common/libor-crypto.a -lz -lssl -lcrypto
tor_LDADD = ../common/libor.a ../common/libor-crypto.a -lz
test_SOURCES = buffers.c circuitbuild.c circuitlist.c \
circuituse.c command.c config.c \
......@@ -24,7 +24,7 @@ test_SOURCES = buffers.c circuitbuild.c circuitlist.c \
eventdns.c \
test.c
test_LDADD = ../common/libor.a ../common/libor-crypto.a -lz -lssl -lcrypto
test_LDADD = ../common/libor.a ../common/libor-crypto.a -lz
noinst_HEADERS = or.h eventdns.h eventdns_tor.h
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment