[tor-commits] [tor/master] Tweak the haiku-support patches

[nickm at torproject.org]

commit e535c8a460fb3c1973ec46fe0910bbd21148b475
Author: Nick Mathewson <nickm at torproject.org>
Date:   Mon Dec 19 11:26:50 2011 -0500

    Tweak the haiku-support patches
---
 configure.in         |    6 +++---
 src/test/Makefile.am |    2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/configure.in b/configure.in
index d1b7c44..1f045f1 100644
--- a/configure.in
+++ b/configure.in
@@ -489,9 +489,9 @@ dnl On some platforms (Haiku/BeOS) the math library is
 dnl part of libroot. In which case don't link against lm
 TOR_LIB_MATH=""
 save_LIBS="$LIBS"
-AC_SEARCH_LIBS(cos, [m], , AC_MSG_ERROR([Could not find libm and libcore does not provide the functions.]))
-if test "$ac_cv_search_cos" != "none required"; then
-    TOR_LIB_MATH="$ac_cv_search_cos"
+AC_SEARCH_LIBS(pow, [m], , AC_MSG_ERROR([Could not find pow in libm or libc.]))
+if test "$ac_cv_search_pow" != "none required"; then
+    TOR_LIB_MATH="$ac_cv_search_pow"
 fi
 LIBS="$save_LIBS"
 AC_SUBST(TOR_LIB_MATH)
diff --git a/src/test/Makefile.am b/src/test/Makefile.am
index e766446..31a464e 100644
--- a/src/test/Makefile.am
+++ b/src/test/Makefile.am
@@ -31,7 +31,7 @@ test_LDFLAGS = @TOR_LDFLAGS_zlib@ @TOR_LDFLAGS_openssl@ \
         @TOR_LDFLAGS_libevent@
 test_LDADD = ../or/libtor.a ../common/libor.a ../common/libor-crypto.a \
 	../common/libor-event.a \
-	@TOR_ZLIB_LIBS@ @TOR_LIB_MATH@ @TOR_LIBEVENT_LIBS@ \ 
+	@TOR_ZLIB_LIBS@ @TOR_LIB_MATH@ @TOR_LIBEVENT_LIBS@ \
 	@TOR_OPENSSL_LIBS@ @TOR_LIB_WS32@ @TOR_LIB_GDI@
 
 bench_LDFLAGS = @TOR_LDFLAGS_zlib@ @TOR_LDFLAGS_openssl@ \