Re: patch to remove --disable-nls option from glib-gettext.m4

[Sven Neumann <sven gimp org>]

Hi,

Owen Taylor <otaylor redhat com> writes:

> > here's a patch that removes the possibility to disable NLS from
> > glib-gettext.m4 (and acinclude.m4). Disabling NLS is not 
> > supported and the configure option --disable-nls will only
> > confuse people. The patch is rather lengthy since I had to 
> > adjust indentations all over the place. Basically it changes
> > only a few lines at the top.
> 
> Can you regen the diff with 'cvs diff -wu' ?

sure.

Index: acinclude.m4
===================================================================
RCS file: /cvs/gnome/glib/acinclude.m4,v
retrieving revision 1.11
diff -u -p -w -u -r1.11 acinclude.m4
--- acinclude.m4	2001/12/06 22:37:03	1.11
+++ acinclude.m4	2002/01/16 16:43:06
@@ -20,18 +20,11 @@
 # serial 5
 
 AC_DEFUN(AM_GLIB_WITH_NLS,
-  [AC_MSG_CHECKING([whether NLS is requested])
-    dnl Default is enabled NLS
-    AC_ARG_ENABLE(nls,
-      [  --disable-nls           do not use Native Language Support],
-      USE_NLS=$enableval, USE_NLS=yes)
-    AC_MSG_RESULT($USE_NLS)
+  dnl NLS is obligatory
+  [USE_NLS=yes
     AC_SUBST(USE_NLS)
 
-    USE_INCLUDED_LIBINTL=no
-
-    dnl If we use NLS figure out what method
-    if test "$USE_NLS" = "yes"; then
+    dnl Figure out what method
       nls_cv_force_use_gnu_gettext="no"
 
       nls_cv_use_gnu_gettext="$nls_cv_force_use_gnu_gettext"
@@ -120,9 +113,7 @@ AC_DEFUN(AM_GLIB_WITH_NLS,
 
       # We need to process the po/ directory.
       POSUB=po
-    else
-      DATADIRNAME=share
-    fi
+
     AC_OUTPUT_COMMANDS(
      [case "$CONFIG_FILES" in *po/Makefile.in*)
         sed -e "/POTFILES =/r po/POTFILES" po/Makefile.in > po/Makefile
@@ -137,7 +128,6 @@ AC_DEFUN(AM_GLIB_WITH_NLS,
     done
 
     dnl Make all variables we use known to autoconf.
-    AC_SUBST(USE_INCLUDED_LIBINTL)
     AC_SUBST(CATALOGS)
     AC_SUBST(CATOBJEXT)
     AC_SUBST(DATADIRNAME)
@@ -234,6 +224,7 @@ strdup __argz_count __argz_stringify __a
    sed -e "/^#/d" -e "/^\$/d" -e "s,.*,	$posrcprefix& \\\\," -e "\$s/\(.*\) \\\\/\1/" \
 	< $srcdir/po/POTFILES.in > po/POTFILES
   ])
+
 
 dnl @synopsis AC_FUNC_VSNPRINTF_C99
 dnl
Index: configure.in
===================================================================
RCS file: /cvs/gnome/glib/configure.in,v
retrieving revision 1.259
diff -u -p -w -u -r1.259 configure.in
--- configure.in	2002/01/07 21:02:11	1.259
+++ configure.in	2002/01/16 16:43:06
@@ -1512,7 +1512,7 @@ dnl ***********************
 dnl *** Tests for iconv ***
 dnl ***********************
 
-AC_ARG_WITH(libiconv, [ --with-libiconv     Use the libiconv library ],,with_libiconv=maybe)
+AC_ARG_WITH(libiconv, [ --with-libiconv          use the libiconv library ],,with_libiconv=maybe)
 
 found_iconv=no
 
Index: m4macros/glib-gettext.m4
===================================================================
RCS file: /cvs/gnome/glib/m4macros/glib-gettext.m4,v
retrieving revision 1.3
diff -u -p -w -u -r1.3 glib-gettext.m4
--- m4macros/glib-gettext.m4	2001/09/18 22:28:32	1.3
+++ m4macros/glib-gettext.m4	2002/01/16 16:43:06
@@ -14,24 +14,17 @@
 # If you make changes to this file, you MUST update the copy in
 # acinclude.m4. [ aclocal dies on duplicate macros, so if
 # we run 'aclocal -I macros/' then we'll run into problems
-# once we've installed glib-gettext.m4 :-( ]
+# once we've installed glib-gettext.m4 ]
 #
 
 # serial 5
 
 AC_DEFUN(AM_GLIB_WITH_NLS,
-  [AC_MSG_CHECKING([whether NLS is requested])
-    dnl Default is enabled NLS
-    AC_ARG_ENABLE(nls,
-      [  --disable-nls           do not use Native Language Support],
-      USE_NLS=$enableval, USE_NLS=yes)
-    AC_MSG_RESULT($USE_NLS)
+  dnl NLS is obligatory
+  [USE_NLS=yes
     AC_SUBST(USE_NLS)
 
-    USE_INCLUDED_LIBINTL=no
-
-    dnl If we use NLS figure out what method
-    if test "$USE_NLS" = "yes"; then
+    dnl Figure out what method
       nls_cv_force_use_gnu_gettext="no"
 
       nls_cv_use_gnu_gettext="$nls_cv_force_use_gnu_gettext"
@@ -120,9 +113,7 @@ AC_DEFUN(AM_GLIB_WITH_NLS,
 
       # We need to process the po/ directory.
       POSUB=po
-    else
-      DATADIRNAME=share
-    fi
+
     AC_OUTPUT_COMMANDS(
      [case "$CONFIG_FILES" in *po/Makefile.in*)
         sed -e "/POTFILES =/r po/POTFILES" po/Makefile.in > po/Makefile
@@ -137,7 +128,6 @@ AC_DEFUN(AM_GLIB_WITH_NLS,
     done
 
     dnl Make all variables we use known to autoconf.
-    AC_SUBST(USE_INCLUDED_LIBINTL)
     AC_SUBST(CATALOGS)
     AC_SUBST(CATOBJEXT)
     AC_SUBST(DATADIRNAME)