--- gettext.m4.pre-fix	Mon Jun 11 21:23:18 2001
+++ gettext.m4	Mon Jun 11 21:49:37 2001
@@ -66,11 +66,15 @@
           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
+          # Autoconf 2.50 provides $srcdir and $top_srcdir.
+          : ${ac_given_srcdir=$srcdir}
+          if test "x$top_srcdir" = x; then
+            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
+	  fi
           if test -f "$ac_given_srcdir/$ac_dir/POTFILES.in"; then
             rm -f "$ac_dir/POTFILES"
             echo creating "$ac_dir/POTFILES"
@@ -155,7 +159,8 @@
     AC_SUBST(GENCAT)
   ])

-# Usage: Just like AM_WITH_NLS, which see.
+# AM_WITH_NLS([TOOLSYMBOL], [NEEDSYMBOL], [LIBDIR])
+# -------------------------------------------------
 AC_DEFUN([AM_GNU_GETTEXT],
   [AC_REQUIRE([AC_PROG_MAKE_SET])dnl
    AC_REQUIRE([AC_PROG_CC])dnl