[6465] small fixes for XSParagraph

[Gavin D. Smith]

Revision: 6465
          http://svn.sv.gnu.org/viewvc/?view=rev&root=texinfo&revision=6465
Author:   gavin
Date:     2015-07-25 19:56:57 +0000 (Sat, 25 Jul 2015)
Log Message:
-----------
small fixes for XSParagraph

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

Modified: trunk/ChangeLog
===================================================================
--- trunk/ChangeLog     2015-07-25 12:31:01 UTC (rev 6464)
+++ trunk/ChangeLog     2015-07-25 19:56:57 UTC (rev 6465)
@@ -1,5 +1,11 @@
 2015-07-25  Gavin Smith  <address@hidden>
 
+       * tp/Texinfo/Convert/XSParagraph/Makefile.am: Clear CFLAGS.
+       * tp/Texinfo/Convert/XSParagraph/XSParagraph.pm: Don't goto a 
+       label inside an if (0) { ... } block.
+
+2015-07-25  Gavin Smith  <address@hidden>
+
        * tp/Texinfo/Convert/Plaintext.pm (new_formatter): Uncomment 
        line using XSParagraph module.  Don't call XSParagraph::hello.
        * tp/Texinfo/Convert/XSParagraph/xspara.c (xspara_hello)

Modified: trunk/tp/Texinfo/Convert/XSParagraph/Makefile.am
===================================================================
--- trunk/tp/Texinfo/Convert/XSParagraph/Makefile.am    2015-07-25 12:31:01 UTC 
(rev 6464)
+++ trunk/tp/Texinfo/Convert/XSParagraph/Makefile.am    2015-07-25 19:56:57 UTC 
(rev 6465)
@@ -76,6 +76,10 @@
 
 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 =
+
 XSParagraph_la_CFLAGS =
 
 #CCFLAGS = -D_REENTRANT -D_GNU_SOURCE -fno-strict-aliasing -pipe 
-fstack-protector -I/usr/local/include -D_LARGEFILE_SOURCE 
-D_FILE_OFFSET_BITS=64

Modified: trunk/tp/Texinfo/Convert/XSParagraph/XSParagraph.pm
===================================================================
--- trunk/tp/Texinfo/Convert/XSParagraph/XSParagraph.pm 2015-07-25 12:31:01 UTC 
(rev 6464)
+++ trunk/tp/Texinfo/Convert/XSParagraph/XSParagraph.pm 2015-07-25 19:56:57 UTC 
(rev 6465)
@@ -138,13 +138,12 @@
   warn "XSParagraph: error initializing\n";
   goto FALLBACK;
 }
+goto DONTFALLBACK;
 
-if (0) {
 FALLBACK:
   # Fall back to using the Perl code.
   *XSParagraph:: = *Texinfo::Convert::Paragraph::;
-}
-
+DONTFALLBACK: ;
 } # end BEGIN