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

Add missing compile definition for static builds to Autotools

Browse Source 
Related to eaa53788 and 29923816

Closes #73
This commit is contained in:
Mike Dalessio
2022-08-20 10:28:06 -04:00
parent bcd17763a9
commit 3f3e888f1a
7 changed files with 21 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
configure.ac
View File

@ -505,6 +505,21 @@ AC_SUBST(XSLT_INCLUDEDIR)
AC_SUBST(XSLT_LIBS)
AC_SUBST(XSLT_PRIVATE_LIBS)
LIBXSLT_CFLAGS=""
case ${host} in
*-*-mingw* | *-*-cygwin* | *-*-msvc* )
# If the host is Windows, and shared libraries are disabled, we
# need to add -DLIBXML_STATIC to EXTRA_CFLAGS in order for linking to
# work properly (without it, xmlexports.h would force the use of
# DLL imports, which obviously aren't present in a static
# library).
if test "x$enable_shared" = "xno"; then
LIBXSLT_CFLAGS="$LIBXSLT_CFLAGS -DLIBXSLT_STATIC -DLIBEXSLT_STATIC"
fi
;;
esac
AC_SUBST(LIBXSLT_CFLAGS)
EXSLT_LIBDIR='-L${libdir}'
EXSLT_INCLUDEDIR='-I${includedir}'
EXSLT_PRIVATE_LIBS="$XSLT_PRIVATE_LIBS $LIBGCRYPT_LIBS"

2
libexslt/Makefile.am
View File

@ -2,7 +2,7 @@ AM_CPPFLAGS = -I$(top_srcdir) -I$(top_srcdir)/libxslt -I$(top_srcdir)/libexslt \
-I$(top_builddir) -I$(top_builddir)/libxslt \
-I$(top_builddir)/libexslt
AM_CFLAGS = $(LIBGCRYPT_CFLAGS) $(LIBXML_CFLAGS)
AM_CFLAGS = $(LIBGCRYPT_CFLAGS) $(LIBXML_CFLAGS) $(LIBXSLT_CFLAGS)
lib_LTLIBRARIES = libexslt.la

2
libxslt/Makefile.am
View File

@ -1,6 +1,6 @@
AM_CPPFLAGS = -I$(top_srcdir) -I$(top_srcdir)/libxslt
AM_CFLAGS = $(LIBXML_CFLAGS)
AM_CFLAGS = $(LIBXML_CFLAGS) $(LIBXSLT_CFLAGS)
lib_LTLIBRARIES = libxslt.la

2
python/Makefile.am
View File

@ -19,7 +19,7 @@ libxsltmod_la_CPPFLAGS = \
-I$(top_srcdir)/libxslt \
-I$(top_srcdir) \
-I../libexslt \
$(PYTHON_CFLAGS) $(LIBXML_CFLAGS)
$(PYTHON_CFLAGS) $(LIBXML_CFLAGS) $(LIBXSLT_CFLAGS)
libxsltmod_la_SOURCES = libxslt.c types.c
nodist_libxsltmod_la_SOURCES = libxslt-py.c
libxsltmod_la_LIBADD = \

2
tests/fuzz/Makefile.am
View File

@ -6,7 +6,7 @@ check_PROGRAMS = testTargets
EXTRA_DIST = xpath.dict xpath.xml xslt.dict xslt.xml seed
CLEANFILES = $(EXTRA_PROGRAMS)
AM_CPPFLAGS = -I$(top_srcdir)
AM_CFLAGS = $(LIBXML_CFLAGS)
AM_CFLAGS = $(LIBXML_CFLAGS) $(LIBXSLT_CFLAGS)
DEPENDENCIES = $(LIBXSLT_LIBS)
LDADD = $(LIBXSLT_LIBS) \
$(LIBXML_LIBS) $(EXTRA_LIBS) $(LIBM)

2
xslt-config.in
View File

@ -74,7 +74,7 @@ while test $# -gt 0; do
;;
--cflags)
cflags="@LIBXML_CFLAGS@"
cflags="@LIBXML_CFLAGS@ @LIBXSLT_CFLAGS@"
if test "$includedir" != "/usr/include"; then
cflags="$cflags @XSLT_INCLUDEDIR@"
fi

2
xsltproc/Makefile.am
View File

@ -7,7 +7,7 @@ bin_PROGRAMS = xsltproc
noinst_PROGRAMS=testThreads
AM_CFLAGS = $(LIBGCRYPT_CFLAGS) $(LIBXML_CFLAGS)
AM_CFLAGS = $(LIBGCRYPT_CFLAGS) $(LIBXML_CFLAGS) $(LIBXSLT_CFLAGS)
xsltproc_SOURCES = xsltproc.c
xsltproc_LDFLAGS =