Add version strings and sync up with other changes in the gawk master…

… branch.

ChangeLog

@@ -1,3 +1,14 @@
+2012-08-27         Andrew J. Schorr     <[email protected]>
+
+	* configure.ac: Version 0.3.8.
+	(AM_INIT_AUTOMAKE): Remove -Werror, since the new version of automake
+	is unhappy with AM_PROG_MKDIR_P used by gettext.
+	(AC_SYS_LARGEFILE): Add to make sure our version of struct stat matches
+	the gawk binary.
+	* README: Update recipe to build gawk, since extgawk has now been
+	merged into master.
+	* varinit.c: We now need to include <stdio.h> before <gawkapi.h>.
+
 2012-08-09         Andrew J. Schorr     <[email protected]>
 
 	* configure.ac: Version 0.3.7 to match minor changes in gawk API.

README

@@ -17,7 +17,6 @@ containing shared extension library support.  Here is a recipe:
 
    git clone git://git.savannah.gnu.org/gawk.git
    cd gawk
-   git checkout extgawk
    ./bootstrap.sh
    ./configure --prefix=/tmp/newgawk
    make && make check && make install

configure.ac

@@ -1,18 +1,21 @@
 dnl Process this file with autoconf to produce a configure script.
 
-AC_INIT([Gawk Extension Libraries], 0.3.7, [email protected], gawkextlib)
+AC_INIT([Gawk Extension Libraries], 0.3.8, [email protected], gawkextlib)
 
 AC_CONFIG_MACRO_DIR([m4])
 AC_CONFIG_AUX_DIR([build-aux])
 
 INSTALL="$ac_aux_dir/install-sh -c"
 export INSTALL
 
-AM_INIT_AUTOMAKE([-Wall -Werror])
+AM_INIT_AUTOMAKE([-Wall])
 AM_GNU_GETTEXT([external])
 AM_GNU_GETTEXT_VERSION([0.18.1])
 
 m4_ifdef([AM_PROG_AR], [AM_PROG_AR])
+dnl We need AC_SYS_LARGEFILE because gawk uses it, and there can otherwise
+dnl be a discrepancy in the struct stat layout in IOBUF_PUBLIC
+AC_SYS_LARGEFILE
 AC_DISABLE_STATIC
 AC_PROG_LIBTOOL
 

extension/ChangeLog

@@ -1,3 +1,9 @@
+2012-08-27         Andrew J. Schorr     <[email protected]>
+
+	* common.h: Must include <stdio.h> due to changes in <gawkapi.h>.
+	* gd.c, mpfr.c, pgsql.c, xml_interface.c (ext_version): Add version
+	string.
+
 2012-08-09         Andrew J. Schorr     <[email protected]>
 
 	* common.h: After recent gawkapi patch, must include <sys/stat.h>

extension/common.h

@@ -1,6 +1,7 @@
 #include "config.h"
 #include <string.h>
 #include <stdlib.h>
+#include <stdio.h>
 #include <unistd.h>
 #include <sys/stat.h>
 #include "gawkextlib.h"

extension/gd.c

@@ -585,5 +585,6 @@ init_my_module(void)
 }
 
 static awk_bool_t (*init_func)(void) = init_my_module;
+static const char ext_version[] = "GD extension: version 1.0";
 
 dl_load_func(func_table, gd, "")

extension/mpfr.c

@@ -738,5 +738,6 @@ init_my_module(void)
 }
 
 static awk_bool_t (*init_func)(void) = init_my_module;
+static const char ext_version[] = "MPFR extension: version 1.0";
 
 dl_load_func(func_table, mpfr, "")

extension/pgsql.c

@@ -1085,5 +1085,6 @@ init_my_module(void)
 }
 
 static awk_bool_t (*init_func)(void) = init_my_module;
+static const char ext_version[] = "PostgreSQL extension: version 1.0";
 
 dl_load_func(func_table, pgsql, "")

extension/xml_interface.c

@@ -143,6 +143,7 @@ init_my_module(void)
 }
 
 static awk_bool_t (*init_func)(void) = init_my_module;
+static const char ext_version[] = "XML extension: version 1.0";
 
 dl_load_func(func_table, xml, "")
 

po/ChangeLog

@@ -1,3 +1,7 @@
+2012-08-27         Andrew J. Schorr     <[email protected]>
+
+	*.po: Update.
+
 2012-08-01         Andrew J. Schorr     <[email protected]>
 
 	*.po: Update.

po/da.po

@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gawk 3.1.31\n"
 "Report-Msgid-Bugs-To: [email protected]\n"
