Fixes for compilation on Solaris (#59026, Frank Belew)

Tue Sep 18 18:23:02 2001  Owen Taylor  <otaylor@redhat.com>

        Fixes for compilation on Solaris (#59026, Frank Belew)

        * glib/gqsort.c (g_qsort_with_data): Use g_alloca().

        * glib/giochannel.c (g_io_channel_read_to_end): Fix use
        of ternary on left-hand-side.

        * configure.in: Handle the ac_cv_working_alloca_h variable
        set by autoconf-2.5x.

Tue Sep 11 18:50:44 2001  Owen Taylor  <otaylor@redhat.com>

        * m4macros/glib-gettext.m4 acinclude.m4: Remove commented
        out sections for clarity.

diff --git a/ChangeLog b/ChangeLog
index 0333c60..031942d 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,20 @@
+Tue Sep 18 18:23:02 2001  Owen Taylor  <otaylor@redhat.com>
+
+       Fixes for compilation on Solaris (#59026, Frank Belew)
+
+       * glib/gqsort.c (g_qsort_with_data): Use g_alloca().
+
+       * glib/giochannel.c (g_io_channel_read_to_end): Fix use
+       of ternary on left-hand-side.
+
+       * configure.in: Handle the ac_cv_working_alloca_h variable
+       set by autoconf-2.5x.
+
+Tue Sep 11 18:50:44 2001  Owen Taylor  <otaylor@redhat.com>
+
+       * m4macros/glib-gettext.m4 acinclude.m4: Remove commented
+       out sections for clarity.
+

 Tue Sep 18 18:19:33 2001  Tim Janik  <timj@gtk.org>
 
        * tests/testglib.c: add simple test for g_path_get_basename().
 Tue Sep 18 18:19:33 2001  Tim Janik  <timj@gtk.org>
 
        * tests/testglib.c: add simple test for g_path_get_basename().

diff --git a/ChangeLog.pre-2-0 b/ChangeLog.pre-2-0
index 0333c60..031942d 100644 (file)
--- a/ChangeLog.pre-2-0
+++ b/ChangeLog.pre-2-0
@@ -1,3 +1,20 @@
+Tue Sep 18 18:23:02 2001  Owen Taylor  <otaylor@redhat.com>
+
+       Fixes for compilation on Solaris (#59026, Frank Belew)
+
+       * glib/gqsort.c (g_qsort_with_data): Use g_alloca().
+
+       * glib/giochannel.c (g_io_channel_read_to_end): Fix use
+       of ternary on left-hand-side.
+
+       * configure.in: Handle the ac_cv_working_alloca_h variable
+       set by autoconf-2.5x.
+
+Tue Sep 11 18:50:44 2001  Owen Taylor  <otaylor@redhat.com>
+
+       * m4macros/glib-gettext.m4 acinclude.m4: Remove commented
+       out sections for clarity.
+

 Tue Sep 18 18:19:33 2001  Tim Janik  <timj@gtk.org>
 
        * tests/testglib.c: add simple test for g_path_get_basename().
 Tue Sep 18 18:19:33 2001  Tim Janik  <timj@gtk.org>
 
        * tests/testglib.c: add simple test for g_path_get_basename().

diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index 0333c60..031942d 100644 (file)
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,3 +1,20 @@
+Tue Sep 18 18:23:02 2001  Owen Taylor  <otaylor@redhat.com>
+
+       Fixes for compilation on Solaris (#59026, Frank Belew)
+
+       * glib/gqsort.c (g_qsort_with_data): Use g_alloca().
+
+       * glib/giochannel.c (g_io_channel_read_to_end): Fix use
+       of ternary on left-hand-side.
+
+       * configure.in: Handle the ac_cv_working_alloca_h variable
+       set by autoconf-2.5x.
+
+Tue Sep 11 18:50:44 2001  Owen Taylor  <otaylor@redhat.com>
+
+       * m4macros/glib-gettext.m4 acinclude.m4: Remove commented
+       out sections for clarity.
+

 Tue Sep 18 18:19:33 2001  Tim Janik  <timj@gtk.org>
 
        * tests/testglib.c: add simple test for g_path_get_basename().
 Tue Sep 18 18:19:33 2001  Tim Janik  <timj@gtk.org>
 
        * tests/testglib.c: add simple test for g_path_get_basename().

diff --git a/ChangeLog.pre-2-12 b/ChangeLog.pre-2-12
index 0333c60..031942d 100644 (file)
--- a/ChangeLog.pre-2-12
+++ b/ChangeLog.pre-2-12
@@ -1,3 +1,20 @@
+Tue Sep 18 18:23:02 2001  Owen Taylor  <otaylor@redhat.com>
+
+       Fixes for compilation on Solaris (#59026, Frank Belew)
+
+       * glib/gqsort.c (g_qsort_with_data): Use g_alloca().
+
+       * glib/giochannel.c (g_io_channel_read_to_end): Fix use
+       of ternary on left-hand-side.
+
+       * configure.in: Handle the ac_cv_working_alloca_h variable
+       set by autoconf-2.5x.
+
+Tue Sep 11 18:50:44 2001  Owen Taylor  <otaylor@redhat.com>
+
+       * m4macros/glib-gettext.m4 acinclude.m4: Remove commented
+       out sections for clarity.
+

 Tue Sep 18 18:19:33 2001  Tim Janik  <timj@gtk.org>
 
        * tests/testglib.c: add simple test for g_path_get_basename().
 Tue Sep 18 18:19:33 2001  Tim Janik  <timj@gtk.org>
 
        * tests/testglib.c: add simple test for g_path_get_basename().

diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2
index 0333c60..031942d 100644 (file)
--- a/ChangeLog.pre-2-2
+++ b/ChangeLog.pre-2-2
@@ -1,3 +1,20 @@
+Tue Sep 18 18:23:02 2001  Owen Taylor  <otaylor@redhat.com>
+
+       Fixes for compilation on Solaris (#59026, Frank Belew)
+
+       * glib/gqsort.c (g_qsort_with_data): Use g_alloca().
+
+       * glib/giochannel.c (g_io_channel_read_to_end): Fix use
+       of ternary on left-hand-side.
+
+       * configure.in: Handle the ac_cv_working_alloca_h variable
+       set by autoconf-2.5x.
+
+Tue Sep 11 18:50:44 2001  Owen Taylor  <otaylor@redhat.com>
+
+       * m4macros/glib-gettext.m4 acinclude.m4: Remove commented
+       out sections for clarity.
+

 Tue Sep 18 18:19:33 2001  Tim Janik  <timj@gtk.org>
 
        * tests/testglib.c: add simple test for g_path_get_basename().
 Tue Sep 18 18:19:33 2001  Tim Janik  <timj@gtk.org>
 
        * tests/testglib.c: add simple test for g_path_get_basename().

diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4
index 0333c60..031942d 100644 (file)
--- a/ChangeLog.pre-2-4
+++ b/ChangeLog.pre-2-4
@@ -1,3 +1,20 @@
+Tue Sep 18 18:23:02 2001  Owen Taylor  <otaylor@redhat.com>
+
+       Fixes for compilation on Solaris (#59026, Frank Belew)
+
+       * glib/gqsort.c (g_qsort_with_data): Use g_alloca().
+
+       * glib/giochannel.c (g_io_channel_read_to_end): Fix use
+       of ternary on left-hand-side.
+
+       * configure.in: Handle the ac_cv_working_alloca_h variable
+       set by autoconf-2.5x.
+
+Tue Sep 11 18:50:44 2001  Owen Taylor  <otaylor@redhat.com>
+
+       * m4macros/glib-gettext.m4 acinclude.m4: Remove commented
+       out sections for clarity.
+

 Tue Sep 18 18:19:33 2001  Tim Janik  <timj@gtk.org>
 
        * tests/testglib.c: add simple test for g_path_get_basename().
 Tue Sep 18 18:19:33 2001  Tim Janik  <timj@gtk.org>
 
        * tests/testglib.c: add simple test for g_path_get_basename().

diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6
index 0333c60..031942d 100644 (file)
--- a/ChangeLog.pre-2-6
+++ b/ChangeLog.pre-2-6
@@ -1,3 +1,20 @@
+Tue Sep 18 18:23:02 2001  Owen Taylor  <otaylor@redhat.com>
+
+       Fixes for compilation on Solaris (#59026, Frank Belew)
+
+       * glib/gqsort.c (g_qsort_with_data): Use g_alloca().
+
+       * glib/giochannel.c (g_io_channel_read_to_end): Fix use
+       of ternary on left-hand-side.
+
+       * configure.in: Handle the ac_cv_working_alloca_h variable
+       set by autoconf-2.5x.
+
+Tue Sep 11 18:50:44 2001  Owen Taylor  <otaylor@redhat.com>
+
+       * m4macros/glib-gettext.m4 acinclude.m4: Remove commented
+       out sections for clarity.
+

 Tue Sep 18 18:19:33 2001  Tim Janik  <timj@gtk.org>
 
        * tests/testglib.c: add simple test for g_path_get_basename().
 Tue Sep 18 18:19:33 2001  Tim Janik  <timj@gtk.org>
 
        * tests/testglib.c: add simple test for g_path_get_basename().

diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index 0333c60..031942d 100644 (file)
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -1,3 +1,20 @@
+Tue Sep 18 18:23:02 2001  Owen Taylor  <otaylor@redhat.com>
+
+       Fixes for compilation on Solaris (#59026, Frank Belew)
+
+       * glib/gqsort.c (g_qsort_with_data): Use g_alloca().
+
+       * glib/giochannel.c (g_io_channel_read_to_end): Fix use
+       of ternary on left-hand-side.
+
+       * configure.in: Handle the ac_cv_working_alloca_h variable
+       set by autoconf-2.5x.
+
+Tue Sep 11 18:50:44 2001  Owen Taylor  <otaylor@redhat.com>
+
+       * m4macros/glib-gettext.m4 acinclude.m4: Remove commented
+       out sections for clarity.
+

 Tue Sep 18 18:19:33 2001  Tim Janik  <timj@gtk.org>
 
        * tests/testglib.c: add simple test for g_path_get_basename().
 Tue Sep 18 18:19:33 2001  Tim Janik  <timj@gtk.org>
 
        * tests/testglib.c: add simple test for g_path_get_basename().

diff --git a/acinclude.m4 b/acinclude.m4
index 5ef4d33..583b7b8 100644 (file)
--- a/acinclude.m4
+++ b/acinclude.m4
@@ -32,13 +32,6 @@ AC_DEFUN(AM_GLIB_WITH_NLS,
 
     dnl If we use NLS figure out what method
     if test "$USE_NLS" = "yes"; then
 
     dnl If we use NLS figure out what method
     if test "$USE_NLS" = "yes"; then

-#      AC_DEFINE(ENABLE_NLS)
-#      AC_MSG_CHECKING([whether included gettext is requested])
-#      AC_ARG_WITH(included-gettext,
-#        [  --with-included-gettext use the GNU gettext library included here],
-#        nls_cv_force_use_gnu_gettext=$withval,
-#        nls_cv_force_use_gnu_gettext=no)
-#      AC_MSG_RESULT($nls_cv_force_use_gnu_gettext)

       nls_cv_force_use_gnu_gettext="no"
 
       nls_cv_use_gnu_gettext="$nls_cv_force_use_gnu_gettext"
       nls_cv_force_use_gnu_gettext="no"
 
       nls_cv_use_gnu_gettext="$nls_cv_force_use_gnu_gettext"


@@ -98,42 +91,6 @@ AC_DEFUN(AM_GLIB_WITH_NLS,
            fi
        ])
 
            fi
        ])
 

-#        if test "$CATOBJEXT" = "NONE"; then
-#        AC_MSG_CHECKING([whether catgets can be used])
-#        AC_ARG_WITH(catgets,
-#          [  --with-catgets          use catgets functions if available],
-#          nls_cv_use_catgets=$withval, nls_cv_use_catgets=no)
-#        AC_MSG_RESULT($nls_cv_use_catgets)
-#
-#        if test "$nls_cv_use_catgets" = "yes"; then
-#          dnl No gettext in C library.  Try catgets next.
-#          AC_CHECK_LIB(i, main)
-#          AC_CHECK_FUNC(catgets,
-#            [AC_DEFINE(HAVE_CATGETS)
-#             INTLOBJS="\$(CATOBJS)"
-#             AC_PATH_PROG(GENCAT, gencat, no)dnl
-#             if test "$GENCAT" != "no"; then
-#               AC_PATH_PROG(GMSGFMT, gmsgfmt, no)
-#               if test "$GMSGFMT" = "no"; then
-#                 AM_PATH_PROG_WITH_TEST(GMSGFMT, msgfmt,
-#                  [test -z "`$ac_dir/$ac_word -h 2>&1 | grep 'dv '`"], no)
-#               fi
-#               AM_PATH_PROG_WITH_TEST(XGETTEXT, xgettext,
-#                 [test -z "`$ac_dir/$ac_word -h 2>&1 | grep '(HELP)'`"], :)
-#               USE_INCLUDED_LIBINTL=yes
-#               CATOBJEXT=.cat
-#               INSTOBJEXT=.cat
-#               DATADIRNAME=lib
-#               INTLDEPS='$(top_builddir)/intl/libintl.a'
-#               INTLLIBS=$INTLDEPS
-#               LIBS=`echo $LIBS | sed -e 's/-lintl//'`
-#               nls_cv_header_intl=intl/libintl.h
-#               nls_cv_header_libgt=intl/libgettext.h
-#              fi
-#            ])
-#        fi
-#        fi
-

         if test "$CATOBJEXT" = "NONE"; then
          dnl Neither gettext nor catgets in included in the C library.
          dnl Fall back on GNU gettext library.
         if test "$CATOBJEXT" = "NONE"; then
          dnl Neither gettext nor catgets in included in the C library.
          dnl Fall back on GNU gettext library.


@@ -146,23 +103,6 @@ AC_DEFUN(AM_GLIB_WITH_NLS,
       else
          dnl Unset this variable since we use the non-zero value as a flag.
          CATOBJEXT=
       else
          dnl Unset this variable since we use the non-zero value as a flag.
          CATOBJEXT=

-#        dnl Mark actions used to generate GNU NLS library.
-#        INTLOBJS="\$(GETTOBJS)"
-#        AM_PATH_PROG_WITH_TEST(MSGFMT, msgfmt,
-#        [test -z "`$ac_dir/$ac_word -h 2>&1 | grep 'dv '`"], msgfmt)
-#        AC_PATH_PROG(GMSGFMT, gmsgfmt, $MSGFMT)
-#        AM_PATH_PROG_WITH_TEST(XGETTEXT, xgettext,
-#        [test -z "`$ac_dir/$ac_word -h 2>&1 | grep '(HELP)'`"], :)
-#        AC_SUBST(MSGFMT)
-#      USE_INCLUDED_LIBINTL=yes
-#        CATOBJEXT=.gmo
-#        INSTOBJEXT=.mo
-#        DATADIRNAME=share
-#      INTLDEPS='$(top_builddir)/intl/libintl.a'
-#      INTLLIBS=$INTLDEPS
-#      LIBS=`echo $LIBS | sed -e 's/-lintl//'`
-#        nls_cv_header_intl=intl/libintl.h
-#        nls_cv_header_libgt=intl/libgettext.h

       fi
 
       dnl Test whether we really found GNU xgettext.
       fi
 
       dnl Test whether we really found GNU xgettext.


@@ -182,23 +122,12 @@ AC_DEFUN(AM_GLIB_WITH_NLS,
       POSUB=po
     else
       DATADIRNAME=share
       POSUB=po
     else
       DATADIRNAME=share

-#      nls_cv_header_intl=intl/libintl.h
-#      nls_cv_header_libgt=intl/libgettext.h

     fi
     fi

-#    AC_LINK_FILES($nls_cv_header_libgt, $nls_cv_header_intl)

     AC_OUTPUT_COMMANDS(
      [case "$CONFIG_FILES" in *po/Makefile.in*)
         sed -e "/POTFILES =/r po/POTFILES" po/Makefile.in > po/Makefile
       esac])
 
     AC_OUTPUT_COMMANDS(
      [case "$CONFIG_FILES" in *po/Makefile.in*)
         sed -e "/POTFILES =/r po/POTFILES" po/Makefile.in > po/Makefile
       esac])
 

-
-#    # If this is used in GNU gettext we have to set USE_NLS to `yes'
-#    # because some of the sources are only built for this goal.
-#    if test "$PACKAGE" = gettext; then
-#      USE_NLS=yes
-#      USE_INCLUDED_LIBINTL=yes
-#    fi
-

     dnl These rules are solely for the distribution goal.  While doing this
     dnl we only have to keep exactly one list of the available catalogs
     dnl in configure.in.
     dnl These rules are solely for the distribution goal.  While doing this
     dnl we only have to keep exactly one list of the available catalogs
     dnl in configure.in.


@@ -225,7 +154,6 @@ AC_DEFUN(AM_GLIB_GNU_GETTEXT,
   [AC_REQUIRE([AC_PROG_MAKE_SET])dnl
    AC_REQUIRE([AC_PROG_CC])dnl
    AC_REQUIRE([AC_PROG_RANLIB])dnl
   [AC_REQUIRE([AC_PROG_MAKE_SET])dnl
    AC_REQUIRE([AC_PROG_CC])dnl
    AC_REQUIRE([AC_PROG_RANLIB])dnl

-#   AC_REQUIRE([AC_ISC_POSIX])dnl

    AC_REQUIRE([AC_HEADER_STDC])dnl
    AC_REQUIRE([AC_C_CONST])dnl
    AC_REQUIRE([AC_C_INLINE])dnl
    AC_REQUIRE([AC_HEADER_STDC])dnl
    AC_REQUIRE([AC_C_CONST])dnl
    AC_REQUIRE([AC_C_INLINE])dnl


@@ -239,13 +167,6 @@ unistd.h sys/param.h])
    AC_CHECK_FUNCS([getcwd munmap putenv setenv setlocale strchr strcasecmp \
 strdup __argz_count __argz_stringify __argz_next])
 
    AC_CHECK_FUNCS([getcwd munmap putenv setenv setlocale strchr strcasecmp \
 strdup __argz_count __argz_stringify __argz_next])
 

-#   if test "${ac_cv_func_stpcpy+set}" != "set"; then
-#     AC_CHECK_FUNCS(stpcpy)
-#   fi
-#   if test "${ac_cv_func_stpcpy}" = "yes"; then
-#     AC_DEFINE(HAVE_STPCPY)
-#   fi
-

    AM_LC_MESSAGES
    AM_GLIB_WITH_NLS
 
    AM_LC_MESSAGES
    AM_GLIB_WITH_NLS
 


@@ -270,17 +191,6 @@ strdup __argz_count __argz_stringify __argz_next])
      fi
    fi
 
      fi
    fi
 

-#   dnl The reference to <locale.h> in the installed <libintl.h> file
-#   dnl must be resolved because we cannot expect the users of this
-#   dnl to define HAVE_LOCALE_H.
-#   if test $ac_cv_header_locale_h = yes; then
-#     INCLUDE_LOCALE_H="#include <locale.h>"
-#   else
-#     INCLUDE_LOCALE_H="\
-#/* The system does not provide the header <locale.h>.  Take care yourself.  */"
-#   fi
-#   AC_SUBST(INCLUDE_LOCALE_H)
-

    dnl Determine which catalog format we have (if any is needed)
    dnl For now we know about two different formats:
    dnl   Linux libc-5 and the normal X/Open format
    dnl Determine which catalog format we have (if any is needed)
    dnl For now we know about two different formats:
    dnl   Linux libc-5 and the normal X/Open format


@@ -296,19 +206,6 @@ strdup __argz_count __argz_stringify __argz_next])
    sed -e '/^#.*[^\\]$/d' -e '/^#$/d' \
      $srcdir/po/po2tbl.sed.in > po/po2tbl.sed
 
    sed -e '/^#.*[^\\]$/d' -e '/^#$/d' \
      $srcdir/po/po2tbl.sed.in > po/po2tbl.sed
 

-#   dnl In the intl/Makefile.in we have a special dependency which makes
-#   dnl only sense for gettext.  We comment this out for non-gettext
-#   dnl packages.
-#   if test "$PACKAGE" = "gettext"; then
-#     GT_NO="#NO#"
-#     GT_YES=
-#   else
-#     GT_NO=
-#     GT_YES="#YES#"
-#   fi
-#   AC_SUBST(GT_NO)
-#   AC_SUBST(GT_YES)
-

    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 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.


@@ -321,10 +218,6 @@ strdup __argz_count __argz_stringify __argz_next])
    fi
    AC_SUBST(MKINSTALLDIRS)
 
    fi
    AC_SUBST(MKINSTALLDIRS)
 

-#   dnl *** For now the libtool support in intl/Makefile is not for real.
-#   l=
-#   AC_SUBST(l)
-

    dnl Generate list of files to be processed by xgettext which will
    dnl be included in po/Makefile.
    test -d po || mkdir po
    dnl Generate list of files to be processed by xgettext which will
    dnl be included in po/Makefile.
    test -d po || mkdir po

diff --git a/configure.in b/configure.in
index 649dd8e..0ff6449 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -1837,7 +1837,11 @@ esac
 # on variable expansion in case labels.  Look at the generated config.status
 # for a hint.
 
 # on variable expansion in case labels.  Look at the generated config.status
 # for a hint.
 

-glib_header_alloca_h="$ac_cv_header_alloca_h"
+if test "x${ac_cv_working_alloca_h+set}" = xset ; then
+  glib_header_alloca_h="$ac_cv_working_alloca_h"
+else
+  glib_header_alloca_h="$ac_cv_header_alloca_h"
+fi

 
 case xyes in
 x$ac_cv_header_float_h)
 
 case xyes in
 x$ac_cv_header_float_h)

diff --git a/glib/giochannel.c b/glib/giochannel.c
index 80bc797..50bd8e9 100644 (file)
--- a/glib/giochannel.c
+++ b/glib/giochannel.c
@@ -1670,8 +1670,10 @@ g_io_channel_read_to_end (GIOChannel     *channel,
       else
         g_string_free (USE_BUF (channel), TRUE);
 
       else
         g_string_free (USE_BUF (channel), TRUE);
 

-      /* This only works because USE_BUF () is a macro */
-      USE_BUF (channel) = NULL;
+      if (channel->encoding)
+       channel->encoded_read_buf = NULL;
+      else
+       channel->read_buf = NULL;

     }
 
   return G_IO_STATUS_NORMAL;
     }
 
   return G_IO_STATUS_NORMAL;

