Move bison-i18n module to gnulib.

diff --git a/gnulib-local/ChangeLog b/gnulib-local/ChangeLog
index cdabdf6c54fb38dfb32bc0aee8d3aa9cd2f16872..c714baaeaa915dd454e189484fb45915d27fd76d 100644 (file)
--- a/gnulib-local/ChangeLog
+++ b/gnulib-local/ChangeLog
@@ -1,3 +1,9 @@
+2006-08-18  Bruno Haible  <bruno@clisp.org>
+
+       * modules/bison-i18n: Remove file. Now taken from gnulib.
+       * m4/bison-i18n.m4: Remove file. Now taken from gnulib.
+       * Makefile.am (EXTRA_DIST): Remove them.
+
 2006-08-16  Bruno Haible  <bruno@clisp.org>
 
        * modules/gettext-tools-misc (Files): Remove m4/restrict.m4, no longer

diff --git a/gnulib-local/Makefile.am b/gnulib-local/Makefile.am
index 75dd0215563ce377919e9d4c14a7f0610afea54d..97200e31143dc756ec00602f1be964c35682c004 100644 (file)
--- a/gnulib-local/Makefile.am
+++ b/gnulib-local/Makefile.am
@@ -79,7 +79,6 @@ lib/xreadlink.h \
 lib/xstrdup.c \
 m4/alloca.m4 \
 m4/backupfile.m4 \
-m4/bison-i18n.m4 \
 m4/canonicalize.m4 \
 m4/ChangeLog.0 \
 m4/ChangeLog.1 \
@@ -100,7 +99,6 @@ m4/vasprintf.m4 \
 m4/xreadlink.m4 \
 modules/backupfile \
 modules/basename \
-modules/bison-i18n \
 modules/canonicalize \
 modules/closeout \
 modules/c-strstr \

diff --git a/gnulib-local/m4/bison-i18n.m4 b/gnulib-local/m4/bison-i18n.m4
deleted file mode 100644 (file)
index 2fe6c60..0000000
--- a/gnulib-local/m4/bison-i18n.m4
+++ /dev/null
@@ -1,59 +0,0 @@
-# bison-i18n.m4 serial 1 (bison-2.1)
-dnl Copyright (C) 2005 Free Software Foundation, Inc.
-dnl This file is free software; the Free Software Foundation
-dnl gives unlimited permission to copy and/or distribute it,
-dnl with or without modifications, as long as this notice is preserved.
-
-dnl From Bruno Haible.
-
-dnl Support for internationalization of bison-generated parsers.
-
-dnl BISON_I18N
-dnl should be used in configure.ac, after AM_GNU_GETTEXT. If USE_NLS is yes, it
-dnl sets BISON_LOCALEDIR to indicate where to find the bison-runtime.mo files
-dnl and defines YYENABLE_NLS if there are bison-runtime.mo files at all.
-AC_DEFUN([BISON_I18N],
-[
-  if test -z "$USE_NLS"; then
-    echo "The BISON-I18N macro is used without being preceded by AM-GNU-GETTEXT." 1>&2
-    exit 1
-  fi
-  BISON_LOCALEDIR=
-  if test "$USE_NLS" = yes; then
-    dnl AC_PROG_YACC sets the YACC variable; other macros set the BISON variable.
-    if test -n "$YACC"; then
-      case "$YACC" in
-        *bison*)
-          if ($YACC --print-localedir) >/dev/null 2>&1; then
-            BISON_LOCALEDIR=`$YACC --print-localedir`
-          fi
-          ;;
-      esac
-    else
-      if test -n "$BISON"; then
-        if test "$BISON" != ":"; then
-          if ($BISON --print-localedir) >/dev/null 2>&1; then
-            BISON_LOCALEDIR=`$BISON --print-localedir`
-          fi
-        fi
-      fi
-    fi
-    AC_SUBST([BISON_LOCALEDIR])
-    if test -n "$BISON_LOCALEDIR"; then
-      USER_LINGUAS="${LINGUAS-%UNSET%}"
-      if test -n "$USER_LINGUAS"; then
-        BISON_USE_NLS=yes
-      else
-        BISON_USE_NLS=no
-      fi
-    else
-      BISON_USE_NLS=no
-    fi
-  else
-    BISON_USE_NLS=no
-  fi
-  if test $BISON_USE_NLS = yes; then
-    AC_DEFINE([YYENABLE_NLS], 1,
-      [Define to 1 to internationalize bison runtime messages.])
-  fi
-])

diff --git a/gnulib-local/modules/bison-i18n b/gnulib-local/modules/bison-i18n
deleted file mode 100644 (file)
index 084c2c9..0000000
--- a/gnulib-local/modules/bison-i18n
+++ /dev/null
@@ -1,21 +0,0 @@
-Description:
-Support for internationalization of bison-generated parsers.
-
-Files:
-m4/bison-i18n.m4
-
-Depends-on:
-
-configure.ac:
-BISON_I18N
-
-Makefile.am:
-
-Include:
-
-License:
-GPLed build tool
-
-Maintainer:
-Bruno Haible, Paul Eggert
-