2005-07-27  Stepan Kasal  <address@hidden>

	* gettext-runtime/m4/gettext.m4 (AM_GNU_GETTEXT, AM_INTL_SUBDIR):
	Don't use changequote, add pairs of quotes instead.
	* gettext-runtime/m4/po.m4 (AM_POSTPROCESS_PO_MAKEFILE): Likewise.

Index: gettext-runtime/m4/gettext.m4
===================================================================
RCS file: /cvs/gettext/gettext/gettext-runtime/m4/gettext.m4,v
retrieving revision 1.36
diff -u -r1.36 gettext.m4
--- gettext-runtime/m4/gettext.m4	25 Jul 2005 18:55:37 -0000	1.36
+++ gettext-runtime/m4/gettext.m4	27 Jul 2005 11:06:37 -0000
@@ -133,9 +133,7 @@
 [#ifndef __GNU_GETTEXT_SUPPORTED_REVISION
 #define __GNU_GETTEXT_SUPPORTED_REVISION(major) ((major) == 0 ? 0 : -1)
 #endif
-changequote(,)dnl
-typedef int array [2 * (__GNU_GETTEXT_SUPPORTED_REVISION(0) >= 1) - 1];
-changequote([,])dnl
+typedef int array [[2 * (__GNU_GETTEXT_SUPPORTED_REVISION(0) >= 1) - 1]];
 ], [])[extern int _nl_msg_cat_cntr;
 extern int *_nl_domain_bindings;],
             [bindtextdomain ("", "");
@@ -165,9 +163,7 @@
 [#ifndef __GNU_GETTEXT_SUPPORTED_REVISION
 #define __GNU_GETTEXT_SUPPORTED_REVISION(major) ((major) == 0 ? 0 : -1)
 #endif
-changequote(,)dnl
-typedef int array [2 * (__GNU_GETTEXT_SUPPORTED_REVISION(0) >= 1) - 1];
-changequote([,])dnl
+typedef int array [[2 * (__GNU_GETTEXT_SUPPORTED_REVISION(0) >= 1) - 1]];
 ], [])[extern int _nl_msg_cat_cntr;
 extern
 #ifdef __cplusplus
@@ -186,9 +182,7 @@
 [#ifndef __GNU_GETTEXT_SUPPORTED_REVISION
 #define __GNU_GETTEXT_SUPPORTED_REVISION(major) ((major) == 0 ? 0 : -1)
 #endif
-changequote(,)dnl
-typedef int array [2 * (__GNU_GETTEXT_SUPPORTED_REVISION(0) >= 1) - 1];
-changequote([,])dnl
+typedef int array [[2 * (__GNU_GETTEXT_SUPPORTED_REVISION(0) >= 1) - 1]];
 ], [])[extern int _nl_msg_cat_cntr;
 extern
 #ifdef __cplusplus
@@ -514,15 +508,13 @@
   else
     dnl Found it, now check the version.
     AC_MSG_CHECKING([version of bison])
-changequote(<<,>>)dnl
-    ac_prog_version=`$INTLBISON --version 2>&1 | sed -n 's/^.*GNU Bison.* \([0-9]*\.[0-9.]*\).*$/\1/p'`
+    [ac_prog_version=`$INTLBISON --version 2>&1 | sed -n 's/^.*GNU Bison.* \([0-9]*\.[0-9.]*\).*$/\1/p'`
     case $ac_prog_version in
       '') ac_prog_version="v. ?.??, bad"; ac_verc_fail=yes;;
       1.2[6-9]* | 1.[3-9][0-9]* | [2-9].*)
-changequote([,])dnl
          ac_prog_version="$ac_prog_version, ok"; ac_verc_fail=no;;
       *) ac_prog_version="$ac_prog_version, bad"; ac_verc_fail=yes;;
-    esac
+    esac]
     AC_MSG_RESULT([$ac_prog_version])
   fi
   if test $ac_verc_fail = yes; then
Index: gettext-runtime/m4/po.m4
===================================================================
RCS file: /cvs/gettext/gettext/gettext-runtime/m4/po.m4,v
retrieving revision 1.13
diff -u -r1.13 po.m4
--- gettext-runtime/m4/po.m4	4 May 2005 10:56:47 -0000	1.13
+++ gettext-runtime/m4/po.m4	27 Jul 2005 11:06:37 -0000
@@ -216,11 +216,10 @@
   # - LINGUAS is the value of the environment variable LINGUAS at configure
   #   time.
 
-changequote(,)dnl
   # Adjust a relative srcdir.
-  ac_dir=`echo "$ac_file"|sed 's%/[^/][^/]*$%%'`
+  [ac_dir=`echo "$ac_file"|sed 's%/[^/][^/]*$%%'`
   ac_dir_suffix="/`echo "$ac_dir"|sed 's%^\./%%'`"
-  ac_dots=`echo "$ac_dir_suffix"|sed 's%/[^/]*%../%g'`
+  ac_dots=`echo "$ac_dir_suffix"|sed 's%/[^/]*%../%g'`]
   # In autoconf-2.13 it is called $ac_given_srcdir.
   # In autoconf-2.50 it is called $srcdir.
   test -n "$ac_given_srcdir" || ac_given_srcdir="$srcdir"
@@ -247,7 +246,7 @@
   fi
 
   # A sed script that extracts the value of VARIABLE from a Makefile.
-  sed_x_variable='
+  sed_x_variable=['
 # Test if the hold space is empty.
 x
 s/P/P/
@@ -282,8 +281,7 @@
 s/^.*$/P/
 x
 :d
-'
-changequote([,])dnl
+']
 
   # Set POTFILES to the value of the Makefile variable POTFILES.
   sed_x_POTFILES="`$gt_echo \"$sed_x_variable\" | sed -e '/^ *#/d' -e 's/VARIABLE/POTFILES/g'`"