diff --git a/glib/gqsort.c b/glib/gqsort.c
index a100735..040be79 100644 (file)
--- a/glib/gqsort.c
+++ b/glib/gqsort.c
@@ -117,7 +117,7 @@ g_qsort_with_data (gconstpointer    pbase,
   /* Allocating SIZE bytes for a pivot buffer facilitates a better
    * algorithm below since we can do comparisons directly on the pivot.
    */
   /* Allocating SIZE bytes for a pivot buffer facilitates a better
    * algorithm below since we can do comparisons directly on the pivot.
    */

-  char *pivot_buffer = (char *) alloca (size);
+  char *pivot_buffer = (char *) g_alloca (size);

   const size_t max_thresh = MAX_THRESH * size;
 
   g_return_if_fail (total_elems > 0);
   const size_t max_thresh = MAX_THRESH * size;
 
   g_return_if_fail (total_elems > 0);

diff --git a/m4macros/glib-gettext.m4 b/m4macros/glib-gettext.m4
index 5ef4d33..583b7b8 100644 (file)
--- a/m4macros/glib-gettext.m4
+++ b/m4macros/glib-gettext.m4
@@ -32,13 +32,6 @@ AC_DEFUN(AM_GLIB_WITH_NLS,
 
     dnl If we use NLS figure out what method
     if test "$USE_NLS" = "yes"; then
 
     dnl If we use NLS figure out what method
     if test "$USE_NLS" = "yes"; then

-#      AC_DEFINE(ENABLE_NLS)
-#      AC_MSG_CHECKING([whether included gettext is requested])
-#      AC_ARG_WITH(included-gettext,
-#        [  --with-included-gettext use the GNU gettext library included here],
-#        nls_cv_force_use_gnu_gettext=$withval,
-#        nls_cv_force_use_gnu_gettext=no)
-#      AC_MSG_RESULT($nls_cv_force_use_gnu_gettext)

       nls_cv_force_use_gnu_gettext="no"
 
       nls_cv_use_gnu_gettext="$nls_cv_force_use_gnu_gettext"
       nls_cv_force_use_gnu_gettext="no"
 
       nls_cv_use_gnu_gettext="$nls_cv_force_use_gnu_gettext"


@@ -98,42 +91,6 @@ AC_DEFUN(AM_GLIB_WITH_NLS,
            fi
        ])
 
            fi
        ])
 

