From: Bruno Haible Date: Fri, 25 Dec 2009 13:04:25 +0000 (+0100) Subject: Use fcntl-o.m4 instead of fcntl_h.m4. X-Git-Tag: v0.18~83 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=5a70a0382a081aee842850dd01c2d928f92c2857;p=thirdparty%2Fgettext.git Use fcntl-o.m4 instead of fcntl_h.m4. --- diff --git a/ChangeLog b/ChangeLog index a60d6c7e7..cd29077ec 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2009-12-25 Bruno Haible + + * Makefile.am (distcheck-hook): Compare fcntl-o.m4 instead of + fcntl_h.m4. + * PACKAGING: Mention fcntl-o.m4 instead of fcntl_h.m4. + 2009-12-12 Bruno Haible * AUTHORS: Untabify. diff --git a/Makefile.am b/Makefile.am index 6b5449b30..ac2fbba9c 100644 --- a/Makefile.am +++ b/Makefile.am @@ -43,7 +43,7 @@ distcheck-hook: cmp -s gettext-runtime/po/remove-potcdate.sin gettext-tools/po/remove-potcdate.sin cmp -s gettext-runtime/po/remove-potcdate.sin gettext-tools/examples/po/remove-potcdate.sin cmp -s gettext-runtime/m4/codeset.m4 gettext-tools/gnulib-m4/codeset.m4 - cmp -s gettext-runtime/m4/fcntl_h.m4 gettext-tools/gnulib-m4/fcntl_h.m4 + cmp -s gettext-runtime/m4/fcntl-o.m4 gettext-tools/gnulib-m4/fcntl-o.m4 cmp -s gettext-runtime/m4/gettext.m4 gettext-tools/gnulib-m4/gettext.m4 cmp -s gettext-runtime/m4/glibc2.m4 gettext-tools/gnulib-m4/glibc2.m4 cmp -s gettext-runtime/m4/glibc21.m4 gettext-tools/gnulib-m4/glibc21.m4 diff --git a/PACKAGING b/PACKAGING index 1ba83831c..15105c7ab 100644 --- a/PACKAGING +++ b/PACKAGING @@ -117,7 +117,7 @@ following file list. $prefix/share/gettext/archive.git.tar.gz (only installed if --with-git specified) $prefix/share/gettext/archive.dir.tar.gz (only installed if --without-cvs specified) $prefix/share/aclocal/codeset.m4 - $prefix/share/aclocal/fcntl_h.m4 + $prefix/share/aclocal/fcntl-o.m4 $prefix/share/aclocal/gettext.m4 $prefix/share/aclocal/glibc2.m4 $prefix/share/aclocal/glibc21.m4 diff --git a/gettext-runtime/m4/ChangeLog b/gettext-runtime/m4/ChangeLog index 7631ec37e..240582c3f 100644 --- a/gettext-runtime/m4/ChangeLog +++ b/gettext-runtime/m4/ChangeLog @@ -1,3 +1,9 @@ +2009-12-25 Bruno Haible + + * fcntl-o.m4: New file, from gnulib. + * fcntl_h.m4: Remove file. + * Makefile.am (EXTRA_DIST): Add fcntl-o.m4. Remove fcntl_h.m4. + 2009-12-21 Bruno Haible Define override of setlocale and newlocale functions. diff --git a/gettext-runtime/m4/Makefile.am b/gettext-runtime/m4/Makefile.am index ccf0f2e44..7eccc6452 100644 --- a/gettext-runtime/m4/Makefile.am +++ b/gettext-runtime/m4/Makefile.am @@ -5,7 +5,7 @@ EXTRA_DIST = README \ ansi-c++.m4 \ codeset.m4 \ -fcntl_h.m4 \ +fcntl-o.m4 \ gettext.m4 \ glibc2.m4 \ glibc21.m4 \ diff --git a/gettext-runtime/m4/fcntl_h.m4 b/gettext-runtime/m4/fcntl-o.m4 similarity index 76% rename from gettext-runtime/m4/fcntl_h.m4 rename to gettext-runtime/m4/fcntl-o.m4 index 40a18034d..10d564c0a 100644 --- a/gettext-runtime/m4/fcntl_h.m4 +++ b/gettext-runtime/m4/fcntl-o.m4 @@ -1,21 +1,11 @@ -# serial 6 -# Configure fcntl.h. -dnl Copyright (C) 2006, 2007, 2009 Free Software Foundation, Inc. +# fcntl-o.m4 serial 1 +dnl Copyright (C) 2006, 2009 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 Written by Paul Eggert. -AC_DEFUN([gl_FCNTL_H], -[ - AC_REQUIRE([gl_FCNTL_H_DEFAULTS]) - AC_REQUIRE([gl_FCNTL_O_FLAGS]) - gl_CHECK_NEXT_HEADERS([fcntl.h]) - FCNTL_H='fcntl.h' - AC_SUBST([FCNTL_H]) -]) - # Test whether the flags O_NOATIME and O_NOFOLLOW actually work. # Define HAVE_WORKING_O_NOATIME to 1 if O_NOATIME works, or to 0 otherwise. # Define HAVE_WORKING_O_NOFOLLOW to 1 if O_NOFOLLOW works, or to 0 otherwise. @@ -89,20 +79,3 @@ AC_DEFUN([gl_FCNTL_O_FLAGS], AC_DEFINE_UNQUOTED([HAVE_WORKING_O_NOFOLLOW], [$ac_val], [Define to 1 if O_NOFOLLOW works.]) ]) - -AC_DEFUN([gl_FCNTL_MODULE_INDICATOR], -[ - dnl Use AC_REQUIRE here, so that the default settings are expanded once only. - AC_REQUIRE([gl_FCNTL_H_DEFAULTS]) - GNULIB_[]m4_translit([$1],[abcdefghijklmnopqrstuvwxyz./-],[ABCDEFGHIJKLMNOPQRSTUVWXYZ___])=1 -]) - -AC_DEFUN([gl_FCNTL_H_DEFAULTS], -[ - GNULIB_OPEN=0; AC_SUBST([GNULIB_OPEN]) - GNULIB_OPENAT=0; AC_SUBST([GNULIB_OPENAT]) - dnl Assume proper GNU behavior unless another module says otherwise. - HAVE_OPENAT=1; AC_SUBST([HAVE_OPENAT]) - REPLACE_OPEN=0; AC_SUBST([REPLACE_OPEN]) - REPLACE_OPENAT=0; AC_SUBST([REPLACE_OPENAT]) -]) diff --git a/gettext-tools/doc/ChangeLog b/gettext-tools/doc/ChangeLog index fa0e16311..44368786b 100644 --- a/gettext-tools/doc/ChangeLog +++ b/gettext-tools/doc/ChangeLog @@ -1,3 +1,8 @@ +2009-12-25 Bruno Haible + + * gettext.texi (aclocal): Add fcntl-o.m4 instead of fcntl_h.m4 to the + file list. + 2009-10-18 Bruno Haible * gettext.texi (aclocal): Add fcntl_h.m4 to the file list. diff --git a/gettext-tools/doc/gettext.texi b/gettext-tools/doc/gettext.texi index 68ac5caca..5ec12777d 100644 --- a/gettext-tools/doc/gettext.texi +++ b/gettext-tools/doc/gettext.texi @@ -7934,7 +7934,7 @@ automake 1.9. @cindex @file{aclocal.m4} file If you do not have an @file{aclocal.m4} file in your distribution, -the simplest is to concatenate the files @file{codeset.m4}, @file{fcntl_h.m4}, +the simplest is to concatenate the files @file{codeset.m4}, @file{fcntl-o.m4}, @file{gettext.m4}, @file{glibc2.m4}, @file{glibc21.m4}, @file{iconv.m4}, @file{intdiv0.m4}, @file{intl.m4}, @file{intldir.m4}, @file{intlmacosx.m4}, @file{intmax.m4}, @file{inttypes_h.m4}, @file{inttypes-pri.m4}, diff --git a/gettext-tools/m4/ChangeLog b/gettext-tools/m4/ChangeLog index c26ee3f76..8671d6168 100644 --- a/gettext-tools/m4/ChangeLog +++ b/gettext-tools/m4/ChangeLog @@ -1,3 +1,7 @@ +2009-12-25 Bruno Haible + + * Makefile.am (aclocal_DATA): Add fcntl-o.m4. Remove fcntl_h.m4. + 2009-12-12 Bruno Haible * regex.m4: Untabify. diff --git a/gettext-tools/m4/Makefile.am b/gettext-tools/m4/Makefile.am index fe6795a56..0f26f95de 100644 --- a/gettext-tools/m4/Makefile.am +++ b/gettext-tools/m4/Makefile.am @@ -8,7 +8,7 @@ aclocal_DATA = \ ../../autoconf-lib-link/m4/lib-link.m4 \ ../../autoconf-lib-link/m4/lib-prefix.m4 \ ../../gettext-runtime/m4/codeset.m4 \ - ../../gettext-runtime/m4/fcntl_h.m4 \ + ../../gettext-runtime/m4/fcntl-o.m4 \ ../../gettext-runtime/m4/gettext.m4 \ ../../gettext-runtime/m4/glibc2.m4 \ ../../gettext-runtime/m4/glibc21.m4 \ diff --git a/gettext-tools/misc/ChangeLog b/gettext-tools/misc/ChangeLog index e93ed3ead..81f3cb7f8 100644 --- a/gettext-tools/misc/ChangeLog +++ b/gettext-tools/misc/ChangeLog @@ -1,3 +1,8 @@ +2009-12-25 Bruno Haible + + * gettextize.in (m4filelist): Add fcntl-o.m4 instead of fcntl_h.m4 to + the list. + 2009-12-12 Bruno Haible * po-compat.el: Untabify. diff --git a/gettext-tools/misc/gettextize.in b/gettext-tools/misc/gettextize.in index 43d41bae6..14344a45d 100644 --- a/gettext-tools/misc/gettextize.in +++ b/gettext-tools/misc/gettextize.in @@ -768,7 +768,7 @@ m4filelist='gettext.m4 iconv.m4 lib-ld.m4 lib-link.m4 lib-prefix.m4 nls.m4 min_automake_version=1.9 if test -n "$intldir" || test -z "$have_automake19"; then # Add intldir.m4, intl.m4 and its dependencies. - m4filelist=$m4filelist' codeset.m4 fcntl_h.m4 glibc2.m4 glibc21.m4 intdiv0.m4 + m4filelist=$m4filelist' codeset.m4 fcntl-o.m4 glibc2.m4 glibc21.m4 intdiv0.m4 intl.m4 intldir.m4 intlmacosx.m4 intmax.m4 inttypes_h.m4 inttypes-pri.m4 lcmessage.m4 lock.m4 longlong.m4 printf-posix.m4 size_max.m4 stdint_h.m4 threadlib.m4 uintmax_t.m4 visibility.m4 wchar_t.m4 wint_t.m4 xsize.m4'