Detect libm using libtool's macros

CMakeLists.txt

@@ -205,7 +205,7 @@
 
 if(UNIX)
 	target_link_libraries(LibXslt PRIVATE m)
-	set(M_LIBS "-lm")
+	set(LIBM "-lm")
 endif()
 
 set_target_properties(
@@ -445,7 +445,7 @@
 set(XSLT_INCLUDEDIR "-I\${includedir}")
 set(XSLT_LIBDIR "-L\${libdir}")
 set(XSLT_LIBS "-lxslt -lxml2")
-set(XSLT_PRIVATE_LIBS "${M_LIBS}")
+set(XSLT_PRIVATE_LIBS "${LIBM}")
 
 set(EXSLT_INCLUDEDIR "-I\${includedir}")
 set(EXSLT_LIBDIR "-L\${libdir}")

configure.ac

@@ -84,6 +84,7 @@
 PKG_PROG_PKG_CONFIG
 
 LT_INIT([disable-static win32-dll])
+LT_LIB_M
 
 
 AC_CHECK_HEADERS(sys/types.h sys/time.h unistd.h)
@@ -134,9 +135,6 @@
 
 AC_CHECK_HEADERS(sys/timeb.h sys/stat.h sys/select.h)
 AC_CHECK_FUNCS(stat _stat)
-AC_CHECK_LIB(m, pow, [M_LIBS="-lm"])
-AC_CHECK_LIB(m, floor, [M_LIBS="-lm"])
-AC_CHECK_LIB(m, fabs, [M_LIBS="-lm"])
 
 AC_CHECK_FUNCS(gettimeofday)
 AC_CHECK_FUNCS(localtime_r gmtime_r ftime)
@@ -516,7 +514,7 @@
 XSLT_LIBDIR='-L${libdir}'
 XSLT_INCLUDEDIR='-I${includedir}'
 XSLT_LIBS="-lxslt $LIBXML_LIBS"
-XSLT_PRIVATE_LIBS="$M_LIBS"
+XSLT_PRIVATE_LIBS="$LIBM"
 AC_SUBST(XSLT_LIBDIR)
 AC_SUBST(XSLT_INCLUDEDIR)
 AC_SUBST(XSLT_LIBS)
@@ -531,8 +529,6 @@
 
 AC_SUBST(EXTRA_LIBS)
 
-AC_SUBST(M_LIBS)
-
 dnl for the spec file
 RELDATE=`date +'%a %b %e %Y'`
 AC_SUBST(RELDATE)

libexslt/Makefile.am

@@ -27,7 +27,7 @@
 	libexslt.h			\
 	dynamic.c
 
-libexslt_la_LIBADD = $(top_builddir)/libxslt/libxslt.la $(LIBXML_LIBS) $(EXTRA_LIBS) $(LIBGCRYPT_LIBS) $(M_LIBS)
+libexslt_la_LIBADD = $(top_builddir)/libxslt/libxslt.la $(LIBXML_LIBS) $(EXTRA_LIBS) $(LIBGCRYPT_LIBS) $(LIBM)
 libexslt_la_LDFLAGS = -version-info $(LIBEXSLT_VERSION_INFO)
 
 man_MANS = libexslt.3

libxslt/Makefile.am

@@ -59,7 +59,7 @@
 LIBXSLT_VERSION_SCRIPT =
 endif
 
-libxslt_la_LIBADD = $(LIBXML_LIBS) $(EXTRA_LIBS) $(M_LIBS)
+libxslt_la_LIBADD = $(LIBXML_LIBS) $(EXTRA_LIBS) $(LIBM)
 libxslt_la_LDFLAGS =					\
 		$(LIBXSLT_VERSION_SCRIPT)		\
 		-version-info $(LIBXSLT_VERSION_INFO)

tests/fuzz/Makefile.am

@@ -9,7 +9,7 @@
 AM_CFLAGS = $(LIBXML_CFLAGS)
 DEPENDENCIES = $(LIBXSLT_LIBS)
 LDADD = $(LIBXSLT_LIBS) \
-        $(LIBGCRYPT_LIBS) $(LIBXML_LIBS) $(EXTRA_LIBS) $(M_LIBS)
+        $(LIBGCRYPT_LIBS) $(LIBXML_LIBS) $(EXTRA_LIBS) $(LIBM)
 
 xpath_SOURCES = xpath.c fuzz.c fuzz.h
 xpath_LDFLAGS = -fsanitize=fuzzer

xsltproc/Makefile.am

@@ -23,7 +23,7 @@
 
 LDADDS = $(top_builddir)/libxslt/libxslt.la \
          $(top_builddir)/libexslt/libexslt.la \
-	$(LIBXML_LIBS) $(EXTRA_LIBS) $(M_LIBS)
+	$(LIBXML_LIBS) $(EXTRA_LIBS) $(LIBM)
 
 xsltproc_LDADD = $(LIBGCRYPT_LIBS) $(LDADDS)