[gawk-diffs] [SCM] gawk branch, master, updated. 320d5302c4a39ea7936950b2e663e37683b39fe0

[Arnold Robbins]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "gawk".

The branch, master has been updated
       via  320d5302c4a39ea7936950b2e663e37683b39fe0 (commit)
       via  d1d9b0cd1308eee945e121e81fe15458459e2791 (commit)
      from  4bd22d96240b36a84ca966795bbbab66421c7b1f (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
http://git.sv.gnu.org/cgit/gawk.git/commit/?id=320d5302c4a39ea7936950b2e663e37683b39fe0

commit 320d5302c4a39ea7936950b2e663e37683b39fe0
Author: Arnold D. Robbins <address@hidden>
Date:   Tue Dec 18 10:09:52 2012 +0200

    Fix extension to be available only if DYNAMIC.

diff --git a/ChangeLog b/ChangeLog
index ba76fb3..73cf022 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2012-12-18         Arnold D. Robbins     <address@hidden>
+
+       * awkgram.y (tokentab): "extension" needs to be inside ifdef DYNAMIC.
+       Thanks to Anders Wallin for finding this.
+
 2012-12-16         Arnold D. Robbins     <address@hidden>
 
        * debug.c (do_set_var): Fix last remaining `*assoc_lookup() = x'.
diff --git a/awkgram.c b/awkgram.c
index 1312517..397d847 100644
--- a/awkgram.c
+++ b/awkgram.c
@@ -4395,7 +4395,9 @@ static const struct token tokentab[] = {
 {"eval",       Op_symbol,       LEX_EVAL,      0,              0,      0},
 {"exit",       Op_K_exit,       LEX_EXIT,      0,              0,      0},
 {"exp",                Op_builtin,      LEX_BUILTIN,   A(1),           do_exp, 
MPF(exp)},
+#ifdef DYNAMIC
 {"extension",  Op_builtin,      LEX_BUILTIN,   GAWKX|A(1)|A(2)|A(3),   do_ext, 
0},
+#endif
 {"fflush",     Op_builtin,      LEX_BUILTIN,   A(0)|A(1), do_fflush,   0},
 {"for",                Op_K_for,        LEX_FOR,       BREAK|CONTINUE, 0,      
0},
 {"func",       Op_func, LEX_FUNCTION,  NOT_POSIX|NOT_OLD,      0,      0},
diff --git a/awkgram.y b/awkgram.y
index 56f60b1..cdaab6c 100644
--- a/awkgram.y
+++ b/awkgram.y
@@ -1859,7 +1859,9 @@ static const struct token tokentab[] = {
 {"eval",       Op_symbol,       LEX_EVAL,      0,              0,      0},
 {"exit",       Op_K_exit,       LEX_EXIT,      0,              0,      0},
 {"exp",                Op_builtin,      LEX_BUILTIN,   A(1),           do_exp, 
MPF(exp)},
+#ifdef DYNAMIC
 {"extension",  Op_builtin,      LEX_BUILTIN,   GAWKX|A(1)|A(2)|A(3),   do_ext, 
0},
+#endif
 {"fflush",     Op_builtin,      LEX_BUILTIN,   A(0)|A(1), do_fflush,   0},
 {"for",                Op_K_for,        LEX_FOR,       BREAK|CONTINUE, 0,      
0},
 {"func",       Op_func, LEX_FUNCTION,  NOT_POSIX|NOT_OLD,      0,      0},
diff --git a/po/da.gmo b/po/da.gmo
index 1601933..3f7bb52 100644
Binary files a/po/da.gmo and b/po/da.gmo differ
diff --git a/po/da.po b/po/da.po
index 9354044..b6bdba2 100644
--- a/po/da.po
+++ b/po/da.po
@@ -14,10 +14,10 @@ msgstr ""
 "PO-Revision-Date: 2012-02-06 10:37+0100\n"
 "Last-Translator: Keld Simonsen <address@hidden>\n"
 "Language-Team: Danish <address@hidden>\n"
+"Language: da\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=iso-8859-1\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Language: da\n"
 "X-Generator: Lokalize 1.0\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
@@ -2187,13 +2187,6 @@ msgstr "sqrt: kaldt med negativt argument %g"
 
 #: extension/rwarray.c:127
 #, fuzzy, c-format
-
-msgid ""
-"extension: library `%s': does not define `plugin_is_GPL_compatible' (%s)\n"
-msgstr ""
-"fatalt: extension: bibliotek '%s': definer ikke 'plugin_is_GPL_compatible' (%"
-"s)\n"
-
 msgid "do_writea: argument 0 is not a string\n"
 msgstr "exp: argumentet %g er uden for det tilladte område\n"
 
@@ -3359,6 +3352,13 @@ msgstr "Intet foreg
 msgid "can not pop main context"
 msgstr ""
 
+#, fuzzy
+#~ msgid ""
+#~ "extension: library `%s': does not define `plugin_is_GPL_compatible' (%s)\n"
+#~ msgstr ""
+#~ "fatalt: extension: bibliotek '%s': definer ikke "
+#~ "'plugin_is_GPL_compatible' (%s)\n"
+
 #~ msgid "`%s' is a Bell Labs extension"
 #~ msgstr "'%s' er en Bell Labs-udvidelse"
 
diff --git a/po/de.gmo b/po/de.gmo
index 3c73845..58655cf 100644
Binary files a/po/de.gmo and b/po/de.gmo differ
diff --git a/po/de.po b/po/de.po
index a352bdb..64b60b4 100644
--- a/po/de.po
+++ b/po/de.po
@@ -12,10 +12,10 @@ msgstr ""
 "PO-Revision-Date: 2012-01-30 16:21+0100\n"
 "Last-Translator: Philipp Thomas <address@hidden>\n"
 "Language-Team: German <address@hidden>\n"
+"Language: de\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Language: de\n"
 
 #: array.c:252
 #, c-format
@@ -129,8 +129,8 @@ msgstr "»%s« ist eine eingebaute Funktion und kann nicht 
umdefiniert werden"
 #: awkgram.y:416
 msgid "regexp constant `//' looks like a C++ comment, but is not"
 msgstr ""
-"Die Regulärer-Ausdruck-Konstante »//« sieht wie ein C-Kommentar aus, ist 
aber "
-"keiner"
+"Die Regulärer-Ausdruck-Konstante »//« sieht wie ein C-Kommentar aus, ist "
+"aber keiner"
 
 #: awkgram.y:420
 #, c-format
@@ -488,8 +488,8 @@ msgstr "Funktion »%s«: Funktionsnamen können nicht als 
Parameternamen benutze
 #, c-format
 msgid "function `%s': can't use special variable `%s' as a function parameter"
 msgstr ""
-"Funktion »%s«: die spezielle Variable »%s« kann nicht als Parameter 
verwendet "
-"werden"
+"Funktion »%s«: die spezielle Variable »%s« kann nicht als Parameter "
+"verwendet werden"
 
 #: awkgram.y:4244
 #, c-format
@@ -559,7 +559,8 @@ msgstr ""
 #, c-format
 msgid "fflush: cannot flush: file `%s' opened for reading, not writing"
 msgstr ""
-"fflush: Leeren der Puffer nicht möglich, Datei »%s« ist nur zum Lesen 
geöffnet"
+"fflush: Leeren der Puffer nicht möglich, Datei »%s« ist nur zum Lesen "
+"geöffnet"
 
 #: builtin.c:239
 #, c-format
@@ -2471,7 +2472,8 @@ msgstr "%s: Die Option »-W %s« erfordert ein Argument\n"
 #: io.c:347
 #, c-format
 msgid "command line argument `%s' is a directory: skipped"
-msgstr "das Kommandozeilen-Argument »%s« ist ein Verzeichnis: wird 
übersprungen"
+msgstr ""
+"das Kommandozeilen-Argument »%s« ist ein Verzeichnis: wird übersprungen"
 
 #: io.c:350 io.c:463
 #, c-format
@@ -2570,8 +2572,8 @@ msgstr "»close« für eine Umlenkung, die nie geöffnet 
wurde"
 #, c-format
 msgid "close: redirection `%s' not opened with `|&', second argument ignored"
 msgstr ""
-"close: Umlenkung »%s« wurde nicht mit »[&« geöffnet, das zweite Argument 
wird "
-"ignoriert"
+"close: Umlenkung »%s« wurde nicht mit »[&« geöffnet, das zweite Argument 
"
+"wird ignoriert"
 
 #: io.c:1167
 #, c-format
@@ -3344,12 +3346,14 @@ msgstr "redir2str: unbekannter Umlenkungstyp %d"
 #: re.c:568
 #, c-format
 msgid "range of the form `[%c-%c]' is locale dependent"
-msgstr "Ein Bereich in der Form »[%c-%c]« ist abhängig von der gesetzten 
Locale"
+msgstr ""
+"Ein Bereich in der Form »[%c-%c]« ist abhängig von der gesetzten Locale"
 
 #: re.c:595
 #, c-format
 msgid "regexp component `%.*s' should probably be `[%.*s]'"
-msgstr "Regulärer-Ausdruck-Komponente »%.*s« sollte wahrscheinlich 
»[%.*s]« sein"
+msgstr ""
+"Regulärer-Ausdruck-Komponente »%.*s« sollte wahrscheinlich »[%.*s]« sein"
 
 #: regcomp.c:131
 msgid "Success"
diff --git a/po/es.gmo b/po/es.gmo
index 724c033..4d2a440 100644
Binary files a/po/es.gmo and b/po/es.gmo differ
diff --git a/po/es.po b/po/es.po
index 760230c..020a6f9 100644
--- a/po/es.po
+++ b/po/es.po
@@ -11,10 +11,10 @@ msgstr ""
 "PO-Revision-Date: 2012-01-30 07:42-0600\n"
 "Last-Translator: Cristian Othón Martínez Vera <address@hidden>\n"
 "Language-Team: Spanish <address@hidden>\n"
+"Language: es\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Language: es\n"
 
 #: array.c:252
 #, c-format
@@ -2194,21 +2194,6 @@ msgstr "sqrt: se llamó con el argumento negativo %g"
 msgid "chr: called with no arguments"
 msgstr "sqrt: se llamó con el argumento negativo %g"
 
-#: ext.c:86
-#, fuzzy, c-format
-msgid ""
-"extension: library `%s': does not define `plugin_is_GPL_compatible' (%s)\n"
-msgstr ""
-"fatal: extension: la biblioteca `%s': no define `plugin_is_GPL_compatible' (%"
-"s)\n"
-
-#: ext.c:91
-#, fuzzy, c-format
-msgid "extension: library `%s': cannot call function `%s' (%s)\n"
-msgstr ""
-"fatal: extension: la biblioteca `%s': no puede llamar a la función `%s' (%"
-"s)\n"
-
 #: extension/ordchr.c:111
 #, fuzzy
 msgid "chr: called with inappropriate argument(s)"
@@ -2702,8 +2687,8 @@ msgstr "falló al cerrar la entrada estándar en el hijo 
(%s)"
 #, c-format
 msgid "moving slave pty to stdin in child failed (dup: %s)"
 msgstr ""
-"falló el movimiento del pty esclavo a la entrada estándar en el hijo (dup: 
%"
-"s)"
+"falló el movimiento del pty esclavo a la entrada estándar en el hijo (dup: "
+"%s)"
 
 #: io.c:1860 io.c:1881
 #, c-format
@@ -3421,6 +3406,19 @@ msgstr "No hay una expresión regular previa"
 msgid "can not pop main context"
 msgstr ""
 
+#, fuzzy
+#~ msgid ""
+#~ "extension: library `%s': does not define `plugin_is_GPL_compatible' (%s)\n"
+#~ msgstr ""
+#~ "fatal: extension: la biblioteca `%s': no define "
+#~ "`plugin_is_GPL_compatible' (%s)\n"
+
+#, fuzzy
+#~ msgid "extension: library `%s': cannot call function `%s' (%s)\n"
+#~ msgstr ""
+#~ "fatal: extension: la biblioteca `%s': no puede llamar a la función `"
+#~ "%s' (%s)\n"
+
 #~ msgid "`%s' is a Bell Labs extension"
 #~ msgstr "`%s' es una extensión de Bell Labs"
 
diff --git a/po/fi.gmo b/po/fi.gmo
index 27e7bb6..e4f06fd 100644
Binary files a/po/fi.gmo and b/po/fi.gmo differ
diff --git a/po/fi.po b/po/fi.po
index f18f6c2..30060ad 100644
--- a/po/fi.po
+++ b/po/fi.po
@@ -11,10 +11,10 @@ msgstr ""
 "PO-Revision-Date: 2012-03-13 18:00+0200\n"
 "Last-Translator: Jorma Karvonen <address@hidden>\n"
 "Language-Team: Finnish <address@hidden>\n"
+"Language: fi\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Language: fi\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #: array.c:252

http://git.sv.gnu.org/cgit/gawk.git/commit/?id=d1d9b0cd1308eee945e121e81fe15458459e2791

commit d1d9b0cd1308eee945e121e81fe15458459e2791
Author: Arnold D. Robbins <address@hidden>
Date:   Tue Dec 18 10:09:01 2012 +0200

    Move some files to automake 1.12.6.

diff --git a/extension/Makefile.in b/extension/Makefile.in
index 98eb337..e0bb243 100644
--- a/extension/Makefile.in
+++ b/extension/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.12.4 from Makefile.am.
+# Makefile.in generated by automake 1.12.6 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994-2012 Free Software Foundation, Inc.
diff --git a/extension/aclocal.m4 b/extension/aclocal.m4
index 4358745..2a6afed 100644
--- a/extension/aclocal.m4
+++ b/extension/aclocal.m4
@@ -1,4 +1,4 @@
-# generated automatically by aclocal 1.12.4 -*- Autoconf -*-
+# generated automatically by aclocal 1.12.6 -*- Autoconf -*-
 
 # Copyright (C) 1996-2012 Free Software Foundation, Inc.
 
@@ -34,7 +34,7 @@ AC_DEFUN([AM_AUTOMAKE_VERSION],
 [am__api_version='1.12'
 dnl Some users find AM_AUTOMAKE_VERSION and mistake it for a way to
 dnl require some minimum version.  Point them to the right macro.
-m4_if([$1], [1.12.4], [],
+m4_if([$1], [1.12.6], [],
       [AC_FATAL([Do not call $0, use AM_INIT_AUTOMAKE([$1]).])])dnl
 ])
 
@@ -50,7 +50,7 @@ m4_define([_AM_AUTOCONF_VERSION], [])
 # Call AM_AUTOMAKE_VERSION and AM_AUTOMAKE_VERSION so they can be traced.
 # This function is AC_REQUIREd by AM_INIT_AUTOMAKE.
 AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION],
-[AM_AUTOMAKE_VERSION([1.12.4])dnl
+[AM_AUTOMAKE_VERSION([1.12.6])dnl
 m4_ifndef([AC_AUTOCONF_VERSION],
   [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl
 _AM_AUTOCONF_VERSION(m4_defn([AC_AUTOCONF_VERSION]))])

-----------------------------------------------------------------------

Summary of changes:
 ChangeLog             |    5 +++++
 awkgram.c             |    2 ++
 awkgram.y             |    2 ++
 extension/Makefile.in |    2 +-
 extension/aclocal.m4  |    6 +++---
 po/da.gmo             |  Bin 42510 -> 42403 bytes
 po/da.po              |   16 ++++++++--------
 po/de.gmo             |  Bin 45483 -> 45483 bytes
 po/de.po              |   26 +++++++++++++++-----------
 po/es.gmo             |  Bin 44848 -> 44848 bytes
 po/es.po              |   34 ++++++++++++++++------------------
 po/fi.gmo             |  Bin 45158 -> 45158 bytes
 po/fi.po              |    2 +-
 13 files changed, 53 insertions(+), 42 deletions(-)


hooks/post-receive
-- 
gawk