-#        if test "$CATOBJEXT" = "NONE"; then
-#        AC_MSG_CHECKING([whether catgets can be used])
-#        AC_ARG_WITH(catgets,
-#          [  --with-catgets          use catgets functions if available],
-#          nls_cv_use_catgets=$withval, nls_cv_use_catgets=no)
-#        AC_MSG_RESULT($nls_cv_use_catgets)
-#
-#        if test "$nls_cv_use_catgets" = "yes"; then
-#          dnl No gettext in C library.  Try catgets next.
-#          AC_CHECK_LIB(i, main)
-#          AC_CHECK_FUNC(catgets,
-#            [AC_DEFINE(HAVE_CATGETS)
-#             INTLOBJS="\$(CATOBJS)"
-#             AC_PATH_PROG(GENCAT, gencat, no)dnl
-#             if test "$GENCAT" != "no"; then
-#               AC_PATH_PROG(GMSGFMT, gmsgfmt, no)
-#               if test "$GMSGFMT" = "no"; then
-#                 AM_PATH_PROG_WITH_TEST(GMSGFMT, msgfmt,
-#                  [test -z "`$ac_dir/$ac_word -h 2>&1 | grep 'dv '`"], no)
-#               fi
-#               AM_PATH_PROG_WITH_TEST(XGETTEXT, xgettext,
-#                 [test -z "`$ac_dir/$ac_word -h 2>&1 | grep '(HELP)'`"], :)
-#               USE_INCLUDED_LIBINTL=yes
-#               CATOBJEXT=.cat
-#               INSTOBJEXT=.cat
-#               DATADIRNAME=lib
-#               INTLDEPS='$(top_builddir)/intl/libintl.a'
-#               INTLLIBS=$INTLDEPS
-#               LIBS=`echo $LIBS | sed -e 's/-lintl//'`
-#               nls_cv_header_intl=intl/libintl.h
-#               nls_cv_header_libgt=intl/libgettext.h
-#              fi
-#            ])
-#        fi
-#        fi
-

         if test "$CATOBJEXT" = "NONE"; then
          dnl Neither gettext nor catgets in included in the C library.
          dnl Fall back on GNU gettext library.
         if test "$CATOBJEXT" = "NONE"; then
          dnl Neither gettext nor catgets in included in the C library.
          dnl Fall back on GNU gettext library.


