diff options
author | João Valverde <joao.valverde@tecnico.ulisboa.pt> | 2016-03-24 05:01:57 +0000 |
---|---|---|
committer | João Valverde <j@v6e.pt> | 2016-04-04 22:04:03 +0000 |
commit | be96c3d64c9d5838e7319d5dd4a2ecd45897a024 (patch) | |
tree | ccd8c3c80a77ad1c70cb5aeab36e31a8239989b4 | |
parent | cc82687093c572af1cfb8ceab0abbb3ba4e36660 (diff) |
autotools: Clean up libm tests
Change-Id: I01bef4d6c2cf2280935d573166652d905948028d
Reviewed-on: https://code.wireshark.org/review/14806
Reviewed-by: João Valverde <j@v6e.pt>
-rw-r--r-- | configure.ac | 25 | ||||
-rw-r--r-- | epan/Makefile.am | 3 | ||||
-rw-r--r-- | wsutil/Makefile.am | 7 |
3 files changed, 14 insertions, 21 deletions
diff --git a/configure.ac b/configure.ac index b83db53280..34fc4a52bf 100644 --- a/configure.ac +++ b/configure.ac @@ -529,22 +529,15 @@ AC_SUBST(OSX_MIN_VERSION) AC_SYS_LARGEFILE # -# Look for math functions; use libm if necessary. -# -AC_SEARCH_LIBS(floor, m) -AC_SEARCH_LIBS(ceil, m) -AC_SEARCH_LIBS(exp, m) -AC_SEARCH_LIBS(log, m) -AC_SEARCH_LIBS(log10, m) -AC_SEARCH_LIBS(floorl, m, - [ - FLOORL_LO="" - AC_DEFINE(HAVE_FLOORL, 1, [Define if you have the floorl function.]) - ], - FLOORL_LO="floorl.lo") -AC_SUBST(FLOORL_LO) -AC_SEARCH_LIBS(lrint, m, - [AC_DEFINE(HAVE_LRINT, 1, [Define if you have the 'lrint' function.])]) +# Check if we need to link with libm +# +AC_SEARCH_LIBS([cos], [m]) + +# +# Check for C99 math functions. +# +AC_CHECK_FUNCS([floorl lrint]) +AM_CONDITIONAL([HAVE_FLOORL], [test "x$ac_cv_func_floorl" = xyes]) # # Check if we need to link with -lnsl and -lsocket diff --git a/epan/Makefile.am b/epan/Makefile.am index 66270fe8bc..25c4eec0f5 100644 --- a/epan/Makefile.am +++ b/epan/Makefile.am @@ -143,8 +143,7 @@ libwireshark_la_LIBADD = \ @SSL_LIBS@ \ @LIBSMI_LDFLAGS@ \ @GEOIP_LIBS@ \ - @GLIB_LIBS@ \ - -lm + @GLIB_LIBS@ libwireshark_la_DEPENDENCIES = \ libwireshark_generated.la \ diff --git a/wsutil/Makefile.am b/wsutil/Makefile.am index c69b9bc3c6..6a50a89453 100644 --- a/wsutil/Makefile.am +++ b/wsutil/Makefile.am @@ -43,7 +43,6 @@ libwsutil_abi_INCLUDES = \ # Optional objects that I know how to build. These will be # linked into libwsutil if necessary. wsutil_optional_objects = \ - @FLOORL_LO@ \ @GETOPT_LO@ \ @INET_ATON_LO@ \ @INET_NTOP_LO@ \ @@ -73,14 +72,16 @@ libwsutil_la_SOURCES = \ $(LIBWSUTIL_SRC) \ $(LIBWSUTIL_INCLUDES) +if !HAVE_FLOORL +libwsutil_la_SOURCES += floorl.c floorl.h +endif + libwsutil_sse42_la_SOURCES = \ ws_mempbrk_sse42.c libwsutil_sse42_la_CFLAGS = $(AM_CFLAGS) $(CFLAGS_SSE42) EXTRA_libwsutil_la_SOURCES = \ - floorl.c \ - floorl.h \ inet_aton.c \ inet_aton.h \ inet_ntop.c \ |