From e68a1504f845fe2664dffbd044d17e469cc216f3 Mon Sep 17 00:00:00 2001 From: Daiki Ueno Date: Wed, 10 Dec 2014 12:30:07 +0900 Subject: autogen.sh: Copy intl.m4 and po.m4 * autogen.sh: Copy intl.m4 and po.m4 to gettext-tools, if Gnulib's version are older. --- ChangeLog | 5 +++++ autogen.sh | 13 +++++++++++++ 2 files changed, 18 insertions(+) diff --git a/ChangeLog b/ChangeLog index 06f3ad2..c31c090 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,10 @@ 2014-12-10 Daiki Ueno + * autogen.sh: Copy intl.m4 and po.m4 to gettext-tools, if Gnulib's + version are older. + +2014-12-10 Daiki Ueno + * THANKS: Add contributors since 0.18.2. 2014-12-03 Daiki Ueno diff --git a/autogen.sh b/autogen.sh index 403df3b..b11e323 100755 --- a/autogen.sh +++ b/autogen.sh @@ -444,6 +444,19 @@ cp -p gettext-runtime/po/en@quot.header gettext-tools/po/en@quot.header cp -p gettext-runtime/po/en@boldquot.header gettext-tools/po/en@boldquot.header cp -p gettext-runtime/po/insert-header.sin gettext-tools/po/insert-header.sin cp -p gettext-runtime/po/remove-potcdate.sin gettext-tools/po/remove-potcdate.sin +# Those two files might be newer than Gnulib's. +sed_extract_serial='s/^#.* serial \([^ ]*\).*/\1/p +1q' +for file in intl.m4 po.m4; do + existing_serial=`sed -n -e "$sed_extract_serial" < "gettext-tools/gnulib-m4/$file"` + gettext_serial=`sed -n -e "$sed_extract_serial" < "gettext-runtime/m4/$file"` + if test -n "$existing_serial" && test -n "$gettext_serial" \ + && test "$existing_serial" -ge "$gettext_serial" 2> /dev/null; then + : + else + cp -p "gettext-runtime/m4/$file" "gettext-tools/gnulib-m4/$file" + fi +done (cd gettext-tools echo "$0: generating configure in gettext-tools..." -- cgit v1.1