@@ -146,23 +103,6 @@ AC_DEFUN(AM_GLIB_WITH_NLS,
       else
          dnl Unset this variable since we use the non-zero value as a flag.
          CATOBJEXT=
       else
          dnl Unset this variable since we use the non-zero value as a flag.
          CATOBJEXT=

-#        dnl Mark actions used to generate GNU NLS library.
-#        INTLOBJS="\$(GETTOBJS)"
-#        AM_PATH_PROG_WITH_TEST(MSGFMT, msgfmt,
-#        [test -z "`$ac_dir/$ac_word -h 2>&1 | grep 'dv '`"], msgfmt)
-#        AC_PATH_PROG(GMSGFMT, gmsgfmt, $MSGFMT)
-#        AM_PATH_PROG_WITH_TEST(XGETTEXT, xgettext,
-#        [test -z "`$ac_dir/$ac_word -h 2>&1 | grep '(HELP)'`"], :)
-#        AC_SUBST(MSGFMT)
-#      USE_INCLUDED_LIBINTL=yes
-#        CATOBJEXT=.gmo
-#        INSTOBJEXT=.mo
-#        DATADIRNAME=share
-#      INTLDEPS='$(top_builddir)/intl/libintl.a'
-#      INTLLIBS=$INTLDEPS
-#      LIBS=`echo $LIBS | sed -e 's/-lintl//'`
-#        nls_cv_header_intl=intl/libintl.h
-#        nls_cv_header_libgt=intl/libgettext.h

       fi
 
       dnl Test whether we really found GNU xgettext.
       fi
 
       dnl Test whether we really found GNU xgettext.


@@ -182,23 +122,12 @@ AC_DEFUN(AM_GLIB_WITH_NLS,
       POSUB=po
     else
       DATADIRNAME=share
       POSUB=po
     else
       DATADIRNAME=share

-#      nls_cv_header_intl=intl/libintl.h
-#      nls_cv_header_libgt=intl/libgettext.h

     fi
     fi

-#    AC_LINK_FILES($nls_cv_header_libgt, $nls_cv_header_intl)

     AC_OUTPUT_COMMANDS(
      [case "$CONFIG_FILES" in *po/Makefile.in*)
         sed -e "/POTFILES =/r po/POTFILES" po/Makefile.in > po/Makefile
       esac])
 
     AC_OUTPUT_COMMANDS(
      [case "$CONFIG_FILES" in *po/Makefile.in*)
         sed -e "/POTFILES =/r po/POTFILES" po/Makefile.in > po/Makefile
       esac])
 

