Update from gettext.

Author: bhaible

ChangeLog

@@ -1,3 +1,8 @@
+2006-06-28  Bruno Haible  <bruno@clisp.org>
+
+        * m4/gettext.m4: Update from GNU gettext.
+        * m4/po.m4: Update from GNU gettext.
+
 2006-06-27  Bruno Haible  <bruno@clisp.org>
 
 	* Makefile.devel (AUTOCONF, AUTOHEADER): Use autoconf-2.60.

m4/gettext.m4

@@ -1,4 +1,4 @@
-# gettext.m4 serial 50 (gettext-0.15)
+# gettext.m4 serial 52 (gettext-0.15)
 dnl Copyright (C) 1995-2006 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
@@ -445,13 +445,6 @@ AC_DEFUN([AM_INTL_SUBDIR],
 #define __libc_lock_init                gl_lock_init
 #define __libc_lock_lock                gl_lock_lock
 #define __libc_lock_unlock              gl_lock_unlock
-#define __libc_rwlock_t                   gl_rwlock_t
-#define __libc_rwlock_define              gl_rwlock_define
-#define __libc_rwlock_define_initialized  gl_rwlock_define_initialized
-#define __libc_rwlock_init                gl_rwlock_init
-#define __libc_rwlock_rdlock              gl_rwlock_rdlock
-#define __libc_rwlock_wrlock              gl_rwlock_wrlock
-#define __libc_rwlock_unlock              gl_rwlock_unlock
 #define __libc_lock_recursive_t                   gl_recursive_lock_t
 #define __libc_lock_define_recursive              gl_recursive_lock_define
 #define __libc_lock_define_initialized_recursive  gl_recursive_lock_define_initialized
@@ -518,8 +511,8 @@ AC_DEFUN([gt_INTL_SUBDIR_CORE],
 
   AC_CHECK_HEADERS([argz.h limits.h unistd.h sys/param.h])
   AC_CHECK_FUNCS([getcwd getegid geteuid getgid getuid mempcpy munmap \
-    stpcpy strcasecmp strdup strtoul tsearch __argz_count __argz_stringify \
-    __argz_next __fsetlocking])
+    stpcpy strcasecmp strdup strtoul tsearch argz_count argz_stringify \
+    argz_next __fsetlocking])
 
   dnl Use the *_unlocked functions only if they are declared.
   dnl (because some of them were defined without being declared in Solaris

m4/po.m4

@@ -1,4 +1,4 @@
-# po.m4 serial 12 (gettext-0.15)
+# po.m4 serial 13 (gettext-0.15)
 dnl Copyright (C) 1995-2006 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
@@ -285,7 +285,7 @@ x
 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'`"
+  sed_x_POTFILES=`$gt_echo "$sed_x_variable" | sed -e '/^ *#/d' -e 's/VARIABLE/POTFILES/g'`
   POTFILES=`sed -n -e "$sed_x_POTFILES" < "$ac_file"`
   # Compute POTFILES_DEPS as
   #   $(foreach file, $(POTFILES), $(top_srcdir)/$(file))
@@ -304,7 +304,7 @@ changequote([,])dnl
     POMAKEFILEDEPS="$POMAKEFILEDEPS LINGUAS"
   else
     # Set ALL_LINGUAS to the value of the Makefile variable LINGUAS.
-    sed_x_LINGUAS="`$gt_echo \"$sed_x_variable\" | sed -e '/^ *#/d' -e 's/VARIABLE/LINGUAS/g'`"
+    sed_x_LINGUAS=`$gt_echo "$sed_x_variable" | sed -e '/^ *#/d' -e 's/VARIABLE/LINGUAS/g'`
     ALL_LINGUAS_=`sed -n -e "$sed_x_LINGUAS" < "$ac_file"`
   fi
   # Hide the ALL_LINGUAS assigment from automake < 1.5.