CVS gsasl/gl

[gsasl-commit]

Update of /home/cvs/gsasl/gl
In directory dopio:/tmp/cvs-serv8522/gl

Modified Files:
        Makefile.am error.c getndelim2.c getpass.c 
Removed Files:
        unlocked-io.h 
Log Message:
Update.

--- /home/cvs/gsasl/gl/Makefile.am      2004/09/29 00:03:46     1.34
+++ /home/cvs/gsasl/gl/Makefile.am      2004/10/15 22:40:00     1.35
@@ -8,11 +8,10 @@
 # the same distribution terms as the rest of that program.
 #
 # Generated by gnulib-tool.
-#
 # Invoked as: gnulib-tool --import
-# Reproduce by: gnulib-tool --import --dir=. --lib=libgl --source-base=gl 
--m4-base=gl/m4 --libtool  dummy error exit extensions getaddrinfo getline 
getopt getpass-gnu gettext progname restrict stdbool strdup unlocked-io
+# Reproduce by: gnulib-tool --import --dir=. --lib=libgl --source-base=gl 
--m4-base=gl/m4 --libtool  dummy error exit getaddrinfo getline getopt 
getpass-gnu gettext progname restrict stdbool strdup
 
-AUTOMAKE_OPTIONS = 1.8 gnits
+AUTOMAKE_OPTIONS = 1.5 gnits no-dependencies
 
 noinst_LTLIBRARIES = libgl.la
 
@@ -25,52 +24,86 @@
 CLEANFILES =
 DISTCLEANFILES =
 MAINTAINERCLEANFILES =
-libgl_la_SOURCES += dummy.c
 
+## begin gnulib module dummy
+
+libgl_a_SOURCES += dummy.c
+
+## end   gnulib module dummy
+
+## begin gnulib module exit
+
+libgl_a_SOURCES += exit.h
 
-libgl_la_SOURCES += exit.h
+## end   gnulib module exit
 
+## begin gnulib module getaddrinfo
 
-libgl_la_SOURCES += getaddrinfo.h
+libgl_a_SOURCES += getaddrinfo.h
 
-libgl_la_SOURCES += getline.h
+## end   gnulib module getaddrinfo
+
+## begin gnulib module getline
+
+libgl_a_SOURCES += getline.h
 EXTRA_DIST += getndelim2.h getndelim2.c
 
+## end   gnulib module getline
+
+## begin gnulib module getopt
+
 BUILT_SOURCES += $(GETOPT_H)
 EXTRA_DIST += getopt_.h getopt_int.h
 
 # We need the following in order to create an <getopt.h> when the system
 # doesn't have one that works with the given compiler.
-all-local $(libgl_la_OBJECTS): $(GETOPT_H)
+all-local $(libgl_a_OBJECTS): $(GETOPT_H)
 getopt.h: getopt_.h
        cp $(srcdir)/getopt_.h address@hidden
        mv address@hidden $@
 MOSTLYCLEANFILES += getopt.h getopt.h-t
 
-libgl_la_SOURCES += getpass.h
+## end   gnulib module getopt
 
-libgl_la_SOURCES += gettext.h
+## begin gnulib module getpass-gnu
 
-libgl_la_SOURCES += progname.h progname.c
+libgl_a_SOURCES += getpass.h
 
+## end   gnulib module getpass-gnu
+
+## begin gnulib module gettext
+
+libgl_a_SOURCES += gettext.h
+
+## end   gnulib module gettext
+
+## begin gnulib module progname
+
+libgl_a_SOURCES += progname.h progname.c
+
+## end   gnulib module progname
+
+## begin gnulib module stdbool
 
 BUILT_SOURCES += $(STDBOOL_H)
 EXTRA_DIST += stdbool_.h
 
 # We need the following in order to create an <stdbool.h> when the system
 # doesn't have one that works.
-all-local $(libgl_la_OBJECTS): $(STDBOOL_H)
+all-local $(libgl_a_OBJECTS): $(STDBOOL_H)
 stdbool.h: stdbool_.h
        sed -e 's/@''HAVE__BOOL''@/$(HAVE__BOOL)/g' < $(srcdir)/stdbool_.h > 
address@hidden
        mv address@hidden $@
 MOSTLYCLEANFILES += stdbool.h stdbool.h-t
 
-libgl_la_SOURCES += strdup.h
+## end   gnulib module stdbool
+
+## begin gnulib module strdup
 
-libgl_la_SOURCES += unlocked-io.h
+libgl_a_SOURCES += strdup.h
 
+## end   gnulib module strdup
 
-# Makefile.am ends here
 
 if !READLINE
 libgl_la_SOURCES += readline.c
--- /home/cvs/gsasl/gl/error.c  2004/08/07 15:11:30     1.5
+++ /home/cvs/gsasl/gl/error.c  2004/10/15 22:40:00     1.6
@@ -40,7 +40,7 @@
 # define mbsrtowcs __mbsrtowcs
 #endif
 
-#if !_LIBC
+#if USE_UNLOCKED_IO
 # include "unlocked-io.h"
 #endif
 
--- /home/cvs/gsasl/gl/getndelim2.c     2004/08/07 21:59:41     1.3
+++ /home/cvs/gsasl/gl/getndelim2.c     2004/10/15 22:40:00     1.4
@@ -29,7 +29,9 @@
 #include <stdlib.h>
 #include <stddef.h>
 
-#include "unlocked-io.h"
+#if USE_UNLOCKED_IO
+# include "unlocked-io.h"
+#endif
 
 #include <limits.h>
 #if HAVE_INTTYPES_H
--- /home/cvs/gsasl/gl/getpass.c        2004/08/10 08:32:16     1.2
+++ /home/cvs/gsasl/gl/getpass.c        2004/10/15 22:40:00     1.3
@@ -1,4 +1,4 @@
-/* Copyright (C) 1992-2001, 2003 Free Software Foundation, Inc.
+/* Copyright (C) 1992-2001, 2003, 2004 Free Software Foundation, Inc.
    This file is part of the GNU C Library.
 
    This program is free software; you can redistribute it and/or modify
@@ -55,8 +55,19 @@
 #if _LIBC
 # define flockfile(s) _IO_flockfile (s)
 # define funlockfile(s) _IO_funlockfile (s)
-#else
+#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