From 5c4d937af8f48f44beb6cd411efb9ef7c20c9517 Mon Sep 17 00:00:00 2001 From: Jean-Marc Lasgouttes Date: Tue, 13 Sep 2005 13:53:42 +0000 Subject: [PATCH] do not require gawk (bug 1980) git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@10440 a592a061-630c-0410-9148-cb99ea01b6c8 --- ChangeLog | 5 +++++ configure.ac | 3 ++- po/ChangeLog | 5 +++++ po/Makefile.in.in | 8 ++++---- 4 files changed, 16 insertions(+), 5 deletions(-) diff --git a/ChangeLog b/ChangeLog index fda139334e..c3b82ddc9a 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2005-09-12 Jean-Marc Lasgouttes + + * configure.ac: check for AWK and use --posix option if we found + gawk. (bug 1980) + 2005-07-18 Lars Gullik Bjønnes * configure.ac: version back to 1.4.0cvs diff --git a/configure.ac b/configure.ac index db689d8fae..d2395492c5 100644 --- 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 5151bc3bae..a43dfcfa84 100644 --- a/po/ChangeLog +++ b/po/ChangeLog @@ -1,3 +1,8 @@ +2005-09-12 Jean-Marc Lasgouttes + + * Makefile.in.in: when invoking awk, use POSIX regexps only. + (bug 1980) + 2005-09-08 Martin Vermeer * he.po: move enum, appendix counter functionality here diff --git a/po/Makefile.in.in b/po/Makefile.in.in index b2795cab81..09d11ff9d2 100644 --- 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); \ }' \ -- 2.39.2