From: Nick Mathewson Date: Mon, 19 Dec 2011 16:26:50 +0000 (-0500) Subject: Tweak the haiku-support patches X-Git-Tag: tor-0.2.3.11-alpha~80^2~1 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=e535c8a460fb3c1973ec46fe0910bbd21148b475;p=thirdparty%2Ftor.git Tweak the haiku-support patches --- diff --git a/configure.in b/configure.in index d1b7c4441c..1f045f1349 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 e766446d3a..31a464ee7a 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@ \