-
-#    # If this is used in GNU gettext we have to set USE_NLS to `yes'
-#    # because some of the sources are only built for this goal.
-#    if test "$PACKAGE" = gettext; then
-#      USE_NLS=yes
-#      USE_INCLUDED_LIBINTL=yes
-#    fi
-

     dnl These rules are solely for the distribution goal.  While doing this
     dnl we only have to keep exactly one list of the available catalogs
     dnl in configure.in.
     dnl These rules are solely for the distribution goal.  While doing this
     dnl we only have to keep exactly one list of the available catalogs
     dnl in configure.in.


@@ -225,7 +154,6 @@ AC_DEFUN(AM_GLIB_GNU_GETTEXT,
   [AC_REQUIRE([AC_PROG_MAKE_SET])dnl
    AC_REQUIRE([AC_PROG_CC])dnl
    AC_REQUIRE([AC_PROG_RANLIB])dnl
   [AC_REQUIRE([AC_PROG_MAKE_SET])dnl
    AC_REQUIRE([AC_PROG_CC])dnl
    AC_REQUIRE([AC_PROG_RANLIB])dnl

-#   AC_REQUIRE([AC_ISC_POSIX])dnl

    AC_REQUIRE([AC_HEADER_STDC])dnl
    AC_REQUIRE([AC_C_CONST])dnl
    AC_REQUIRE([AC_C_INLINE])dnl
    AC_REQUIRE([AC_HEADER_STDC])dnl
    AC_REQUIRE([AC_C_CONST])dnl
    AC_REQUIRE([AC_C_INLINE])dnl


@@ -239,13 +167,6 @@ unistd.h sys/param.h])
    AC_CHECK_FUNCS([getcwd munmap putenv setenv setlocale strchr strcasecmp \
 strdup __argz_count __argz_stringify __argz_next])
 
    AC_CHECK_FUNCS([getcwd munmap putenv setenv setlocale strchr strcasecmp \
 strdup __argz_count __argz_stringify __argz_next])
 

-#   if test "${ac_cv_func_stpcpy+set}" != "set"; then
-#     AC_CHECK_FUNCS(stpcpy)
-#   fi
-#   if test "${ac_cv_func_stpcpy}" = "yes"; then
-#     AC_DEFINE(HAVE_STPCPY)
-#   fi
-

    AM_LC_MESSAGES
    AM_GLIB_WITH_NLS
 
    AM_LC_MESSAGES
    AM_GLIB_WITH_NLS
 


@@ -270,17 +191,6 @@ strdup __argz_count __argz_stringify __argz_next])
      fi
    fi
 
      fi
    fi
 

