AM_GNU_GETTEXT working with autoconf 2.50

[karl]

The diff I sent before for AM_GNU_GETTEXT to work with autoconf 2.50
was incomplete.  Here's another version.  I haven't tried all cases, but
automake's make distcheck works now, so it's an improvement.

A real patch will probably need to detect whether it is being installed
into autoconf 2.50 or earlier, and conditionalize the code.  But I hope
this will help someone.

To recap, the basic problem being solved here is that ac_given_srcdir is
no longer set in config.status, so AM_WITH_NLS fails to create
po/POTFILES and po/Makefile.

Thanks,
karl


*** /usr/local/gnu/share/aclocal/ORIG/gettext.m4        Thu May 17 06:35:37 2001
--- /usr/local/gnu/share/aclocal/gettext.m4     Fri Jun  8 17:17:40 2001
***************
*** 177,197 ****
          esac
          # PO directories have a Makefile.in generated from Makefile.in.in.
          case "$ac_file" in */Makefile.in)
!           # Adjust a relative srcdir.
!           ac_dir=`echo "$ac_file"|sed 's%/[^/][^/]*$%%'`
!           ac_dir_suffix="/`echo "$ac_dir"|sed 's%^\./%%'`"
!           ac_dots=`echo "$ac_dir_suffix"|sed 's%/[^/]*%../%g'`
!           case "$ac_given_srcdir" in
!             .)  top_srcdir=`echo $ac_dots|sed 's%/$%%'` ;;
!             /*) top_srcdir="$ac_given_srcdir" ;;
!             *)  top_srcdir="$ac_dots$ac_given_srcdir" ;;
!           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
            ;;
          esac
--- 177,202 ----
          esac
          # PO directories have a Makefile.in generated from Makefile.in.in.
          case "$ac_file" in */Makefile.in)
!           # ac_dir is set to the last thing in the output list here,
!           # not necessarily the po.
!           po_dir=`echo "$ac_file"|sed 's%/[^/][^/]*$%%'`
!           # ac_top_srcdir has been computed assuming that we are in a
!           # subdirectory, but the po stuff is running at the top level.
!           if echo "$ac_top_srcdir" | grep /. >/dev/null; then
!             po_top_srcdir=`echo "$ac_top_srcdir"|sed 's%/[^/][^/]*$%%'`
!           elif test "$ac_top_srcdir" = .; then
!             po_top_srcdir=.  # po stuff at top level
!           elif test "$ac_top_srcdir" = ..; then
!             po_top_srcdir=.  # po stuff one level down
!           else
!             po_top_srcdir="$ac_top_srcdir/.."
!           fi
!           if test -f "$po_top_srcdir/$po_dir/POTFILES.in"; then
!             rm -f "$po_dir/POTFILES"
!             echo $as_me: creating "$po_dir/POTFILES"
!             sed -e "/^#/d" -e "/^[    ]*\$/d" -e "s,.*,     $po_top_srcdir/& 
\\\\," -e "\$s/\(.*\) \\\\/\1/" < "$po_top_srcdir/$po_dir/POTFILES.in" > 
"$po_dir/POTFILES"
!             echo $as_me: creating "$po_dir/Makefile"
!             sed -e "/POTFILES =/r $ac_dir/POTFILES" "$po_dir/Makefile.in" > 
"$po_dir/Makefile"
            fi
            ;;
          esac

Diff finished at Sat Jun  9 06:07:28