[libxslt] Detect libm using libtool's macros
- From: Nick Wellnhofer <nwellnhof src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [libxslt] Detect libm using libtool's macros
- Date: Sat, 2 Apr 2022 13:03:17 +0000 (UTC)
commit f2e4f782725eba08bdc35c9869e0121e59d669c9
Author: David Seifert <soap gentoo org>
Date: Sat Apr 2 14:30:17 2022 +0200
Detect libm using libtool's macros
CMakeLists.txt | 4 ++--
configure.ac | 8 ++------
libexslt/Makefile.am | 2 +-
libxslt/Makefile.am | 2 +-
tests/fuzz/Makefile.am | 2 +-
xsltproc/Makefile.am | 2 +-
6 files changed, 8 insertions(+), 12 deletions(-)
---
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 8d9152a1..18867d5d 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -205,7 +205,7 @@ target_link_libraries(LibXslt PUBLIC LibXml2::LibXml2)
if(UNIX)
target_link_libraries(LibXslt PRIVATE m)
- set(M_LIBS "-lm")
+ set(LIBM "-lm")
endif()
set_target_properties(
@@ -445,7 +445,7 @@ set(LIBXSLT_DEFAULT_PLUGINS_PATH "\${libdir}/libxslt-plugins")
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}")
diff --git a/configure.ac b/configure.ac
index d1d6a192..fbf514ab 100644
--- a/configure.ac
+++ b/configure.ac
@@ -84,6 +84,7 @@ AC_PATH_PROG(XSLTPROC, xsltproc, /usr/bin/xsltproc)
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 @@ dnl
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 @@ AC_SUBST(LIBXML_CFLAGS)
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(EXSLT_PRIVATE_LIBS)
AC_SUBST(EXTRA_LIBS)
-AC_SUBST(M_LIBS)
-
dnl for the spec file
RELDATE=`date +'%a %b %e %Y'`
AC_SUBST(RELDATE)
diff --git a/libexslt/Makefile.am b/libexslt/Makefile.am
index c8dae32a..46d4371e 100644
--- a/libexslt/Makefile.am
+++ b/libexslt/Makefile.am
@@ -27,7 +27,7 @@ libexslt_la_SOURCES = \
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
diff --git a/libxslt/Makefile.am b/libxslt/Makefile.am
index 4e1a0a1f..4b131d50 100644
--- a/libxslt/Makefile.am
+++ b/libxslt/Makefile.am
@@ -59,7 +59,7 @@ else
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)
diff --git a/tests/fuzz/Makefile.am b/tests/fuzz/Makefile.am
index 48e3e8cd..2f069c65 100644
--- a/tests/fuzz/Makefile.am
+++ b/tests/fuzz/Makefile.am
@@ -9,7 +9,7 @@ AM_CPPFLAGS = -I$(top_srcdir)
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
diff --git a/xsltproc/Makefile.am b/xsltproc/Makefile.am
index cce3b81c..b4e3f1a9 100644
--- a/xsltproc/Makefile.am
+++ b/xsltproc/Makefile.am
@@ -23,7 +23,7 @@ DEPS = $(top_builddir)/libxslt/libxslt.la \
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)
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]