-#   dnl The reference to <locale.h> in the installed <libintl.h> file
-#   dnl must be resolved because we cannot expect the users of this
-#   dnl to define HAVE_LOCALE_H.
-#   if test $ac_cv_header_locale_h = yes; then
-#     INCLUDE_LOCALE_H="#include <locale.h>"
-#   else
-#     INCLUDE_LOCALE_H="\
-#/* The system does not provide the header <locale.h>.  Take care yourself.  */"
-#   fi
-#   AC_SUBST(INCLUDE_LOCALE_H)
-

    dnl Determine which catalog format we have (if any is needed)
    dnl For now we know about two different formats:
    dnl   Linux libc-5 and the normal X/Open format
    dnl Determine which catalog format we have (if any is needed)
    dnl For now we know about two different formats:
    dnl   Linux libc-5 and the normal X/Open format


@@ -296,19 +206,6 @@ strdup __argz_count __argz_stringify __argz_next])
    sed -e '/^#.*[^\\]$/d' -e '/^#$/d' \
      $srcdir/po/po2tbl.sed.in > po/po2tbl.sed
 
    sed -e '/^#.*[^\\]$/d' -e '/^#$/d' \
      $srcdir/po/po2tbl.sed.in > po/po2tbl.sed
 

-#   dnl In the intl/Makefile.in we have a special dependency which makes
-#   dnl only sense for gettext.  We comment this out for non-gettext
-#   dnl packages.
-#   if test "$PACKAGE" = "gettext"; then
-#     GT_NO="#NO#"
-#     GT_YES=
-#   else
-#     GT_NO=
-#     GT_YES="#YES#"
-#   fi
-#   AC_SUBST(GT_NO)
-#   AC_SUBST(GT_YES)
-

    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 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.


@@ -321,10 +218,6 @@ strdup __argz_count __argz_stringify __argz_next])
    fi
    AC_SUBST(MKINSTALLDIRS)
 
    fi
    AC_SUBST(MKINSTALLDIRS)
 

-#   dnl *** For now the libtool support in intl/Makefile is not for real.
-#   l=
-#   AC_SUBST(l)
-

    dnl Generate list of files to be processed by xgettext which will
    dnl be included in po/Makefile.
    test -d po || mkdir po
    dnl Generate list of files to be processed by xgettext which will
    dnl be included in po/Makefile.
    test -d po || mkdir po