-"POT-Creation-Date: 2012-08-01 12:57-0400\n"
+"POT-Creation-Date: 2012-08-27 15:16-0400\n"
 "PO-Revision-Date: 2002-11-09 10:09+0100\n"
 "Last-Translator: Keld Simonsen <[email protected]>\n"
 "Language-Team: Danish <[email protected]>\n"
@@ -660,44 +660,44 @@ msgstr "for f
 msgid "set_array_element failed"
 msgstr ""
 
-#: extension/xml_interface.c:172
+#: extension/xml_interface.c:173
 #, c-format
 msgid "Cannot create XML reserved scalar variable `%s'."
 msgstr ""
 
-#: extension/xml_interface.c:176
+#: extension/xml_interface.c:177
 #, c-format
 msgid "Cannot create XML reserved scalar constant `%s'."
 msgstr ""
 
-#: extension/xml_interface.c:197 extension/xml_interface.c:211
+#: extension/xml_interface.c:198 extension/xml_interface.c:212
 #, c-format
 msgid "XML reserved scalar variable `%s' already used with incompatible type."
 msgstr ""
 
-#: extension/xml_interface.c:202
+#: extension/xml_interface.c:203
 #, c-format
 msgid "XML reserved array variable `%s' already used with incompatible type."
 msgstr ""
 
-#: extension/xml_interface.c:235
+#: extension/xml_interface.c:236
 #, fuzzy
 msgid "`XMLMODE' is a gawk extension"
 msgstr "\"BINMODE\" er en gawk-udvidelse"
 
-#: extension/xml_interface.c:253
+#: extension/xml_interface.c:254
 msgid "cannot create XML puller"
 msgstr ""
 
-#: extension/xml_interface.c:279
+#: extension/xml_interface.c:280
 msgid "cannot convert space to XMLCHARSET"
 msgstr ""
 
-#: extension/xml_interface.c:282
+#: extension/xml_interface.c:283
 msgid "cannot convert slash to XMLCHARSET"
 msgstr ""
 
-#: extension/xml_interface.c:524
+#: extension/xml_interface.c:525
 msgid "XML_PullerIconv failed to convert event string"
 msgstr ""
 

po/de.po

@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gawk 3.1.0\n"
 "Report-Msgid-Bugs-To: [email protected]\n"
-"POT-Creation-Date: 2012-08-01 12:57-0400\n"
+"POT-Creation-Date: 2012-08-27 15:16-0400\n"
 "PO-Revision-Date: 2002-04-03 18:55+02:00\n"
 "Last-Translator: Christian Kirsch <[email protected]>\n"
 "Language-Team: German <[email protected]>\n"
@@ -660,44 +660,44 @@ msgstr "Nicht gen
 msgid "set_array_element failed"
 msgstr ""
 
-#: extension/xml_interface.c:172
+#: extension/xml_interface.c:173
 #, c-format
 msgid "Cannot create XML reserved scalar variable `%s'."
 msgstr ""
 
-#: extension/xml_interface.c:176
+#: extension/xml_interface.c:177
 #, c-format
 msgid "Cannot create XML reserved scalar constant `%s'."
 msgstr ""
 
-#: extension/xml_interface.c:197 extension/xml_interface.c:211
+#: extension/xml_interface.c:198 extension/xml_interface.c:212
 #, c-format
 msgid "XML reserved scalar variable `%s' already used with incompatible type."
 msgstr ""
 
-#: extension/xml_interface.c:202
+#: extension/xml_interface.c:203
 #, c-format
 msgid "XML reserved array variable `%s' already used with incompatible type."
 msgstr ""
 
-#: extension/xml_interface.c:235
+#: extension/xml_interface.c:236
 #, fuzzy
 msgid "`XMLMODE' is a gawk extension"
 msgstr "'BINMODE' ist eine gawk-Erweiterung."
 
-#: extension/xml_interface.c:253
+#: extension/xml_interface.c:254
 msgid "cannot create XML puller"
 msgstr ""
 
-#: extension/xml_interface.c:279
+#: extension/xml_interface.c:280
 msgid "cannot convert space to XMLCHARSET"
 msgstr ""
 
-#: extension/xml_interface.c:282
+#: extension/xml_interface.c:283
 msgid "cannot convert slash to XMLCHARSET"
 msgstr ""
 
-#: extension/xml_interface.c:524
+#: extension/xml_interface.c:525
 msgid "XML_PullerIconv failed to convert event string"
 msgstr ""
 

po/es.po

@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gawk 3.1.5f\n"
 "Report-Msgid-Bugs-To: [email protected]\n"
