Tweak the haiku-support patches

diff --git a/configure.in b/configure.in
index d1b7c4441ce6e83aaf37346f37970ccc6ad495fe..1f045f1349fb006e96471c06c2cfa3c88effe20b 100644 (file)
--- 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 e766446d3a681229a133723cd962b6bca12dc3e8..31a464ee7ad2ba7edd4829f462de89c2d9011b98 100644 (file)
--- 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@ \