[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[no subject]
From: |
Patrice Dumas |
Date: |
Sun, 22 Sep 2024 12:37:46 -0400 (EDT) |
branch: master
commit 1dba9eec406cec2600135cd30e4e5f10ed0035cd
Author: Patrice Dumas <pertusus@free.fr>
AuthorDate: Sun Sep 22 16:52:49 2024 +0200
* tp/Texinfo/XS/configure.ac (perl_conf_PERL_LINK): setup flags to
link against Perl when it is not in perl_conf_LDFLAGS. Not needed in
the default case, but useful to link against Perl explicitly.
---
ChangeLog | 6 ++++++
tp/Texinfo/XS/Makefile.am | 2 ++
tp/Texinfo/XS/configure.ac | 6 ++++++
3 files changed, 14 insertions(+)
diff --git a/ChangeLog b/ChangeLog
index 5447c3ff1b..395ae96394 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2024-09-22 Patrice Dumas <pertusus@free.fr>
+
+ * tp/Texinfo/XS/configure.ac (perl_conf_PERL_LINK): setup flags to
+ link against Perl when it is not in perl_conf_LDFLAGS. Not needed in
+ the default case, but useful to link against Perl explicitly.
+
2024-09-22 Patrice Dumas <pertusus@free.fr>
* tp/Texinfo/Convert/HTML.pm (%css_element_class_styles): use an
diff --git a/tp/Texinfo/XS/Makefile.am b/tp/Texinfo/XS/Makefile.am
index b81b4c2d6b..646afd187e 100644
--- a/tp/Texinfo/XS/Makefile.am
+++ b/tp/Texinfo/XS/Makefile.am
@@ -317,6 +317,8 @@ libtexinfoxs_la_SOURCES= \
libtexinfoxs_la_CPPFLAGS = -I$(srcdir)/main -I$(srcdir)/convert $(AM_CPPFLAGS)
$(XSLIBS_CPPFLAGS)
libtexinfoxs_la_CFLAGS = $(XSLIBS_CFLAGS)
libtexinfoxs_la_LIBADD = libtexinfo.la
+# example to trigger errors associated with no undefined
+# libtexinfoxs_la_LDFLAGS = -version-info 0:0:0 -Wl,--no-undefined
$(perl_conf_LDFLAGS) $(perl_conf_PERL_LINK) $(LTLIBINTL)
libtexinfoxs_la_LDFLAGS = -version-info 0:0:0 $(perl_conf_LDFLAGS) $(LTLIBINTL)
diff --git a/tp/Texinfo/XS/configure.ac b/tp/Texinfo/XS/configure.ac
index f387089b9a..c6ff2bc732 100644
--- a/tp/Texinfo/XS/configure.ac
+++ b/tp/Texinfo/XS/configure.ac
@@ -195,11 +195,17 @@ case "$host" in *-mingw32 | *-mingw64 | *-msdosdjgpp |
*-cygwin )
perl_conf_LDFLAGS="$perl_conf_LDFLAGS -no-undefined -L$PERL_INC
$PERL_CONF_libperl"
# used for shared libraries not linked against Perl.
platform_LDFLAGS='-no-undefined'
+ ;;
+ *)
+ # can be used to explicitly link against Perl when not in perl_conf_LDFLAGS
+ perl_conf_PERL_LINK="-L$PERL_INC $PERL_CONF_libperl"
+ ;;
esac
AC_SUBST([perl_conf_CFLAGS], [$perl_conf_CFLAGS])
AC_SUBST([perl_conf_LDFLAGS], [$perl_conf_LDFLAGS])
AC_SUBST([platform_LDFLAGS], [$platform_LDFLAGS])
+AC_SUBST([perl_conf_PERL_LINK], [$perl_conf_PERL_LINK])
AC_CHECK_FUNCS(newlocale strxfrm_l)