[7821] no -lperl for XS modules

[gavinsmith0123]

Revision: 7821
          http://svn.sv.gnu.org/viewvc/?view=rev&root=texinfo&revision=7821
Author:   gavin
Date:     2017-06-06 17:19:59 -0400 (Tue, 06 Jun 2017)
Log Message:
-----------
no -lperl for XS modules

Modified Paths:
--------------
    trunk/ChangeLog
    trunk/tp/Texinfo/Convert/XSParagraph/Makefile.am
    trunk/tp/Texinfo/Convert/XSParagraph/configure.ac
    trunk/tp/Texinfo/MiscXS/Makefile.am
    trunk/tp/Texinfo/MiscXS/configure.ac

Modified: trunk/ChangeLog
===================================================================
--- trunk/ChangeLog     2017-06-04 18:49:44 UTC (rev 7820)
+++ trunk/ChangeLog     2017-06-06 21:19:59 UTC (rev 7821)
@@ -1,3 +1,16 @@
+2017-06-06  Gavin Smith  <address@hidden>
+
+       * tp/Texinfo/Convert/XSParagraph/configure.ac,
+       * tp/Texinfo/MiscXS/configure.ac: Copy code for HOST_IS_WINDOWS
+       Automake conditional from top-level configure.ac.
+
+       * tp/Texinfo/MiscXS/Makefile.am,
+       * tp/Texinfo/Convert/XSParagraph/Makefile.am: Only put 
+       -no-undefined -lperl in AM_FLAGS on MS-Windows systems.
+       Li Er reported that linking against libperl is not necessary,
+       and it won't work if perl is not built with a shared libperl
+       library.
+
 2017-06-04  Gavin Smith  <address@hidden>
 
        * doc/texinfo.tex

Modified: trunk/tp/Texinfo/Convert/XSParagraph/Makefile.am
===================================================================
--- trunk/tp/Texinfo/Convert/XSParagraph/Makefile.am    2017-06-04 18:49:44 UTC 
(rev 7820)
+++ trunk/tp/Texinfo/Convert/XSParagraph/Makefile.am    2017-06-06 21:19:59 UTC 
(rev 7821)
@@ -84,12 +84,18 @@
 TestXS_la_CFLAGS = $(AM_CFLAGS)
 TestXS_la_CFLAGS += -DVERSION=\"$(VERSION)\" -DXS_VERSION=\"$(VERSION)\"  
"-I$(PERL_INC)"
 
-AM_LDFLAGS = -no-undefined -L$(PERL_INC) $(PERL_CONF_libperl)
-AM_LDFLAGS += -avoid-version -module $(PERL_CONF_ccdlflags)
-# The -no-undefined flag is for MS-Windows.  See info node
-# `(gnulib)Libtool and Windows'.  The -L and -l options after it show
-# where to find the undefined symbols.
+if HOST_IS_WINDOWS
+  PLATFORM_LDFLAGS = -no-undefined -L$(PERL_INC) $(PERL_CONF_libperl)
+  # The -no-undefined flag is for MS-Windows.  See info node
+  # `(gnulib)Libtool and Windows'.  The -L and -l options after it show
+  # where to find the undefined symbols.
+else
+  PLATFORM_LDFLAGS =
+endif
 
+AM_LDFLAGS = -avoid-version -module $(PERL_CONF_ccdlflags)
+AM_LDFLAGS += $(PLATFORM_LDFLAGS)
+
 # only used to regenerate a stand-alone perl module
 perl_specific_files = \
   Makefile.PL \

Modified: trunk/tp/Texinfo/Convert/XSParagraph/configure.ac
===================================================================
--- trunk/tp/Texinfo/Convert/XSParagraph/configure.ac   2017-06-04 18:49:44 UTC 
(rev 7820)
+++ trunk/tp/Texinfo/Convert/XSParagraph/configure.ac   2017-06-06 21:19:59 UTC 
(rev 7821)
@@ -84,6 +84,12 @@
 # aren't really used: otherwise, configure complains about undefined
 # variables.
 
+host_is_windows=no
+case "$host" in
+   *-mingw32 | *-mingw64 | *-msdosdjgpp )  host_is_windows=yes ;;
+esac     
+AM_CONDITIONAL([HOST_IS_WINDOWS], [test "x$host_is_windows" = "xyes"])
+
 # User variables for a Perl XS extension, which may be different, for
 # example if the Perl interpreter being used was compiled with a
 # different compiler.  Also in top-level configure.ac.

Modified: trunk/tp/Texinfo/MiscXS/Makefile.am
===================================================================
--- trunk/tp/Texinfo/MiscXS/Makefile.am 2017-06-04 18:49:44 UTC (rev 7820)
+++ trunk/tp/Texinfo/MiscXS/Makefile.am 2017-06-06 21:19:59 UTC (rev 7821)
@@ -48,8 +48,14 @@
 MiscXS_la_CFLAGS = $(AM_CFLAGS)
 MiscXS_la_CFLAGS += -DVERSION=\"$(VERSION)\" -DXS_VERSION=\"$(VERSION)\"  
"-I$(PERL_INC)"
 
-AM_LDFLAGS = -no-undefined -L$(PERL_INC) $(PERL_CONF_libperl)
-AM_LDFLAGS += -avoid-version -module $(PERL_CONF_ccdlflags)
-# The -no-undefined flag is for MS-Windows.  See info node
-# `(gnulib)Libtool and Windows'.  The -L and -l options after it show
-# where to find the undefined symbols.
+if HOST_IS_WINDOWS
+  PLATFORM_LDFLAGS = -no-undefined -L$(PERL_INC) $(PERL_CONF_libperl)
+  # The -no-undefined flag is for MS-Windows.  See info node
+  # `(gnulib)Libtool and Windows'.  The -L and -l options after it show
+  # where to find the undefined symbols.
+else
+  PLATFORM_LDFLAGS =
+endif
+
+AM_LDFLAGS = -avoid-version -module $(PERL_CONF_ccdlflags)
+AM_LDFLAGS += $(PLATFORM_LDFLAGS)

Modified: trunk/tp/Texinfo/MiscXS/configure.ac
===================================================================
--- trunk/tp/Texinfo/MiscXS/configure.ac        2017-06-04 18:49:44 UTC (rev 
7820)
+++ trunk/tp/Texinfo/MiscXS/configure.ac        2017-06-06 21:19:59 UTC (rev 
7821)
@@ -80,6 +80,12 @@
 # aren't really used: otherwise, configure complains about undefined
 # variables.
 
+host_is_windows=no
+case "$host" in
+   *-mingw32 | *-mingw64 | *-msdosdjgpp )  host_is_windows=yes ;;
+esac     
+AM_CONDITIONAL([HOST_IS_WINDOWS], [test "x$host_is_windows" = "xyes"])
+
 # User variables for a Perl XS extension, which may be different, for
 # example if the Perl interpreter being used was compiled with a
 # different compiler.  Also in top-level configure.ac.