branch master updated: * tp/Texinfo/XS/Makefile.am (libxsutils_la_CPPFLAGS) (libxsutils_la_LIBADD, libtexinfo_la_LIBADD), tp/Texinfo/XS/main/xs_utils.c: include config.h in xs_utils.c as vasprintf may come from Gnulib. Add Gnulib flags and library for libxsutils.la and remove from libtexinfo.la to avoid doubly defined symbols.

[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 4c78d65ee7 * tp/Texinfo/XS/Makefile.am (libxsutils_la_CPPFLAGS) 
(libxsutils_la_LIBADD, libtexinfo_la_LIBADD), tp/Texinfo/XS/main/xs_utils.c: 
include config.h in xs_utils.c as vasprintf may come from Gnulib.  Add Gnulib 
flags and library for libxsutils.la and remove from libtexinfo.la to avoid 
doubly defined symbols.
4c78d65ee7 is described below

commit 4c78d65ee740fac4f4cac43b595cf1dd6a0c8b34
Author: Patrice Dumas <pertusus@free.fr>
AuthorDate: Fri Nov 15 13:56:23 2024 +0100

    * tp/Texinfo/XS/Makefile.am (libxsutils_la_CPPFLAGS)
    (libxsutils_la_LIBADD, libtexinfo_la_LIBADD),
    tp/Texinfo/XS/main/xs_utils.c: include config.h in xs_utils.c as
    vasprintf may come from Gnulib.  Add Gnulib flags and library for
    libxsutils.la and remove from libtexinfo.la to avoid doubly defined
    symbols.
---
 ChangeLog                     | 9 +++++++++
 tp/Texinfo/XS/Makefile.am     | 5 ++++-
 tp/Texinfo/XS/main/xs_utils.c | 3 +++
 3 files changed, 16 insertions(+), 1 deletion(-)

diff --git a/ChangeLog b/ChangeLog
index a608fb7855..0e3aafd2fc 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+2024-11-15  Patrice Dumas  <pertusus@free.fr>
+
+       * tp/Texinfo/XS/Makefile.am (libxsutils_la_CPPFLAGS)
+       (libxsutils_la_LIBADD, libtexinfo_la_LIBADD),
+       tp/Texinfo/XS/main/xs_utils.c: include config.h in xs_utils.c as
+       vasprintf may come from Gnulib.  Add Gnulib flags and library for
+       libxsutils.la and remove from libtexinfo.la to avoid doubly defined
+       symbols.
+
 2024-11-14  Patrice Dumas  <pertusus@free.fr>
 
        * tp/Texinfo/XS/main/build_perl_info.c,
diff --git a/tp/Texinfo/XS/Makefile.am b/tp/Texinfo/XS/Makefile.am
index ac6a47a439..154bca5853 100644
--- a/tp/Texinfo/XS/Makefile.am
+++ b/tp/Texinfo/XS/Makefile.am
@@ -122,6 +122,9 @@ libxsutils_la_SOURCES = \
                main/xs_utils.c \
                main/xs_utils.h
 
+libxsutils_la_CPPFLAGS = $(AM_CPPFLAGS) $(GNULIB_CPPFLAGS)
+libxsutils_la_LIBADD = $(top_builddir)/gnulib/lib/libgnu.la
+
 ########################## shared common library and parser library
 
 if HAVE_ICONV
@@ -267,7 +270,7 @@ libxs_in_libtexinfo_la_LDFLAGS = $(perl_conf_LDFLAGS)
 
 # locate include files under out-of-source builds.
 libtexinfo_la_CPPFLAGS = -I$(srcdir)/main -I$(srcdir)/parsetexi $(AM_CPPFLAGS) 
$(GNULIB_CPPFLAGS)
-libtexinfo_la_LIBADD = $(top_builddir)/gnulib/lib/libgnu.la 
libxs_in_libtexinfo.la $(platform_PERL_LIBADD)
+libtexinfo_la_LIBADD = libxs_in_libtexinfo.la $(platform_PERL_LIBADD)
 libtexinfo_la_LDFLAGS = -version-info 0:0:0 $(perl_conf_LDFLAGS) $(LTLIBINTL) 
$(LTLIBICONV) $(LTLIBUNISTRING)
 #libtexinfo_la_LDFLAGS = -version-info 0:0:0 -Wl,--no-undefined 
$(perl_conf_LDFLAGS) $(PERL_LIBS) $(LTLIBINTL) $(LTLIBICONV) $(LTLIBUNISTRING)
 
diff --git a/tp/Texinfo/XS/main/xs_utils.c b/tp/Texinfo/XS/main/xs_utils.c
index 1c57402fbd..bf90b92f1a 100644
--- a/tp/Texinfo/XS/main/xs_utils.c
+++ b/tp/Texinfo/XS/main/xs_utils.c
@@ -13,6 +13,9 @@
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
 
+/* needed for vasprintf which may come from Gnulib */
+#include <config.h>
+
 #include <stdlib.h>
 #include <string.h>
 #include <stdio.h>