lib/libxslt
1
0
Fork 0
mirror of https://gitlab.gnome.org/GNOME/libxslt synced 2025-07-31 02:43:06 +03:00
Code Activity

Detect libm using libtool's macros

Browse Source
This commit is contained in:
David Seifert
2022-04-02 14:30:17 +02:00
parent bd60e9c33b
commit f2e4f78272
6 changed files with 8 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
CMakeLists.txt
View File

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

8
configure.ac
View File

@ -84,6 +84,7 @@ AC_PATH_PROG(XSLTPROC, xsltproc, /usr/bin/xsltproc)
PKG_PROG_PKG_CONFIG PKG_PROG_PKG_CONFIG
LT_INIT([disable-static win32-dll]) LT_INIT([disable-static win32-dll])
LT_LIB_M
AC_CHECK_HEADERS(sys/types.h sys/time.h unistd.h) 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_HEADERS(sys/timeb.h sys/stat.h sys/select.h)
AC_CHECK_FUNCS(stat _stat) 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(gettimeofday)
AC_CHECK_FUNCS(localtime_r gmtime_r ftime) AC_CHECK_FUNCS(localtime_r gmtime_r ftime)
@ -516,7 +514,7 @@ AC_SUBST(LIBXML_CFLAGS)
XSLT_LIBDIR='-L${libdir}' XSLT_LIBDIR='-L${libdir}'
XSLT_INCLUDEDIR='-I${includedir}' XSLT_INCLUDEDIR='-I${includedir}'
XSLT_LIBS="-lxslt $LIBXML_LIBS" XSLT_LIBS="-lxslt $LIBXML_LIBS"
XSLT_PRIVATE_LIBS="$M_LIBS" XSLT_PRIVATE_LIBS="$LIBM"
AC_SUBST(XSLT_LIBDIR) AC_SUBST(XSLT_LIBDIR)
AC_SUBST(XSLT_INCLUDEDIR) AC_SUBST(XSLT_INCLUDEDIR)
AC_SUBST(XSLT_LIBS) AC_SUBST(XSLT_LIBS)
@ -531,8 +529,6 @@ AC_SUBST(EXSLT_PRIVATE_LIBS)
AC_SUBST(EXTRA_LIBS) AC_SUBST(EXTRA_LIBS)
AC_SUBST(M_LIBS)
dnl for the spec file dnl for the spec file
RELDATE=`date +'%a %b %e %Y'` RELDATE=`date +'%a %b %e %Y'`
AC_SUBST(RELDATE) AC_SUBST(RELDATE)

2
libexslt/Makefile.am
View File

@ -27,7 +27,7 @@ libexslt_la_SOURCES = \
libexslt.h \ libexslt.h \
dynamic.c 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) libexslt_la_LDFLAGS = -version-info $(LIBEXSLT_VERSION_INFO)
man_MANS = libexslt.3 man_MANS = libexslt.3

2
libxslt/Makefile.am
View File

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

2
tests/fuzz/Makefile.am
View File

@ -9,7 +9,7 @@ AM_CPPFLAGS = -I$(top_srcdir)
AM_CFLAGS = $(LIBXML_CFLAGS) AM_CFLAGS = $(LIBXML_CFLAGS)
DEPENDENCIES = $(LIBXSLT_LIBS) DEPENDENCIES = $(LIBXSLT_LIBS)
LDADD = $(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_SOURCES = xpath.c fuzz.c fuzz.h
xpath_LDFLAGS = -fsanitize=fuzzer xpath_LDFLAGS = -fsanitize=fuzzer

2
xsltproc/Makefile.am
View File

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