summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDaniel Caujolle-Bert <f1rmb@users.sourceforge.net>2002-07-31 07:06:04 +0000
committerDaniel Caujolle-Bert <f1rmb@users.sourceforge.net>2002-07-31 07:06:04 +0000
commita446ba031f953e3faaa1b1422192bfd555d44a5c (patch)
tree4ce3c3cad2de62fb49587770d51c093152a22241
parent8fbd45a2e720d5cddef200c17b520be35c601e78 (diff)
downloadxine-lib-a446ba031f953e3faaa1b1422192bfd555d44a5c.tar.gz
xine-lib-a446ba031f953e3faaa1b1422192bfd555d44a5c.tar.bz2
Remove (maybe temporary) ngettext check/fallback_macro.
CVS patchset: 2373 CVS date: 2002/07/31 07:06:04
-rw-r--r--m4/gettext.m43
-rw-r--r--src/xine-engine/xineintl.h5
2 files changed, 2 insertions, 6 deletions
diff --git a/m4/gettext.m4 b/m4/gettext.m4
index 2f9825f2d..bbb0e9c71 100644
--- a/m4/gettext.m4
+++ b/m4/gettext.m4
@@ -116,8 +116,7 @@ return (int) gettext ("")]ifelse([$2], need-ngettext, [ + (int) ngettext ("", ""
gt_save_LIBS="$LIBS"
LIBS="$LIBS $INTLLIBS"
- dnl Xine need ngettext.
- AC_CHECK_FUNCS(dcgettext ngettext)
+ AC_CHECK_FUNCS(dcgettext)
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 11cfd6928..33f6694d6 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.2 2002/07/27 23:53:55 f1rmb Exp $
+ * $Id: xineintl.h,v 1.3 2002/07/31 07:06:04 f1rmb Exp $
*
*/
@@ -38,9 +38,6 @@ 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)