branch master updated: * tp/Texinfo/XS/Makefile.am: add teximakehtml_LDFLAGS. Set explicitely teximakehtml_LINK to link with C++ only if TXI_HAVE_CXX_HASHMAP is set.

[Patrice Dumas]

This is an automated email from the git hooks/post-receive script.

pertusus pushed a commit to branch master
in repository texinfo.

The following commit(s) were added to refs/heads/master by this push:
     new 79433fcad3 * tp/Texinfo/XS/Makefile.am: add teximakehtml_LDFLAGS.  Set 
explicitely teximakehtml_LINK to link with C++ only if TXI_HAVE_CXX_HASHMAP is 
set.
79433fcad3 is described below

commit 79433fcad321bf434d8d5f416c43d91000bfff23
Author: Patrice Dumas <pertusus@free.fr>
AuthorDate: Sat Oct 5 22:31:03 2024 +0200

    * tp/Texinfo/XS/Makefile.am: add teximakehtml_LDFLAGS.  Set
    explicitely teximakehtml_LINK to link with C++ only if
    TXI_HAVE_CXX_HASHMAP is set.
---
 ChangeLog                 |  6 ++++++
 tp/Texinfo/XS/Makefile.am | 10 ++++++----
 2 files changed, 12 insertions(+), 4 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 8b40d430ae..355016aeeb 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -3,6 +3,12 @@
        * js/info.js: Exdent entire body of file (except inside a string
        constant) in attempt to make nested functions more apparent.
 
+2024-10-05  Patrice Dumas  <pertusus@free.fr>
+
+       * tp/Texinfo/XS/Makefile.am: add teximakehtml_LDFLAGS.  Set
+       explicitely teximakehtml_LINK to link with C++ only if
+       TXI_HAVE_CXX_HASHMAP is set.
+
 2024-10-05  Patrice Dumas  <pertusus@free.fr>
 
        * tp/Texinfo/XS/convert/call_html_cxx_function.cpp,
diff --git a/tp/Texinfo/XS/Makefile.am b/tp/Texinfo/XS/Makefile.am
index f9756c22aa..a96ccb820b 100644
--- a/tp/Texinfo/XS/Makefile.am
+++ b/tp/Texinfo/XS/Makefile.am
@@ -546,18 +546,20 @@ teximakehtml_SOURCES = \
                        main/replace_perl_api_call.c \
                        convert/replace_perl_call_html_function.c
 
+teximakehtml_LDADD = $(top_builddir)/gnulib/lib/libgnu.la
+teximakehtml_LDFLAGS = $(EUIDACCESS_LIBGEN) $(LTLIBINTL) $(LTLIBICONV) 
$(LTLIBUNISTRING)
+
 if TXI_HAVE_CXX_HASHMAP
 teximakehtml_SOURCES += convert/call_html_cxx_function.cpp \
                         convert/call_html_cxx_function.h
 TXI_CXX_CPPFLAGS = -DHAVE_CXX_HASHMAP=1
+teximakehtml_LINK = $(CXXLINK) $(teximakehtml_CXXFLAGS) $(teximakehtml_LDFLAGS)
 else
 EXTRA_DIST += convert/call_html_cxx_function.cpp \
               convert/call_html_cxx_function.h
 TXI_CXX_CPPFLAGS = 
+teximakehtml_LINK = $(LINK) $(teximakehtml_CFLAGS) $(teximakehtml_LDFLAGS)
 endif
 
-teximakehtml_CPPFLAGS = -save-temps -I$(srcdir)/parsetexi -I$(srcdir)/convert 
-I$(srcdir)/main -I$(srcdir)/structuring_transfo $(TXI_CXX_CPPFLAGS) 
$(AM_CPPFLAGS) $(GNULIB_CPPFLAGS)
-#teximakehtml_LDADD = libtexinfo.la libtexinfo-convert.la 
$(top_builddir)/gnulib/lib/libgnu.la
-teximakehtml_LDADD = $(top_builddir)/gnulib/lib/libgnu.la
-
+teximakehtml_CPPFLAGS = -I$(srcdir)/parsetexi -I$(srcdir)/convert 
-I$(srcdir)/main -I$(srcdir)/structuring_transfo $(TXI_CXX_CPPFLAGS) 
$(AM_CPPFLAGS) $(GNULIB_CPPFLAGS)