1.1 --- a/aclocal.m4	Sat Mar 13 00:03:32 2004 +0000
     1.2 +++ b/aclocal.m4	Sun Dec 11 05:15:36 2005 +0000
     1.3 @@ -1092,7 +1092,7 @@
     1.4  
     1.5  
     1.6  # Copyright (C) 1995-2002 Free Software Foundation, Inc.
     1.7 -# Copyright (C) 2001-2003 Red Hat, Inc.
     1.8 +# Copyright (C) 2001-2003,2004 Red Hat, Inc.
     1.9  #
    1.10  # This file is free software, distributed under the terms of the GNU
    1.11  # General Public License.  As a special exception to the GNU General
    1.12 @@ -1115,7 +1115,9 @@
    1.13  #
    1.14  # Added better handling of ALL_LINGUAS from GNU gettext version 
    1.15  # written by Bruno Haible, Owen Taylor <otaylor.redhat.com> 5/30/3002
    1.16 -
    1.17 +#
    1.18 +# Modified to require ngettext
    1.19 +# Matthias Clasen <mclasen@redhat.com> 08/06/2004
    1.20  #
    1.21  # We need this here as well, since someone might use autoconf-2.5x
    1.22  # to configure GLib then an older version to configure a package
    1.23 @@ -1208,16 +1210,27 @@
    1.24        #
    1.25        # First check in libc
    1.26        #
    1.27 -      AC_CACHE_CHECK([for dgettext in libc], gt_cv_func_dgettext_libc,
    1.28 +      AC_CACHE_CHECK([for ngettext in libc], gt_cv_func_ngettext_libc,
    1.29          [AC_TRY_LINK([
    1.30  #include <libintl.h>
    1.31  ],
    1.32 -          [return (int) dgettext ("","")],
    1.33 -	  gt_cv_func_dgettext_libc=yes,
    1.34 -          gt_cv_func_dgettext_libc=no)
    1.35 +         [return !ngettext ("","", 1)],
    1.36 +	  gt_cv_func_ngettext_libc=yes,
    1.37 +          gt_cv_func_ngettext_libc=no)
    1.38          ])
    1.39    
    1.40 -      if test "$gt_cv_func_dgettext_libc" = "yes" ; then
    1.41 +      if test "$gt_cv_func_ngettext_libc" = "yes" ; then
    1.42 +	      AC_CACHE_CHECK([for dgettext in libc], gt_cv_func_dgettext_libc,
    1.43 +        	[AC_TRY_LINK([
    1.44 +#include <libintl.h>
    1.45 +],
    1.46 +	          [return !dgettext ("","")],
    1.47 +		  gt_cv_func_dgettext_libc=yes,
    1.48 +	          gt_cv_func_dgettext_libc=no)
    1.49 +        	])
    1.50 +      fi
    1.51 +  
    1.52 +      if test "$gt_cv_func_ngettext_libc" = "yes" ; then
    1.53          AC_CHECK_FUNCS(bind_textdomain_codeset)
    1.54        fi
    1.55  
    1.56 @@ -1225,25 +1238,29 @@
    1.57        # If we don't have everything we want, check in libintl
    1.58        #
    1.59        if test "$gt_cv_func_dgettext_libc" != "yes" \
    1.60 +	 || test "$gt_cv_func_ngettext_libc" != "yes" \
    1.61           || test "$ac_cv_func_bind_textdomain_codeset" != "yes" ; then
    1.62          
    1.63          AC_CHECK_LIB(intl, bindtextdomain,
    1.64 -	    [AC_CHECK_LIB(intl, dgettext,
    1.65 -		          gt_cv_func_dgettext_libintl=yes)])
    1.66 +	    [AC_CHECK_LIB(intl, ngettext,
    1.67 +		    [AC_CHECK_LIB(intl, dgettext,
    1.68 +			          gt_cv_func_dgettext_libintl=yes)])])
    1.69  
    1.70  	if test "$gt_cv_func_dgettext_libintl" != "yes" ; then
    1.71  	  AC_MSG_CHECKING([if -liconv is needed to use gettext])
    1.72  	  AC_MSG_RESULT([])
    1.73 -          AC_CHECK_LIB(intl, dcgettext,
    1.74 +  	  AC_CHECK_LIB(intl, ngettext,
    1.75 +          	[AC_CHECK_LIB(intl, dcgettext,
    1.76  		       [gt_cv_func_dgettext_libintl=yes
    1.77  			libintl_extra_libs=-liconv],
    1.78 -			:,-liconv)
    1.79 +			:,-liconv)],
    1.80 +		:,-liconv)
    1.81          fi
    1.82  
    1.83          #
    1.84          # If we found libintl, then check in it for bind_textdomain_codeset();
    1.85          # we'll prefer libc if neither have bind_textdomain_codeset(),
    1.86 -        # and both have dgettext
    1.87 +        # and both have dgettext and ngettext
    1.88          #
    1.89          if test "$gt_cv_func_dgettext_libintl" = "yes" ; then
    1.90            glib_save_LIBS="$LIBS"
    1.91 @@ -1255,7 +1272,8 @@
    1.92            if test "$ac_cv_func_bind_textdomain_codeset" = "yes" ; then
    1.93              gt_cv_func_dgettext_libc=no
    1.94            else
    1.95 -            if test "$gt_cv_func_dgettext_libc" = "yes"; then
    1.96 +            if test "$gt_cv_func_dgettext_libc" = "yes" \
    1.97 +		&& test "$gt_cv_func_ngettext_libc" = "yes"; then
    1.98                gt_cv_func_dgettext_libintl=no
    1.99              fi
   1.100            fi
   1.101 @@ -1370,7 +1388,7 @@
   1.102  # on various variables needed by the Makefile.in.in installed by 
   1.103  # glib-gettextize.
   1.104  dnl
   1.105 -glib_DEFUN(GLIB_GNU_GETTEXT,
   1.106 +glib_DEFUN([GLIB_GNU_GETTEXT],
   1.107    [AC_REQUIRE([AC_PROG_CC])dnl
   1.108     AC_REQUIRE([AC_HEADER_STDC])dnl
   1.109     
   1.110 @@ -1447,7 +1465,7 @@
   1.111  # -------------------------------
   1.112  # Define VARIABLE to the location where catalog files will
   1.113  # be installed by po/Makefile.
   1.114 -glib_DEFUN(GLIB_DEFINE_LOCALEDIR,
   1.115 +glib_DEFUN([GLIB_DEFINE_LOCALEDIR],
   1.116  [glib_REQUIRE([GLIB_GNU_GETTEXT])dnl
   1.117  glib_save_prefix="$prefix"
   1.118  glib_save_exec_prefix="$exec_prefix"
   1.119 @@ -1468,7 +1486,7 @@
   1.120  dnl Now the definitions that aclocal will find
   1.121  dnl
   1.122  ifdef(glib_configure_in,[],[
   1.123 -AC_DEFUN(AM_GLIB_GNU_GETTEXT,[GLIB_GNU_GETTEXT($@)])
   1.124 -AC_DEFUN(AM_GLIB_DEFINE_LOCALEDIR,[GLIB_DEFINE_LOCALEDIR($@)])
   1.125 +AC_DEFUN([AM_GLIB_GNU_GETTEXT],[GLIB_GNU_GETTEXT($@)])
   1.126 +AC_DEFUN([AM_GLIB_DEFINE_LOCALEDIR],[GLIB_DEFINE_LOCALEDIR($@)])
   1.127  ])dnl
   1.128