mc and gettext 0.11

["Andrew V. Samoilov" <sav it efp com ua>]

Hi!

Here is a patch for CVS version of mc.
It fixes .gmo files generation with gettext 0.11 and newer.
As far as I understand we need po/Makevars.in to configure
config.sub location, but now I have not time to do it.

--
Regards,
Andrew V. Samoilov.

Index: autogen.sh
===================================================================
RCS file: /cvs/gnome/mc/autogen.sh,v
retrieving revision 1.33
diff -u -r1.33 autogen.sh
--- autogen.sh	12 Apr 2002 11:02:48 -0000	1.33
+++ autogen.sh	19 Apr 2002 06:56:46 -0000
@@ -24,16 +24,27 @@
   exit 1
 fi
 
-if test $gettext_ver -ge 01100; then
-  GETTEXTIZE_ARGS='--intl --no-changelog'
-fi
-
 rm -rf intl
-$GETTEXTIZE $GETTEXTIZE_ARGS --copy --force >tmpout || exit 1
-
-if test -e po/ChangeLog~; then
-  rm -f po/ChangeLog
-  mv po/ChangeLog~ po/ChangeLog
+if test $gettext_ver -ge 01100; then
+  $GETTEXTIZE --copy --force --intl --no-changelog >tmpout || exit 1
+  if test -e Makefile.am~; then
+     rm -rf Makefile.am
+     mv Makefile.am~ Makefile.am
+  fi
+  if test -e configure.in~ ; then
+    rm -rf configure.in
+    mv configure.in~ configure.in
+  fi
+  # Does we need po/Makevars.in and family for gettext 0.11 ?
+  if test ! -e po/Makevars; then
+    mv Makevars.template Makevars
+  fi
+else
+  $GETTEXTIZE --copy --force >tmpout || exit 1
+  if test -e po/ChangeLog~; then
+    rm -f po/ChangeLog
+    mv po/ChangeLog~ po/ChangeLog
+  fi
 fi
 
 if test ! -d config; then
Index: configure.in
===================================================================
RCS file: /cvs/gnome/mc/configure.in,v
retrieving revision 1.259
diff -u -r1.259 configure.in
--- configure.in	26 Mar 2002 13:55:42 -0000	1.259
+++ configure.in	19 Apr 2002 06:56:51 -0000
@@ -53,6 +53,9 @@
 ALL_LINGUAS="az bg ca cs da de el es es_ES eu fi fr hu it ja ko lv nl no pl pt pt_BR ro ru sk sl sv uk ta tr wa zh_CN zh_TW"
 fi
 
+dnl These three lines for gettext-0.11
+CATALOGS='$(GMOFILES)'
+AC_SUBST(CATALOGS)
+
 dnl
 dnl Internationalization
 dnl