[6941] -L$(PERL_INC) -lperl

[Gavin D. Smith]

Revision: 6941
          http://svn.sv.gnu.org/viewvc/?view=rev&root=texinfo&revision=6941
Author:   gavin
Date:     2016-01-15 12:15:47 +0000 (Fri, 15 Jan 2016)
Log Message:
-----------
-L$(PERL_INC) -lperl

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

Modified: trunk/ChangeLog
===================================================================
--- trunk/ChangeLog     2016-01-15 11:15:59 UTC (rev 6940)
+++ trunk/ChangeLog     2016-01-15 12:15:47 UTC (rev 6941)
@@ -1,5 +1,12 @@
 2016-01-15  Gavin Smith  <address@hidden>
 
+       * tp/Texinfo/Convert/XSParagraph/configure.ac: Get 'libperl' 
+       Perl config value, and transform it into a -l flag for libtool.
+       * tp/Texinfo/Convert/XSParagraph/Makefile.am (AM_LDFLAGS): Use 
+       this flag along with -L$(PERL_INC).
+
+2016-01-15  Gavin Smith  <address@hidden>
+
        * doc/texinfo.texi (Info Format Specification): Mention that 
        keywords in Info format should be read case-insensitively.  
        Suggestion for manual from Karl Berry.

Modified: trunk/tp/Texinfo/Convert/XSParagraph/Makefile.am
===================================================================
--- trunk/tp/Texinfo/Convert/XSParagraph/Makefile.am    2016-01-15 11:15:59 UTC 
(rev 6940)
+++ trunk/tp/Texinfo/Convert/XSParagraph/Makefile.am    2016-01-15 12:15:47 UTC 
(rev 6941)
@@ -76,20 +76,19 @@
 CPPFLAGS = $(PERL_EXT_CPPFLAGS)
 LDFLAGS = $(PERL_EXT_LDFLAGS)
 
-XSParagraph_la_CFLAGS = $(PERL_CONF_ccflags)
+AM_CFLAGS = $(PERL_CONF_ccflags)
 
+XSParagraph_la_CFLAGS = $(AM_CFLAGS)
 XSParagraph_la_CFLAGS += -DVERSION=\"$(VERSION)\" 
-DXS_VERSION=\"$(XSPARAGRAPH_INTERFACE_VERSION)\"  "-I$(PERL_INC)"
 
-XSParagraph_la_LDFLAGS=-no-undefined -avoid-version -module 
$(PERL_CONF_cccdlflags)
-# The -no-undefined flag is for MS-Windows.  See info node
-# `(gnulib)Libtool and Windows'.
-
-
-TestXS_la_CFLAGS = $(PERL_CONF_ccflags)
-
+TestXS_la_CFLAGS = $(AM_CFLAGS)
 TestXS_la_CFLAGS += -DVERSION=\"$(VERSION)\" -DXS_VERSION=\"$(VERSION)\"  
"-I$(PERL_INC)"
 
-TestXS_la_LDFLAGS=-no-undefined -module $(PERL_CONF_cccdlflags)
+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.
 
 # only used to regenerate a stand-alone perl module
 perl_specific_files = \

Modified: trunk/tp/Texinfo/Convert/XSParagraph/configure.ac
===================================================================
--- trunk/tp/Texinfo/Convert/XSParagraph/configure.ac   2016-01-15 11:15:59 UTC 
(rev 6940)
+++ trunk/tp/Texinfo/Convert/XSParagraph/configure.ac   2016-01-15 12:15:47 UTC 
(rev 6941)
@@ -112,6 +112,16 @@
 lookup_perl_flags([ccflags])
 lookup_perl_flags([cccdlflags])
 
+lookup_perl_conf([libperl])
+# Change libperl.so into -lperl to indicate a library dependency to 
+# libtool.
+# Special case for Cygwin to change e.g. cygperl5_22.dll into -lperl
+PERL_CONF_libperl=`echo $PERL_CONF_libperl \
+           | sed -e 's/^lib/-l/' \
+                 -e 's/\..*//' \
+                 -e 's/^cygperl.*/-lperl/' `
+
+
 lookup_perl_conf([archlibexp])
 lookup_perl_conf([privlibexp])
 # TODO: would be nice to be able to do lookup_perl_conf([ccflags cccdlflags])