[no subject]

[Patrice Dumas]

branch: master
commit 8231a4fd481977d213c27ca69f30796b6fd4ec16
Author: Patrice Dumas <pertusus@free.fr>
AuthorDate: Sat Nov 16 00:01:02 2024 +0100

    * tp/Texinfo/XS/Makefile.am (XS_libtexinfo_convert_sources)
    (noinst_LTLIBRARIES, libxs_in_libtexinfo_convert_la_SOURCES)
    (libxs_in_libtexinfo_convert_la_CPPFLAGS)
    (libxs_in_libtexinfo_convert_la_CFLAGS)
    (libxs_in_libtexinfo_convert_la_LIBADD)
    (libxs_in_libtexinfo_convert_la_LDFLAGS)
    (libtexinfo_convert_la_LIBADD): add the libxs_in_libtexinfo_convert.la
    convenience internal library to be able to compile the C code calling
    Perl from libtexinfo_convert code with different flags, to avoid
    Gnulib flags.
    
    * tp/Texinfo/XS/convert/build_html_perl_state.c,
    tp/Texinfo/XS/convert/call_html_perl_function.c: remove config.h
    include, there is no use of Gnulib functions nor use of autoconf
    defines in the Perl C codes.
---
 ChangeLog                                       | 18 ++++++++++++++++++
 tp/Texinfo/XS/Makefile.am                       | 24 ++++++++++++++++++------
 tp/Texinfo/XS/convert/build_html_perl_state.c   |  6 ------
 tp/Texinfo/XS/convert/call_html_perl_function.c |  6 ------
 4 files changed, 36 insertions(+), 18 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index a8ea27e9f6..b923abe7fa 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -17,6 +17,24 @@
        Remove use of LONG_TESTS variable (same change made in
        tp/tests/Makefile.am on 2016-10-23 but this file was missed).
 
+2024-11-15  Patrice Dumas  <pertusus@free.fr>
+
+       * tp/Texinfo/XS/Makefile.am (XS_libtexinfo_convert_sources)
+       (noinst_LTLIBRARIES, libxs_in_libtexinfo_convert_la_SOURCES)
+       (libxs_in_libtexinfo_convert_la_CPPFLAGS)
+       (libxs_in_libtexinfo_convert_la_CFLAGS)
+       (libxs_in_libtexinfo_convert_la_LIBADD)
+       (libxs_in_libtexinfo_convert_la_LDFLAGS)
+       (libtexinfo_convert_la_LIBADD): add the libxs_in_libtexinfo_convert.la
+       convenience internal library to be able to compile the C code calling
+       Perl from libtexinfo_convert code with different flags, to avoid
+       Gnulib flags.
+
+       * tp/Texinfo/XS/convert/build_html_perl_state.c,
+       tp/Texinfo/XS/convert/call_html_perl_function.c: remove config.h
+       include, there is no use of Gnulib functions nor use of autoconf
+       defines in the Perl C codes.
+
 2024-11-15  Patrice Dumas  <pertusus@free.fr>
 
        * tp/Texinfo/XS/Makefile.am (XS_libtexinfo_convert_sources),
diff --git a/tp/Texinfo/XS/Makefile.am b/tp/Texinfo/XS/Makefile.am
index 12459b7656..d1081a3882 100644
--- a/tp/Texinfo/XS/Makefile.am
+++ b/tp/Texinfo/XS/Makefile.am
@@ -446,16 +446,28 @@ C_libtexinfo_convert_sources = \
                        convert/texinfo.c \
                        convert/texinfo.h
 
-# call_html_perl_function.c functions are called in other
-# parts of the code and need to be linked against Perl.
+# convenience library for C Perl called from libtexinfo-convert C code,
+# call_html_perl_function.c, to be able to have different flags from
+# libtexinfo-convert, to avoid Gnulib flags.
 # build_html_perl_state.c functions are called from call_html_perl_function.c.
-XS_libtexinfo_convert_sources = \
+if HAVE_ICONV
+noinst_LTLIBRARIES += libxs_in_libtexinfo_convert.la
+endif
+
+libxs_in_libtexinfo_convert_la_SOURCES = \
                        convert/build_html_perl_state.h \
                        convert/build_html_perl_state.c \
