From da6b4de729aa7220c844ea9fa8ba4c887fd3cb0f Mon Sep 17 00:00:00 2001
From: Daniel Caujolle-Bert <f1rmb@users.sourceforge.net>
Date: Wed, 31 Jul 2002 22:36:35 +0000
Subject: Okay, one step back about ngettext, it's no more required.

CVS patchset: 2375
CVS date: 2002/07/31 22:36:35
---
 configure.in               | 2 +-
 m4/gettext.m4              | 3 ++-
 src/xine-engine/xineintl.h | 5 ++++-
 3 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/configure.in b/configure.in
index 3192b99da..66744a02f 100644
--- a/configure.in
+++ b/configure.in
@@ -126,7 +126,7 @@ dnl NLS Support
 dnl
 dnl ALL_LINGUAS="cs da de el en@quot en@boldquot es et fr gl id it ja ko nl nn no pl pt pt_BR ru sl sv tr zh"
 ALL_LINGUAS="fr pt_BR de sk es pl_PL cs"
-AM_GNU_GETTEXT(use-libtool, need-ngettext)
+AM_GNU_GETTEXT(use-libtool)
 AC_LINK_FILES($nls_cv_header_libgt, $nls_cv_header_intl)
 AM_CONDITIONAL(INCLUDED_INTL, test x$USE_INCLUDED_LIBINTL = "xyes")
 if test x"$USE_INCLUDED_LIBINTL" = x"yes"; then
diff --git a/m4/gettext.m4 b/m4/gettext.m4
index bbb0e9c71..2f9825f2d 100644
--- a/m4/gettext.m4
+++ b/m4/gettext.m4
@@ -116,7 +116,8 @@ return (int) gettext ("")]ifelse([$2], need-ngettext, [ + (int) ngettext ("", ""
 
 	     gt_save_LIBS="$LIBS"
 	     LIBS="$LIBS $INTLLIBS"
-	     AC_CHECK_FUNCS(dcgettext)
+	     dnl Xine need ngettext.
+	     AC_CHECK_FUNCS(dcgettext ngettext)
 	     LIBS="$gt_save_LIBS"
 
 	     dnl Search for GNU msgfmt in the PATH.
diff --git a/src/xine-engine/xineintl.h b/src/xine-engine/xineintl.h
index 33f6694d6..14413dcd8 100644
--- a/src/xine-engine/xineintl.h
+++ b/src/xine-engine/xineintl.h
@@ -17,7 +17,7 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA
  *
- * $Id: xineintl.h,v 1.3 2002/07/31 07:06:04 f1rmb Exp $
+ * $Id: xineintl.h,v 1.4 2002/07/31 22:36:35 f1rmb Exp $
  *
  */
 
@@ -38,6 +38,9 @@ extern "C" {
 #    else
 #        define N_(String) (String)
 #    endif
+#    ifndef HAVE_NGETTEXT
+#        define ngettext(Singular, Plural, IsPlural) (Singular)
+#    endif
 #else
 /* Stubs that do something close enough.  */
 #    define textdomain(String) (String)
-- 
cgit v1.2.3