[6499] PERL_EXT_CFLAGS

[Gavin D. Smith]

Revision: 6499
          http://svn.sv.gnu.org/viewvc/?view=rev&root=texinfo&revision=6499
Author:   gavin
Date:     2015-08-05 21:06:39 +0000 (Wed, 05 Aug 2015)
Log Message:
-----------
PERL_EXT_CFLAGS

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

Modified: trunk/ChangeLog
===================================================================
--- trunk/ChangeLog     2015-08-05 18:52:32 UTC (rev 6498)
+++ trunk/ChangeLog     2015-08-05 21:06:39 UTC (rev 6499)
@@ -1,6 +1,13 @@
 2015-08-04  Gavin Smith  <address@hidden>
 
        * configure.ac,
+       * tp/Texinfo/Convert/XSParagraph/configure.ac: Recognize
+       PERL_EXT_CFLAGS, PERL_EXT_CPPFLAGS, PERL_EXT_LDLAGS as user 
+       variables.
+
+2015-08-04  Gavin Smith  <address@hidden>
+
+       * configure.ac,
        * tp/Texinfo/Convert/XSParagraph/configure.ac: Add 
        --enable-perl-xs option.  Record result via Autoconf output 
        variable and Automake conditional.

Modified: trunk/configure.ac
===================================================================
--- trunk/configure.ac  2015-08-05 18:52:32 UTC (rev 6498)
+++ trunk/configure.ac  2015-08-05 21:06:39 UTC (rev 6499)
@@ -57,6 +57,13 @@
 ])
 fi
 
+# 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 tp/Texinfo/Convert/XSParagraph/configure.ac.
+AC_ARG_VAR([PERL_EXT_CFLAGS], [Compiler flags for a Perl extension])
+AC_ARG_VAR([PERL_EXT_CPPFLAGS], [C preprocessor flags for a Perl extension])
+AC_ARG_VAR([PERL_EXT_LDFLAGS], [Linker flags for a Perl extension])
+
 AC_MSG_CHECKING([Perl version and Encode module])
 if $PERL -e "use 5.007_003; use Encode;" > /dev/null 2>&1; then
   perl_version_requirement='yes'

Modified: trunk/tp/Texinfo/Convert/XSParagraph/Makefile.am
===================================================================
--- trunk/tp/Texinfo/Convert/XSParagraph/Makefile.am    2015-08-05 18:52:32 UTC 
(rev 6498)
+++ trunk/tp/Texinfo/Convert/XSParagraph/Makefile.am    2015-08-05 21:06:39 UTC 
(rev 6499)
@@ -67,19 +67,16 @@
 
 BUILT_SOURCES = XSParagraph.c
 
-# Clear any flags set by configure at the top level, because the 
-# compiler used in this subdirectory might be different.
-CFLAGS =
+# Override these variables set by configure at the top level, because 
+# the compiler used in this subdirectory might be different.  
+# PERL_EXT_var are user variables, allowing configuring at the top-level 
+# with e.g. "./configure CFLAGS='-g -O0' PERL_EXT_CFLAGS='-g'".
 
-XSParagraph_la_CFLAGS =
+CFLAGS = $(PERL_EXT_CFLAGS)
+CPPFLAGS = $(PERL_EXT_CPPFLAGS)
+LDFLAGS = $(PERL_EXT_LDFLAGS)
 
-#CCFLAGS = -D_REENTRANT -D_GNU_SOURCE -fno-strict-aliasing -pipe 
-fstack-protector -I/usr/local/include -D_LARGEFILE_SOURCE 
-D_FILE_OFFSET_BITS=64
-# Apparently these may be wrong if Perl was compiled with a different 
-# compiler from the one we're using.
-# Maybe we should strip out anything that isn't a -D or -I flag.
-# See http://lists.gnu.org/archive/html/bug-texinfo/2015-06/msg00077.html,
-# and http://www.tokiwinter.com/fix-perl-make-errors-under-solaris/
-XSParagraph_la_CFLAGS += $(PERL_CONF_ccflags)
+XSParagraph_la_CFLAGS = $(PERL_CONF_ccflags)
 
 XSParagraph_la_CFLAGS += -DVERSION=\"$(VERSION)\" -DXS_VERSION=\"$(VERSION)\"  
"-I$(PERL_INC)"
 

Modified: trunk/tp/Texinfo/Convert/XSParagraph/configure.ac
===================================================================
--- trunk/tp/Texinfo/Convert/XSParagraph/configure.ac   2015-08-05 18:52:32 UTC 
(rev 6498)
+++ trunk/tp/Texinfo/Convert/XSParagraph/configure.ac   2015-08-05 21:06:39 UTC 
(rev 6499)
@@ -72,6 +72,13 @@
 # aren't really used: otherwise, configure complains about undefined
 # variables.
 
+# 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.
+AC_ARG_VAR([PERL_EXT_CFLAGS], [Compiler flags for a Perl extension])
+AC_ARG_VAR([PERL_EXT_CPPFLAGS], [C preprocessor flags for a Perl extension])
+AC_ARG_VAR([PERL_EXT_LDFLAGS], [Linker flags for a Perl extension])
+
 if test x$disable_xs != xyes; then
 lookup_perl_flags([ccflags])
 lookup_perl_flags([cccdlflags])

Modified: trunk/tp/Texinfo/Convert/XSParagraph/lib/Makefile.in
===================================================================
--- trunk/tp/Texinfo/Convert/XSParagraph/lib/Makefile.in        2015-08-05 
18:52:32 UTC (rev 6498)
+++ trunk/tp/Texinfo/Convert/XSParagraph/lib/Makefile.in        2015-08-05 
21:06:39 UTC (rev 6499)
@@ -581,6 +581,9 @@
 PERL_CONF_cccdlflags = @PERL_CONF_cccdlflags@
 PERL_CONF_ccflags = @PERL_CONF_ccflags@
 PERL_CONF_privlibexp = @PERL_CONF_privlibexp@
+PERL_EXT_CFLAGS = @PERL_EXT_CFLAGS@
+PERL_EXT_CPPFLAGS = @PERL_EXT_CPPFLAGS@
+PERL_EXT_LDFLAGS = @PERL_EXT_LDFLAGS@
 PRAGMA_COLUMNS = @PRAGMA_COLUMNS@
 PRAGMA_SYSTEM_HEADER = @PRAGMA_SYSTEM_HEADER@
 PTRDIFF_T_SUFFIX = @PTRDIFF_T_SUFFIX@