-"POT-Creation-Date: 2012-08-01 12:57-0400\n"
+"POT-Creation-Date: 2012-08-27 15:16-0400\n"
 "PO-Revision-Date: 2007-07-20 01:10-0500\n"
 "Last-Translator: Cristian Othón Martínez Vera <[email protected]>\n"
 "Language-Team: Spanish <[email protected]>\n"
@@ -660,44 +660,44 @@ msgstr "no hay suficientes argumentos para satisfacer a la cadena de formato"
 msgid "set_array_element failed"
 msgstr ""
 
-#: extension/xml_interface.c:172
+#: extension/xml_interface.c:173
 #, c-format
 msgid "Cannot create XML reserved scalar variable `%s'."
 msgstr ""
 
-#: extension/xml_interface.c:176
+#: extension/xml_interface.c:177
 #, c-format
 msgid "Cannot create XML reserved scalar constant `%s'."
 msgstr ""
 
-#: extension/xml_interface.c:197 extension/xml_interface.c:211
+#: extension/xml_interface.c:198 extension/xml_interface.c:212
 #, c-format
 msgid "XML reserved scalar variable `%s' already used with incompatible type."
 msgstr ""
 
-#: extension/xml_interface.c:202
+#: extension/xml_interface.c:203
 #, c-format
 msgid "XML reserved array variable `%s' already used with incompatible type."
 msgstr ""
 
-#: extension/xml_interface.c:235
+#: extension/xml_interface.c:236
 #, fuzzy
 msgid "`XMLMODE' is a gawk extension"
 msgstr "`BINMODE' es una extensión de gawk"
 
-#: extension/xml_interface.c:253
+#: extension/xml_interface.c:254
 msgid "cannot create XML puller"
 msgstr ""
 
-#: extension/xml_interface.c:279
+#: extension/xml_interface.c:280
 msgid "cannot convert space to XMLCHARSET"
 msgstr ""
 
-#: extension/xml_interface.c:282
+#: extension/xml_interface.c:283
 msgid "cannot convert slash to XMLCHARSET"
 msgstr ""
 
-#: extension/xml_interface.c:524
+#: extension/xml_interface.c:525
 msgid "XML_PullerIconv failed to convert event string"
 msgstr ""
 

po/fr.po

@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gawk 3.1.4l\n"
 "Report-Msgid-Bugs-To: [email protected]\n"
-"POT-Creation-Date: 2012-08-01 12:57-0400\n"
+"POT-Creation-Date: 2012-08-27 15:16-0400\n"
 "PO-Revision-Date: 2005-06-29 08:00-0500\n"
 "Last-Translator: Michel Robitaille <[email protected]>\n"
 "Language-Team: French <[email protected]>\n"
@@ -661,44 +661,44 @@ msgstr "pas assez d'arguments pour satisfaire le format d'une cha
 msgid "set_array_element failed"
 msgstr ""
 
-#: extension/xml_interface.c:172
+#: extension/xml_interface.c:173
 #, c-format
 msgid "Cannot create XML reserved scalar variable `%s'."
 msgstr ""
 
-#: extension/xml_interface.c:176
+#: extension/xml_interface.c:177
 #, c-format
 msgid "Cannot create XML reserved scalar constant `%s'."
 msgstr ""
 
-#: extension/xml_interface.c:197 extension/xml_interface.c:211
+#: extension/xml_interface.c:198 extension/xml_interface.c:212
 #, c-format
 msgid "XML reserved scalar variable `%s' already used with incompatible type."
 msgstr ""
 
-#: extension/xml_interface.c:202
+#: extension/xml_interface.c:203
 #, c-format
 msgid "XML reserved array variable `%s' already used with incompatible type."
 msgstr ""
 
-#: extension/xml_interface.c:235
+#: extension/xml_interface.c:236
 #, fuzzy
 msgid "`XMLMODE' is a gawk extension"
 msgstr "« BINMODE » est une extension de gawk"
 
-#: extension/xml_interface.c:253
+#: extension/xml_interface.c:254
 msgid "cannot create XML puller"
 msgstr ""
 
-#: extension/xml_interface.c:279
+#: extension/xml_interface.c:280
 msgid "cannot convert space to XMLCHARSET"
 msgstr ""
 
-#: extension/xml_interface.c:282
+#: extension/xml_interface.c:283
 msgid "cannot convert slash to XMLCHARSET"
 msgstr ""
 
-#: extension/xml_interface.c:524
+#: extension/xml_interface.c:525
 msgid "XML_PullerIconv failed to convert event string"
 msgstr ""