diff options
| -rwxr-xr-x | autogen.sh | 1 | ||||
| -rw-r--r-- | gettext-tools/gnulib-lib/.gitignore | 3 | ||||
| -rw-r--r-- | gettext-tools/gnulib-tests/.gitignore | 1 | ||||
| -rw-r--r-- | gettext-tools/libgettextpo/.gitignore | 2 | ||||
| m--------- | gnulib | 0 | ||||
| -rw-r--r-- | gnulib-local/Makefile.am | 1 | ||||
| -rw-r--r-- | gnulib-local/m4/hard-locale.m4.diff | 16 |
7 files changed, 7 insertions, 17 deletions
@@ -208,6 +208,7 @@ if ! $skip_gnulib; then gcd getline getopt-gnu + gettext gettext-h hash html-styled-ostream diff --git a/gettext-tools/gnulib-lib/.gitignore b/gettext-tools/gnulib-lib/.gitignore index 9ef54ac..d6ae633 100644 --- a/gettext-tools/gnulib-lib/.gitignore +++ b/gettext-tools/gnulib-lib/.gitignore @@ -71,6 +71,7 @@ /diffseq.h /dirent-private.h /dirent.in.h +/dirfd.c /dosname.h /dup-safer-flag.c /dup-safer.c @@ -146,6 +147,8 @@ /gl_xlist.h /glib.in.h /glibconfig.in.h +/hard-locale.c +/hard-locale.h /hash.c /hash.h /html-ostream.c diff --git a/gettext-tools/gnulib-tests/.gitignore b/gettext-tools/gnulib-tests/.gitignore index aa7ad59..69eddcd 100644 --- a/gettext-tools/gnulib-tests/.gitignore +++ b/gettext-tools/gnulib-tests/.gitignore @@ -157,6 +157,7 @@ /test-mbrtowc2.sh /test-mbrtowc3.sh /test-mbrtowc4.sh +/test-mbrtowc5.sh /test-mbsinit.c /test-mbsinit.sh /test-mbsrtowcs.c diff --git a/gettext-tools/libgettextpo/.gitignore b/gettext-tools/libgettextpo/.gitignore index 41424a8..10e2973 100644 --- a/gettext-tools/libgettextpo/.gitignore +++ b/gettext-tools/libgettextpo/.gitignore @@ -74,6 +74,8 @@ /gl_list.h /gl_xlist.c /gl_xlist.h +/hard-locale.c +/hard-locale.h /hash.c /hash.h /iconv.c diff --git a/gnulib b/gnulib -Subproject 271dfe37985ff3a6e9cf9d08ab67e8ea3e23916 +Subproject 6f9206d4db914cf904cd4711e3044d99c36dae8 diff --git a/gnulib-local/Makefile.am b/gnulib-local/Makefile.am index 1ff47e2..da46061 100644 --- a/gnulib-local/Makefile.am +++ b/gnulib-local/Makefile.am @@ -248,7 +248,6 @@ m4/alloca.m4 \ m4/backupfile.m4 \ m4/curses.m4 \ m4/gcj.m4 \ -m4/hard-locale.m4.diff \ m4/libcroco.m4 \ m4/libglib.m4 \ m4/libxml.m4 \ diff --git a/gnulib-local/m4/hard-locale.m4.diff b/gnulib-local/m4/hard-locale.m4.diff deleted file mode 100644 index 1071d48..0000000 --- a/gnulib-local/m4/hard-locale.m4.diff +++ /dev/null @@ -1,16 +0,0 @@ -*** gnulib/m4/hard-locale.m4 2005-03-21 23:06:27.000000000 +0100 ---- gettext-tools/m4/hard-locale.m4 2005-03-09 00:49:02.000000000 +0100 -*************** -*** 5,11 **** - dnl with or without modifications, as long as this notice is preserved. - - dnl No prerequisites of lib/hard-locale.c. -! AC_DEFUN([gl_HARD_LOCALE], -! [ -! AC_LIBOBJ([hard-locale]) -! ]) ---- 5,8 ---- - dnl with or without modifications, as long as this notice is preserved. - - dnl No prerequisites of lib/hard-locale.c. -! AC_DEFUN([gl_HARD_LOCALE], [:]) |