diff options
| author | Nick Mathewson <nickm@torproject.org> | 2011-12-19 11:26:50 -0500 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2011-12-19 11:27:08 -0500 |
| commit | e535c8a460fb3c1973ec46fe0910bbd21148b475 (patch) | |
| tree | ca237c564d259a50d4164eb59dc373811b106c20 | |
| parent | d5e964731c009589952be246d80d4114f65d5ee2 (diff) | |
| download | tor-e535c8a460fb3c1973ec46fe0910bbd21148b475.tar.gz tor-e535c8a460fb3c1973ec46fe0910bbd21148b475.zip | |
Tweak the haiku-support patches
| -rw-r--r-- | configure.in | 6 | ||||
| -rw-r--r-- | src/test/Makefile.am | 2 |
2 files changed, 4 insertions, 4 deletions
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@ \ |