From: Paul Eggert <eggert@cs.ucla.edu>
Date: Fri, 11 Aug 2006 20:52:55 +0000 (+0000)
Subject: * bootstrap: Put in need-ngettext argument to AM_GNU_GETTEXT,
X-Git-Tag: v2.3b~314
X-Git-Url: https://git.saurik.com/bison.git/commitdiff_plain/11daa4e73b862ca9f366af093bdf74cdc94e6a74

* bootstrap: Put in need-ngettext argument to AM_GNU_GETTEXT,
to prevent failures when building on older platforms.
Check for autopoint failure.
Set XGETTEXT_OPTIONS to values that check for C format strings,
so that translators are warned about them (this also helps
prevent core dumps).
---

diff --git a/ChangeLog b/ChangeLog
index 178e103e..0800ef04 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,22 @@
+2006-08-11  Paul Eggert  <eggert@cs.ucla.edu>
+
+	* bootstrap: Put in need-ngettext argument to AM_GNU_GETTEXT,
+	to prevent failures when building on older platforms.
+	Check for autopoint failure.
+	Set XGETTEXT_OPTIONS to values that check for C format strings,
+	so that translators are warned about them (this also helps
+	prevent core dumps).
+
+	* lib/subpipe.c (create_subpipe): Use new gnulib pipe_safer
+	function, since it simplifies our code a bit.
+
+	* configure.ac (AC_ARG_ENABLE): Use -Wextra -Wno-sign-compare
+	rather than -W, so we don't get bogus warnings about sign comparisons.
+	Add -Wpointer-arith, since that warning is useful (it reports code
+	that does not conform to C89 and that some compilers reject).
+	* data/c.m4, data/glr.c, data/lalr1.cc, data/yacc.c: Undo latest change,
+	since it's no longer needed.
+
 2006-08-10  Joel E. Denny  <jdenny@ces.clemson.edu>
 
 	Clean up scanners a bit.
diff --git a/bootstrap b/bootstrap
index 58274c23..62a8977e 100755
--- a/bootstrap
+++ b/bootstrap
@@ -222,7 +222,8 @@ esac
 
 (echo '# This file is generated automatically by "bootstrap".' &&
  echo 'AC_DEFUN([GNULIB_AUTOCONF_SNIPPET],[' &&
- $gnulib_tool --extract-autoconf-snippet $gnulib_modules &&
+ $gnulib_tool --extract-autoconf-snippet $gnulib_modules |
+   sed 's/AM_GNU_GETTEXT(\[external]/&, [need-ngettext]/' &&
  echo '])'
 ) >m4/gnulib.m4 || exit
 
@@ -235,7 +236,7 @@ esac
 # Reconfigure, getting other files.
 
 echo "$0: autopoint --force ..."
-autopoint --force
+autopoint --force || exit
 
 # We don't need intl, so remove it.
 intl_files_to_remove='
@@ -286,8 +287,20 @@ done
 
 
 # Put bug-reporting address into po/Makevars.
-echo "$0: sed '/^MSGID_BUGS_ADDRESS *=/s/=.*/= bug-bison@gnu.org/' po/Makevars.template >po/Makevars ..."
-sed '/^MSGID_BUGS_ADDRESS *=/s/=.*/= bug-bison@gnu.org/' po/Makevars.template >po/Makevars
+echo "$0: Creating po/Makevars from po/Makevars.template ..."
+sed '
+  /^MSGID_BUGS_ADDRESS *=/s/=.*/= bug-bison@gnu.org/
+  /^XGETTEXT_OPTIONS *=/{
+    s/$/ \\/
+    a\
+	--flag=_:1:pass-c-format \\\
+	--flag=N_:1:pass-c-format \\\
+	--flag=error:3:c-format --flag=error_at_line:5:c-format \\\
+	--flag=warn:1:c-format --flag=warn_at:2:c-format \\\
+	--flag=complain:1:c-format --flag=complain_at:2:c-format \\\
+	--flag=fatal:1:c-format --flag=fatal_at:2:c-format
+  }
+' po/Makevars.template >po/Makevars
 
 # Likewise for runtime-po/Makevars, except also change a few other parameters.
 sed '