Sync from gnulib.

diff --git a/lib/diacrit.c b/lib/diacrit.c
index e286d8b..e3735a4 100644 (file)
--- a/lib/diacrit.c
+++ b/lib/diacrit.c
@@ -3,7 +3,21 @@
    François Pinard <pinard@iro.umontreal.ca>, 1988.
 
    All this file is a temporary hack, waiting for locales in GNU.
-*/
+
+   This program is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 2, or (at your option)
+   any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program; see the file COPYING.
+   If not, write to the Free Software Foundation,
+   59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
 
 #ifdef HAVE_CONFIG_H
 # include <config.h>

diff --git a/lib/diacrit.h b/lib/diacrit.h
index 875af1e..db9886a 100644 (file)
--- a/lib/diacrit.h
+++ b/lib/diacrit.h
@@ -3,7 +3,21 @@
    François Pinard <pinard@iro.umontreal.ca>, 1988.
 
    All this file is a temporary hack, waiting for locales in GNU.
-*/
+
+   This program is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 2, or (at your option)
+   any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program; see the file COPYING.
+   If not, write to the Free Software Foundation,
+   59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
 
 extern const char diacrit_base[]; /* characters without diacritics */
 extern const char diacrit_diac[]; /* diacritic code for each character */

diff --git a/lib/getpass.c b/lib/getpass.c
index bc8eb44..78f21e0 100644 (file)
--- a/lib/getpass.c
+++ b/lib/getpass.c
@@ -57,6 +57,17 @@
 # define funlockfile(s) _IO_funlockfile (s)
 #elif USE_UNLOCKED_IO
 # include "unlocked-io.h"
+#else
+# undef fflush_unlocked
+# define fflush_unlocked(x) fflush (x)
+# undef flockfile
+# define flockfile(x) ((void) 0)
+# undef funlockfile
+# define funlockfile(x) ((void) 0)
+# undef fputs_unlocked
+# define fputs_unlocked(str,stream) fputs (str, stream)
+# undef putc_unlocked
+# define putc_unlocked(c,stream) putc (c, stream)
 #endif
 
 #if _LIBC

diff --git a/m4/getopt.m4 b/m4/getopt.m4
index 5ab3570..c3cf647 100644 (file)
--- a/m4/getopt.m4
+++ b/m4/getopt.m4
@@ -1,4 +1,4 @@
-# getopt.m4 serial 3
+# getopt.m4 serial 4
 dnl Copyright (C) 2002, 2003, 2004 Free Software Foundation, Inc.
 dnl This file is free software, distributed under the terms of the GNU
 dnl General Public License.  As a special exception to the GNU General
@@ -38,6 +38,10 @@ AC_DEFUN([gl_GETOPT],
   AC_CHECK_HEADERS([getopt.h], [], [GETOPT_H=getopt.h])
   AC_CHECK_FUNCS([getopt_long_only], [], [GETOPT_H=getopt.h])
 
+  dnl BSD getopt_long uses an incompatible method to reset option processing,
+  dnl and (as of 2004-10-15) mishandles optional option-arguments.
+  AC_CHECK_DECL([optreset], [GETOPT_H=getopt.h], [], [#include <getopt.h>])
+
   if test -n "$GETOPT_H"; then
      gl_GETOPT_SUBSTITUTE
   fi