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.

diff --git a/ChangeLog b/ChangeLog
index 06f3ad213d9031d78c042cfa556992fe9ea2be91..c31c0907b71697f1176478ffe340d57c366c6c21 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2014-12-10  Daiki Ueno  <ueno@gnu.org>
+
+       * autogen.sh: Copy intl.m4 and po.m4 to gettext-tools, if Gnulib's
+       version are older.
+
 2014-12-10  Daiki Ueno  <ueno@gnu.org>
 
        * THANKS: Add contributors since 0.18.2.

diff --git a/autogen.sh b/autogen.sh
index 403df3b5ad955bd706986f735facf1a4729efae1..b11e32323e094a7da826202257acbdb167c7311b 100755 (executable)
--- 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..."