do not require gawk (bug 1980)

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@10440 a592a061-630c-0410-9148-cb99ea01b6c8

diff --git a/ChangeLog b/ChangeLog
index fda139334e4c716dd0e40623bfecf67ff183dbf1..c3b82ddc9a8ac1dd7bdf525f5f00b6402425344c 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2005-09-12  Jean-Marc Lasgouttes  <lasgouttes@lyx.org>
+
+       * configure.ac: check for AWK and use --posix option if we found
+       gawk. (bug 1980)
+
 2005-07-18  Lars Gullik Bjønnes  <larsbj@lyx.org>
 
        * configure.ac: version back to 1.4.0cvs 

diff --git a/configure.ac b/configure.ac
index db689d8fae088c029939851b3731b2da2d6837cc..d2395492c562620ae0dd63a6c91659828a2eec6b 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -31,7 +31,8 @@ done
 AC_PROG_MAKE_SET
 AC_PROG_INSTALL
 
-AC_SUBST(AWK,[gawk])
+AC_PROG_AWK
+test "$AWK" = gawk && AWK="gawk --posix"
 
 #AC_PROG_RANLIB
 AC_CHECK_PROG(KPSEWHICH, kpsewhich, kpsewhich, :)

diff --git a/po/ChangeLog b/po/ChangeLog
index 5151bc3bae4b41e3cb386d04d67d5cb957493aad..a43dfcfa8429041d49302bb8ce45796069115cc5 100644 (file)
--- a/po/ChangeLog
+++ b/po/ChangeLog
@@ -1,3 +1,8 @@
+2005-09-12  Jean-Marc Lasgouttes  <lasgouttes@lyx.org>
+
+       * Makefile.in.in: when invoking awk, use POSIX regexps only. 
+       (bug 1980)
+
 2005-09-08  Martin Vermeer  <martin.vermeer@hut.fi>
 
        * he.po: move enum, appendix counter functionality here

diff --git a/po/Makefile.in.in b/po/Makefile.in.in
index b2795cab813cc5803b5356f9e39c661c51597958..09d11ff9d222781e0b52ea20b06607a94453107c 100644 (file)
--- a/po/Makefile.in.in
+++ b/po/Makefile.in.in
@@ -446,8 +446,8 @@ layouts_l10n.pot: $(top_srcdir)/lib/layouts/*.layout $(top_srcdir)/lib/layouts/*
                /LabelString[A-Za-z]*/ { \
                        line=$$0; \
                        sub(/[[:space:]]*LabelString[A-Za-z]*[[:space:]]*/, "", line); \
-                       gsub(/"/, "", line); \
-                       gsub(/\\/, "\\\\", line); \
+                       gsub(/\"/, "", line); \
+                       gsub(/\/, "\\\\", line); \
                        if (line != "") \
                          printf("#: %s:%d\nmsgid \"%s\"\nmsgstr \"\"\n\n", \
                                 fixupfilename(), FNR, line); \
@@ -455,14 +455,14 @@ layouts_l10n.pot: $(top_srcdir)/lib/layouts/*.layout $(top_srcdir)/lib/layouts/*
                /GuiName/ { \
                        line=$$0; \
                        sub(/[[:space:]]*GuiName[[:space:]]*/, "", line); \
-                       gsub(/"/, "", line); \
+                       gsub(/\"/, "", line); \
                        printf("#: %s:%d\nmsgid \"%s\"\nmsgstr \"\"\n\n", \
                                fixupfilename(), FNR, line); \
                } \
                /ListName/ { \
                        line=$$0; \
                        sub(/[[:space:]]*ListName[[:space:]]*/, "", line); \
-                       gsub(/"/, "", line); \
+                       gsub(/\"/, "", line); \
                        printf("#: %s:%d\nmsgid \"%s\"\nmsgstr \"\"\n\n", \
                                fixupfilename(), FNR, line); \
                }' \