+                       convert/call_html_perl_function.h \
+                       convert/call_html_perl_function.c
+
+libxs_in_libtexinfo_convert_la_CPPFLAGS = -I$(srcdir)/main -I$(srcdir)/convert 
$(XSLIBS_CPPFLAGS)
+libxs_in_libtexinfo_convert_la_CFLAGS = $(XSLIBS_CFLAGS)
+libxs_in_libtexinfo_convert_la_LIBADD = libtexinfoxs.la libtexinfo.la 
$(platform_PERL_LIBADD)
+libxs_in_libtexinfo_convert_la_LDFLAGS = $(perl_conf_LDFLAGS)
+
+XS_libtexinfo_convert_sources = \
                        convert/build_html_perl_info.h \
                        convert/build_html_perl_info.c \
-                       convert/call_html_perl_function.h \
-                       convert/call_html_perl_function.c \
                        convert/get_converter_perl_info.c \
                        convert/get_converter_perl_info.h
 
@@ -467,7 +479,7 @@ libtexinfo_convert_la_SOURCES = \
 # parsetexi is only needed for texinfo.c
 libtexinfo_convert_la_CPPFLAGS = -I$(srcdir)/main -I$(srcdir)/convert 
-I$(srcdir)/structuring_transfo -I$(srcdir)/parsetexi $(AM_CPPFLAGS) 
$(GNULIB_CPPFLAGS) $(XSLIBS_CPPFLAGS)
 libtexinfo_convert_la_CFLAGS = $(XSLIBS_CFLAGS)
-libtexinfo_convert_la_LIBADD = libtexinfoxs.la libtexinfo.la 
$(top_builddir)/gnulib/lib/libgnu.la $(platform_PERL_LIBADD)
+libtexinfo_convert_la_LIBADD = libtexinfoxs.la libtexinfo.la 
libxs_in_libtexinfo_convert.la $(top_builddir)/gnulib/lib/libgnu.la 
$(platform_PERL_LIBADD)
 libtexinfo_convert_la_LDFLAGS = -version-info 0:0:0 $(perl_conf_LDFLAGS) 
$(EUIDACCESS_LIBGEN) $(LTLIBINTL) $(LTLIBICONV) $(LTLIBUNISTRING)
 # example to trigger errors associated with no undefined
 #libtexinfo_convert_la_LDFLAGS = -version-info 0:0:0 -Wl,--no-undefined 
$(perl_conf_LDFLAGS) $(perl_conf_PERL_LINK) $(EUIDACCESS_LIBGEN) $(LTLIBINTL) 
$(LTLIBICONV) $(LTLIBUNISTRING)
diff --git a/tp/Texinfo/XS/convert/build_html_perl_state.c 
b/tp/Texinfo/XS/convert/build_html_perl_state.c
index f956e1800b..6f659df2f6 100644
--- a/tp/Texinfo/XS/convert/build_html_perl_state.c
+++ b/tp/Texinfo/XS/convert/build_html_perl_state.c
@@ -13,8 +13,6 @@
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
 
-#include <config.h>
-
 #include <stdio.h>
 
 /* Avoid namespace conflicts. */
@@ -23,10 +21,6 @@
 #define PERL_NO_GET_CONTEXT
 #include "EXTERN.h"
 #include "perl.h"
-#if defined _WIN32 && !defined __CYGWIN__
-/* See comment in Parsetexi.xs for why we #undef free. */
-  #undef free
-#endif
 #include "XSUB.h"
 
 #undef context
diff --git a/tp/Texinfo/XS/convert/call_html_perl_function.c 
b/tp/Texinfo/XS/convert/call_html_perl_function.c
index 2d8591d7d3..d26328be9b 100644
--- a/tp/Texinfo/XS/convert/call_html_perl_function.c
+++ b/tp/Texinfo/XS/convert/call_html_perl_function.c
@@ -13,18 +13,12 @@
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
 
-#include <config.h>
-
 /* Avoid namespace conflicts. */
 #define context perl_context
 
 #define PERL_NO_GET_CONTEXT
 #include "EXTERN.h"
 #include "perl.h"
-#if defined _WIN32 && !defined __CYGWIN__
-/* See comment in Parsetexi.xs for why we #undef free. */
-  #undef free
-#endif
 #include "XSUB.h"
 #include "ppport.h"