Re: gettext.m4 ac2.50

[Bruno Haible]

Golubev I. N. writes:
> Version: 0.10.38
> 
> `gettext.m4' is incompatible with autoconf-2.50.  `AC_OUTPUT_COMMANDS'
> >from  it assume sh var names from 2.13, and they are different in 2.50.
> Is there an updated version of `gettext.m4'

This patch makes gettext.m4 compatible with autoconf-2.50.

Bruno


*** gettext-0.10.38/m4/gettext.m4.bak   Thu May 17 15:35:37 2001
--- gettext-0.10.38/m4/gettext.m4       Thu Jun 14 20:16:44 2001
***************
*** 181,186 ****
--- 196,204 ----
            ac_dir=`echo "$ac_file"|sed 's%/[^/][^/]*$%%'`
            ac_dir_suffix="/`echo "$ac_dir"|sed 's%^\./%%'`"
            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"
            case "$ac_given_srcdir" in
              .)  top_srcdir=`echo $ac_dots|sed 's%/$%%'` ;;
              /*) top_srcdir="$ac_given_srcdir" ;;
***************
*** 188,196 ****
            esac
            if test -f "$ac_given_srcdir/$ac_dir/POTFILES.in"; then
              rm -f "$ac_dir/POTFILES"
!             echo creating "$ac_dir/POTFILES"
              sed -e "/^#/d" -e "/^[    ]*\$/d" -e "s,.*,     $top_srcdir/& 
\\\\," -e "\$s/\(.*\) \\\\/\1/" < "$ac_given_srcdir/$ac_dir/POTFILES.in" > 
"$ac_dir/POTFILES"
!             echo creating "$ac_dir/Makefile"
              sed -e "/POTFILES =/r $ac_dir/POTFILES" "$ac_dir/Makefile.in" > 
"$ac_dir/Makefile"
            fi
            ;;
--- 206,214 ----
            esac
            if test -f "$ac_given_srcdir/$ac_dir/POTFILES.in"; then
              rm -f "$ac_dir/POTFILES"
!             test -n "$as_me" && echo "$as_me: creating $ac_dir/POTFILES" || 
echo "creating $ac_dir/POTFILES"
              sed -e "/^#/d" -e "/^[    ]*\$/d" -e "s,.*,     $top_srcdir/& 
\\\\," -e "\$s/\(.*\) \\\\/\1/" < "$ac_given_srcdir/$ac_dir/POTFILES.in" > 
"$ac_dir/POTFILES"
!             test -n "$as_me" && echo "$as_me: creating $ac_dir/Makefile" || 
echo "creating $ac_dir/Makefile"
              sed -e "/POTFILES =/r $ac_dir/POTFILES" "$ac_dir/Makefile.in" > 
"$ac_dir/Makefile"
            fi
            ;;