X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;f=m4%2Fgettext.m4;h=3c68b52b5d522e233523c0d968cd5c62deb82809;hb=d9bb1ae90d7f678142b0654701cc061aa70eb9ca;hp=84a466cae6db456f639a90b59f2ab3d7598011c0;hpb=2e7840e90b33e3faaaa1a57c1c593df2a25ec94d;p=gnulib.git

diff --git a/m4/gettext.m4 b/m4/gettext.m4
index 84a466cae..3c68b52b5 100644
--- a/m4/gettext.m4
+++ b/m4/gettext.m4
@@ -6,7 +6,7 @@
 # but which still want to provide support for the GNU gettext functionality.
 # Please note that the actual code is *not* freely available.
 
-# serial 107
+# serial 109
 
 AC_PREREQ(2.13)               dnl Minimum Autoconf version required.
 
@@ -160,7 +160,7 @@ AC_DEFUN(AM_WITH_NLS,
       # Clean out junk possibly left behind by a previous configuration.
       rm -f intl/libintl.h
     fi
-    AC_LINK_FILES($nls_cv_header_libgt, $nls_cv_header_intl)
+    AC_CONFIG_LINKS($nls_cv_header_intl:$nls_cv_header_libgt)
     AC_OUTPUT_COMMANDS(
      [case "$CONFIG_FILES" in *po/Makefile.in*)
         sed -e "/POTFILES =/r po/POTFILES" po/Makefile.in > po/Makefile
@@ -286,7 +286,7 @@ strdup __argz_count __argz_stringify __argz_next])
 
    dnl If the AC_CONFIG_AUX_DIR macro for autoconf is used we possibly
    dnl find the mkinstalldirs script in another subdir but ($top_srcdir).
-   dnl Try to locate is.
+   dnl Try to locate it.
    MKINSTALLDIRS=
    if test -n "$ac_aux_dir"; then
      MKINSTALLDIRS="$ac_aux_dir/mkinstalldirs"
@@ -303,16 +303,14 @@ strdup __argz_count __argz_stringify __argz_next])
    dnl Generate list of files to be processed by xgettext which will
    dnl be included in po/Makefile.
    test -d po || mkdir po
-   changequote(, )dnl
    case "$srcdir" in
-   .) 
+   .)
      posrcprefix="../" ;;
-   /* | [A-Za-z]:*)
+   /* | [[A-Za-z]]:*)
      posrcprefix="$srcdir/" ;;
    *)
      posrcprefix="../$srcdir/" ;;
    esac
-   changequote([, ])dnl
    rm -f po/POTFILES
    sed -e "/^#/d" -e "/^\$/d" -e "s,.*,	$posrcprefix& \\\\," -e "\$s/\(.*\) \\\\/\1/" \
 	< $srcdir/po/POTFILES.in > po/POTFILES