src - OpenBSD base system

diff options


context:
space:
mode:

author	Marc Espie <espie@cvs.openbsd.org>	2006-07-17 16:12:37 +0000
committer	Marc Espie <espie@cvs.openbsd.org>	2006-07-17 16:12:37 +0000
commit	9f77d94b9a58350d763499ea39873c6020b60da9 (patch)
tree	710c75c43c07e91771e598b34a15217e8928560c /gnu/usr.bin/texinfo/lib
parent	6382053c52b4c3b43d337c169d7b476c6081457f (diff)

conflict resolution

Diffstat (limited to 'gnu/usr.bin/texinfo/lib')

-rw-r--r--

gnu/usr.bin/texinfo/lib/Makefile.am

-rw-r--r--

gnu/usr.bin/texinfo/lib/Makefile.in

374

-rw-r--r--

gnu/usr.bin/texinfo/lib/system.h

115

3 files changed, 328 insertions, 167 deletions

diff --git a/gnu/usr.bin/texinfo/lib/Makefile.am b/gnu/usr.bin/texinfo/lib/Makefile.am
index df65d78bd26..d19f17013b1 100644
--- a/gnu/usr.bin/texinfo/lib/Makefile.am
+++ b/gnu/usr.bin/texinfo/lib/Makefile.am

@@ -1,4 +1,4 @@

-# $Id: Makefile.am,v 1.5 2002/12/13 03:12:26 millert Exp $

+# $Id: Makefile.am,v 1.6 2006/07/17 16:12:36 espie Exp $

# Makefile.am for texinfo/lib.

# Run automake in .. to produce Makefile.in from this.

@@ -14,8 +14,8 @@ noinst_LIBRARIES = libtxi.a

INCLUDES = -I../intl

# Don't need to list alloca.c, etc., Automake includes them.

-libtxi_a_SOURCES = gettext.h substring.c system.h xexit.c xmalloc.c xstrdup.c

-libtxi_a_LIBADD = @LIBOBJS@ @ALLOCA@

+libtxi_a_SOURCES = gettext.h substring.c system.h xalloc.h xexit.c xmalloc.c xstrdup.c

+libtxi_a_LIBADD = $(LIBOBJS) $(ALLOCA)

libtxi_a_DEPENDENCIES = $(libtxi_a_LIBADD)

## xx configure for bzero?, clib, other common stuff

diff --git a/gnu/usr.bin/texinfo/lib/Makefile.in b/gnu/usr.bin/texinfo/lib/Makefile.in
index 533bf4c5c9f..31d8e7435fa 100644
--- a/gnu/usr.bin/texinfo/lib/Makefile.in
+++ b/gnu/usr.bin/texinfo/lib/Makefile.in

@@ -1,8 +1,8 @@

-# Makefile.in generated by automake 1.6 from Makefile.am.

+# Makefile.in generated by automake 1.9.4 from Makefile.am.

# @configure_input@

-# Free Software Foundation, Inc.

+# 2003, 2004 Free Software Foundation, Inc.

# This Makefile.in is free software; the Free Software Foundation

# gives unlimited permission to copy and/or distribute it,

# with or without modifications, as long as this notice is preserved.

@@ -14,7 +14,7 @@

@SET_MAKE@

-# $Id: Makefile.in,v 1.4 2002/12/13 03:12:26 millert Exp $

+# $Id: Makefile.in,v 1.5 2006/07/17 16:12:36 espie Exp $

# Makefile.am for texinfo/lib.

# Run automake in .. to produce Makefile.in from this.

@@ -25,148 +25,238 @@

# This program is distributed in the hope that it will be useful, but

# WITHOUT ANY WARRANTY, to the extent permitted by law; without even the

# implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.

-SHELL = @SHELL@

+SOURCES = $(libtxi_a_SOURCES)

srcdir = @srcdir@

top_srcdir = @top_srcdir@

VPATH = @srcdir@

-prefix = @prefix@

-exec_prefix = @exec_prefix@

-bindir = @bindir@

-sbindir = @sbindir@

-libexecdir = @libexecdir@

-datadir = @datadir@

-sysconfdir = @sysconfdir@

-sharedstatedir = @sharedstatedir@

-localstatedir = @localstatedir@

-libdir = @libdir@

-infodir = @infodir@

-mandir = @mandir@

-includedir = @includedir@

-oldincludedir = /usr/include

pkgdatadir = $(datadir)/@PACKAGE@

pkglibdir = $(libdir)/@PACKAGE@

pkgincludedir = $(includedir)/@PACKAGE@

top_builddir = ..

-ACLOCAL = @ACLOCAL@

-AUTOCONF = @AUTOCONF@

-AUTOMAKE = @AUTOMAKE@

-AUTOHEADER = @AUTOHEADER@

am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd

INSTALL = @INSTALL@

-INSTALL_PROGRAM = @INSTALL_PROGRAM@

-INSTALL_DATA = @INSTALL_DATA@

install_sh_DATA = $(install_sh) -c -m 644

install_sh_PROGRAM = $(install_sh) -c

-INSTALL_SCRIPT = @INSTALL_SCRIPT@

+install_sh_SCRIPT = $(install_sh) -c

INSTALL_HEADER = $(INSTALL_DATA)

-transform = @program_transform_name@

+transform = $(program_transform_name)

NORMAL_INSTALL = :

PRE_INSTALL = :

POST_INSTALL = :

NORMAL_UNINSTALL = :

PRE_UNINSTALL = :

POST_UNINSTALL = :

-host_alias = @host_alias@

+build_triplet = @build@

host_triplet = @host@

-EXEEXT = @EXEEXT@

-OBJEXT = @OBJEXT@

-PATH_SEPARATOR = @PATH_SEPARATOR@

+subdir = lib

+DIST_COMMON = README $(srcdir)/Makefile.am $(srcdir)/Makefile.in \

+ alloca.c memcpy.c memmove.c mkstemp.c strcasecmp.c strdup.c \

+ strerror.c strncasecmp.c tempname.c

+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4

+am__aclocal_m4_deps = $(top_srcdir)/m4/codeset.m4 \

+ $(top_srcdir)/m4/gettext.m4 $(top_srcdir)/m4/glibc21.m4 \

+ $(top_srcdir)/m4/iconv.m4 $(top_srcdir)/m4/intdiv0.m4 \

+ $(top_srcdir)/m4/intmax.m4 $(top_srcdir)/m4/inttypes-pri.m4 \

+ $(top_srcdir)/m4/inttypes.m4 $(top_srcdir)/m4/inttypes_h.m4 \

+ $(top_srcdir)/m4/lcmessage.m4 $(top_srcdir)/m4/lib-ld.m4 \

+ $(top_srcdir)/m4/lib-link.m4 $(top_srcdir)/m4/lib-prefix.m4 \

+ $(top_srcdir)/m4/longdouble.m4 $(top_srcdir)/m4/longlong.m4 \

+ $(top_srcdir)/m4/mkstemp.m4 $(top_srcdir)/m4/nls.m4 \

+ $(top_srcdir)/m4/onceonly_2_57.m4 $(top_srcdir)/m4/po.m4 \

+ $(top_srcdir)/m4/printf-posix.m4 $(top_srcdir)/m4/progtest.m4 \

+ $(top_srcdir)/m4/signed.m4 $(top_srcdir)/m4/size_max.m4 \

+ $(top_srcdir)/m4/stdint_h.m4 $(top_srcdir)/m4/strcase.m4 \

+ $(top_srcdir)/m4/uintmax_t.m4 $(top_srcdir)/m4/ulonglong.m4 \

+ $(top_srcdir)/m4/wchar_t.m4 $(top_srcdir)/m4/wint_t.m4 \

+ $(top_srcdir)/m4/xsize.m4 $(top_srcdir)/configure.ac

+am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \

+ $(ACLOCAL_M4)

+mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs

+CONFIG_HEADER = $(top_builddir)/config.h

+CONFIG_CLEAN_FILES =

+LIBRARIES = $(noinst_LIBRARIES)

+AR = ar

+ARFLAGS = cru

+libtxi_a_AR = $(AR) $(ARFLAGS)

+am__DEPENDENCIES_1 = @LIBOBJS@

+am__DEPENDENCIES_2 = @ALLOCA@

+am_libtxi_a_OBJECTS = substring.$(OBJEXT) xexit.$(OBJEXT) xmalloc.$(OBJEXT) \

+ xstrdup.$(OBJEXT)

+libtxi_a_OBJECTS = $(am_libtxi_a_OBJECTS)

+DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)

+depcomp = $(SHELL) $(top_srcdir)/depcomp

+am__depfiles_maybe = depfiles

+COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \

+ $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)

+CCLD = $(CC)

+LINK = $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@

+SOURCES = $(libtxi_a_SOURCES)

+DIST_SOURCES = $(libtxi_a_SOURCES)

+ETAGS = etags

+CTAGS = ctags

+DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)

+ACLOCAL = @ACLOCAL@

+ALLOCA = @ALLOCA@

+AMDEP_FALSE = @AMDEP_FALSE@

+AMDEP_TRUE = @AMDEP_TRUE@

AMTAR = @AMTAR@

+AUTOCONF = @AUTOCONF@

+AUTOHEADER = @AUTOHEADER@

+AUTOMAKE = @AUTOMAKE@

AWK = @AWK@

BUILD_INCLUDED_LIBINTL = @BUILD_INCLUDED_LIBINTL@

CATOBJEXT = @CATOBJEXT@

CC = @CC@

+CCDEPMODE = @CCDEPMODE@

+CFLAGS = @CFLAGS@

+CPP = @CPP@

+CPPFLAGS = @CPPFLAGS@

+CYGPATH_W = @CYGPATH_W@

DATADIRNAME = @DATADIRNAME@

+DEFS = @DEFS@

DEPDIR = @DEPDIR@

+ECHO_C = @ECHO_C@

+ECHO_N = @ECHO_N@

+ECHO_T = @ECHO_T@

+EGREP = @EGREP@

+EXEEXT = @EXEEXT@

GENCAT = @GENCAT@

GLIBC21 = @GLIBC21@

GMSGFMT = @GMSGFMT@

-HAVE_LIB = @HAVE_LIB@

+HAVE_ASPRINTF = @HAVE_ASPRINTF@

+HAVE_POSIX_PRINTF = @HAVE_POSIX_PRINTF@

+HAVE_SNPRINTF = @HAVE_SNPRINTF@

+HAVE_WPRINTF = @HAVE_WPRINTF@

+HELP2MAN = @HELP2MAN@

+INSTALL_DATA = @INSTALL_DATA@

+INSTALL_PROGRAM = @INSTALL_PROGRAM@

+INSTALL_SCRIPT = @INSTALL_SCRIPT@

INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@

+INSTALL_WARNINGS_FALSE = @INSTALL_WARNINGS_FALSE@

+INSTALL_WARNINGS_TRUE = @INSTALL_WARNINGS_TRUE@

INSTOBJEXT = @INSTOBJEXT@

INTLBISON = @INTLBISON@

INTLLIBS = @INTLLIBS@

INTLOBJS = @INTLOBJS@

INTL_LIBTOOL_SUFFIX_PREFIX = @INTL_LIBTOOL_SUFFIX_PREFIX@

-LIB = @LIB@

+LDFLAGS = @LDFLAGS@

LIBICONV = @LIBICONV@

LIBINTL = @LIBINTL@

-LTLIB = @LTLIB@

+LIBOBJS = @LIBOBJS@

+LIBS = @LIBS@

LTLIBICONV = @LTLIBICONV@

LTLIBINTL = @LTLIBINTL@

+LTLIBOBJS = @LTLIBOBJS@

+MAINT = @MAINT@

+MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@

+MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@

+MAKEINFO = @MAKEINFO@

MKINSTALLDIRS = @MKINSTALLDIRS@

+MSGFMT = @MSGFMT@

+MSGMERGE = @MSGMERGE@

+OBJEXT = @OBJEXT@

PACKAGE = @PACKAGE@

+PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@

+PACKAGE_NAME = @PACKAGE_NAME@

+PACKAGE_STRING = @PACKAGE_STRING@

+PACKAGE_TARNAME = @PACKAGE_TARNAME@

+PACKAGE_VERSION = @PACKAGE_VERSION@

+PATH_SEPARATOR = @PATH_SEPARATOR@

POSUB = @POSUB@

RANLIB = @RANLIB@

+SET_MAKE = @SET_MAKE@

+SHELL = @SHELL@

STRIP = @STRIP@

TERMLIBS = @TERMLIBS@

+TOOLS_ONLY_FALSE = @TOOLS_ONLY_FALSE@

+TOOLS_ONLY_TRUE = @TOOLS_ONLY_TRUE@

USE_INCLUDED_LIBINTL = @USE_INCLUDED_LIBINTL@

USE_NLS = @USE_NLS@

VERSION = @VERSION@

+XGETTEXT = @XGETTEXT@

+ac_ct_CC = @ac_ct_CC@

+ac_ct_RANLIB = @ac_ct_RANLIB@

+ac_ct_STRIP = @ac_ct_STRIP@

+am__fastdepCC_FALSE = @am__fastdepCC_FALSE@

+am__fastdepCC_TRUE = @am__fastdepCC_TRUE@

am__include = @am__include@

+am__leading_dot = @am__leading_dot@

am__quote = @am__quote@

+am__tar = @am__tar@

+am__untar = @am__untar@

+bindir = @bindir@

+build = @build@

+build_alias = @build_alias@

+build_cpu = @build_cpu@

+build_os = @build_os@

+build_vendor = @build_vendor@

+datadir = @datadir@

+exec_prefix = @exec_prefix@

+host = @host@

+host_alias = @host_alias@

+host_cpu = @host_cpu@

+host_os = @host_os@

+host_vendor = @host_vendor@

+includedir = @includedir@

+infodir = @infodir@

install_sh = @install_sh@

+libdir = @libdir@

+libexecdir = @libexecdir@

+localstatedir = @localstatedir@

+mandir = @mandir@

+mkdir_p = @mkdir_p@

+native_tools = @native_tools@

+oldincludedir = @oldincludedir@

+prefix = @prefix@

+program_transform_name = @program_transform_name@

+sbindir = @sbindir@

+sharedstatedir = @sharedstatedir@

+sysconfdir = @sysconfdir@

+target_alias = @target_alias@

noinst_LIBRARIES = libtxi.a

INCLUDES = -I../intl

# Don't need to list alloca.c, etc., Automake includes them.

-libtxi_a_SOURCES = gettext.h substring.c system.h xexit.c xmalloc.c xstrdup.c

+libtxi_a_SOURCES = gettext.h substring.c system.h xalloc.h xexit.c xmalloc.c xstrdup.c

-libtxi_a_LIBADD = @LIBOBJS@ @ALLOCA@

+libtxi_a_LIBADD = $(LIBOBJS) $(ALLOCA)

libtxi_a_DEPENDENCIES = $(libtxi_a_LIBADD)

EXTRA_DIST = README

-subdir = lib

-mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs

-CONFIG_HEADER = $(top_builddir)/config.h

-CONFIG_CLEAN_FILES =

-LIBRARIES = $(noinst_LIBRARIES)

-libtxi_a_AR = $(AR) cru

-am_libtxi_a_OBJECTS = substring.$(OBJEXT) xexit.$(OBJEXT) xmalloc.$(OBJEXT) \

- xstrdup.$(OBJEXT)

-libtxi_a_OBJECTS = $(am_libtxi_a_OBJECTS)

-DEFS = @DEFS@

-DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)

-CPPFLAGS = @CPPFLAGS@

-LDFLAGS = @LDFLAGS@

-LIBS = @LIBS@

-depcomp = $(SHELL) $(top_srcdir)/depcomp

-am__depfiles_maybe = depfiles

-@AMDEP_TRUE@DEP_FILES = $(DEPDIR)/alloca.Po $(DEPDIR)/memcpy.Po \

-@AMDEP_TRUE@ $(DEPDIR)/memmove.Po $(DEPDIR)/strcasecmp.Po \

-@AMDEP_TRUE@ $(DEPDIR)/strdup.Po $(DEPDIR)/strerror.Po \

-@AMDEP_TRUE@ $(DEPDIR)/strncasecmp.Po ./$(DEPDIR)/substring.Po \

-@AMDEP_TRUE@ ./$(DEPDIR)/xexit.Po ./$(DEPDIR)/xmalloc.Po \

-@AMDEP_TRUE@ ./$(DEPDIR)/xstrdup.Po

-COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \

- $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)

-CCLD = $(CC)

-LINK = $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@

-CFLAGS = @CFLAGS@

-DIST_SOURCES = $(libtxi_a_SOURCES)

-DIST_COMMON = README Makefile.am Makefile.in alloca.c memcpy.c \

- memmove.c strcasecmp.c strdup.c strerror.c strncasecmp.c

-SOURCES = $(libtxi_a_SOURCES)

all: all-am

.SUFFIXES:

.SUFFIXES: .c .o .obj

-$(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.ac $(ACLOCAL_M4)

+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps)

+ @for dep in $?; do \

+ case '$(am__configure_deps)' in \

+ *$$dep*) \

+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \

+ && exit 0; \

+ exit 1;; \

+ esac; \

+ done; \

+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu lib/Makefile'; \

cd $(top_srcdir) && \

$(AUTOMAKE) --gnu lib/Makefile

-Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status

- cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)

-AR = ar

+.PRECIOUS: Makefile

+Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status

+ @case '$?' in \

+ *config.status*) \

+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \

+ *) \

+ echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \

+ cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \

+ esac;

+$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)

+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh

+$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)

+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh

+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)

+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh

clean-noinstLIBRARIES:

-test -z "$(noinst_LIBRARIES)" || rm -f $(noinst_LIBRARIES)

@@ -176,7 +266,7 @@ libtxi.a: $(libtxi_a_OBJECTS) $(libtxi_a_DEPENDENCIES)

$(RANLIB) libtxi.a

mostlyclean-compile:

- -rm -f *.$(OBJEXT) core *.core

+ -rm -f *.$(OBJEXT)

distclean-compile:

-rm -f *.tab.c

@@ -184,38 +274,32 @@ distclean-compile:

@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/alloca.Po@am__quote@

@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/memcpy.Po@am__quote@

@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/memmove.Po@am__quote@

+@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/mkstemp.Po@am__quote@

@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/strcasecmp.Po@am__quote@

@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/strdup.Po@am__quote@

@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/strerror.Po@am__quote@

@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/strncasecmp.Po@am__quote@

+@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/tempname.Po@am__quote@

@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/substring.Po@am__quote@

@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/xexit.Po@am__quote@

@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/xmalloc.Po@am__quote@

@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/xstrdup.Po@am__quote@

-distclean-depend:

- -rm -rf $(DEPDIR) ./$(DEPDIR)

.c.o:

-@AMDEP_TRUE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@

-@AMDEP_TRUE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@

-@AMDEP_TRUE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@

- $(COMPILE) -c `test -f $< || echo '$(srcdir)/'`$<

+@am__fastdepCC_TRUE@ if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \

+@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi

+@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@

+@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@

+@am__fastdepCC_FALSE@ $(COMPILE) -c $<

.c.obj:

-@AMDEP_TRUE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@

-@AMDEP_TRUE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@

-@AMDEP_TRUE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@

- $(COMPILE) -c `cygpath -w $<`

-CCDEPMODE = @CCDEPMODE@

-install-info-am:

+@am__fastdepCC_TRUE@ if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \

+@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi

+@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@

+@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@

+@am__fastdepCC_FALSE@ $(COMPILE) -c `$(CYGPATH_W) '$<'`

uninstall-info-am:

-ETAGS = etags

-ETAGSFLAGS =

-tags: TAGS

ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)

list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \

unique=`for i in $$list; do \

@@ -224,6 +308,7 @@ ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)

$(AWK) ' { files[$$0] = 1; } \

END { for (i in files) print i; }'`; \

mkid -fID $$unique

+tags: TAGS

TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \

$(TAGS_FILES) $(LISP)

@@ -235,8 +320,24 @@ TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \

done | \

$(AWK) ' { files[$$0] = 1; } \

END { for (i in files) print i; }'`; \

- test -z "$(ETAGS_ARGS)$$tags$$unique" \

- || $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \

+ if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \

+ test -n "$$unique" || unique=$$empty_fix; \

+ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \

+ $$tags $$unique; \

+ fi

+ctags: CTAGS

+CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \

+ $(TAGS_FILES) $(LISP)

+ tags=; \

+ here=`pwd`; \

+ list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \

+ unique=`for i in $$list; do \

+ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \

+ done | \

+ $(AWK) ' { files[$$0] = 1; } \

+ END { for (i in files) print i; }'`; \

+ test -z "$(CTAGS_ARGS)$$tags$$unique" \

+ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \

$$tags $$unique

GTAGS:

@@ -245,25 +346,29 @@ GTAGS:

&& gtags -i $(GTAGS_ARGS) $$here

distclean-tags:

- -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH

-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)

-top_distdir = ..

-distdir = $(top_distdir)/$(PACKAGE)-$(VERSION)

+ -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags

distdir: $(DISTFILES)

- @for file in $(DISTFILES); do \

+ @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \

+ topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \

+ list='$(DISTFILES)'; for file in $$list; do \

+ case $$file in \

+ $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \

+ $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \

+ esac; \

if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \

dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \

if test "$$dir" != "$$file" && test "$$dir" != "."; then \

dir="/$$dir"; \

- $(mkinstalldirs) "$(distdir)$$dir"; \

+ $(mkdir_p) "$(distdir)$$dir"; \

else \

dir=''; \

fi; \

if test -d $$d/$$file; then \

- cp -pR $$d/$$file $(distdir)$$dir \

- || exit 1; \

+ if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \

+ cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \

+ fi; \

+ cp -pR $$d/$$file $(distdir)$$dir || exit 1; \

else \

test -f $(distdir)/$$file \

|| cp -p $$d/$$file $(distdir)/$$file \

@@ -273,9 +378,7 @@ distdir: $(DISTFILES)

check-am: all-am

check: check-am

all-am: Makefile $(LIBRARIES)

installdirs:

install: install-am

install-exec: install-exec-am

install-data: install-data-am

@@ -287,7 +390,7 @@ install-am: all-am

installcheck: installcheck-am

install-strip:

$(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \

- INSTALL_STRIP_FLAG=-s \

+ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \

`test -z '$(STRIP)' || \

echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install

mostlyclean-generic:

@@ -295,7 +398,7 @@ mostlyclean-generic:

clean-generic:

distclean-generic:

- -rm -f Makefile $(CONFIG_CLEAN_FILES) stamp-h stamp-h[0-9]*

+ -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)

maintainer-clean-generic:

@echo "This command is intended for maintainers to use"

@@ -305,14 +408,17 @@ clean: clean-am

clean-am: clean-generic clean-noinstLIBRARIES mostlyclean-am

distclean: distclean-am

-distclean-am: clean-am distclean-compile distclean-depend \

- distclean-generic distclean-tags

+ -rm -rf $(DEPDIR) ./$(DEPDIR)

+ -rm -f Makefile

+distclean-am: clean-am distclean-compile distclean-generic \

+ distclean-tags

dvi: dvi-am

dvi-am:

+html: html-am

info: info-am

info-am:

@@ -321,29 +427,41 @@ install-data-am:

install-exec-am:

+install-info: install-info-am

install-man:

installcheck-am:

maintainer-clean: maintainer-clean-am

+ -rm -rf $(DEPDIR) ./$(DEPDIR)

+ -rm -f Makefile

maintainer-clean-am: distclean-am maintainer-clean-generic

mostlyclean: mostlyclean-am

mostlyclean-am: mostlyclean-compile mostlyclean-generic

+pdf: pdf-am

+pdf-am:

+ps: ps-am

+ps-am:

uninstall-am: uninstall-info-am

-.PHONY: GTAGS all all-am check check-am clean clean-generic \

- clean-noinstLIBRARIES distclean distclean-compile \

- distclean-depend distclean-generic distclean-tags distdir dvi \

- dvi-am info info-am install install-am install-data \

- install-data-am install-exec install-exec-am install-info-am \

- install-man install-strip installcheck installcheck-am \

- installdirs maintainer-clean maintainer-clean-generic \

- mostlyclean mostlyclean-compile mostlyclean-generic tags \

- uninstall uninstall-am uninstall-info-am

+.PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \

+ clean-noinstLIBRARIES ctags distclean distclean-compile \

+ distclean-generic distclean-tags distdir dvi dvi-am html \

+ html-am info info-am install install-am install-data \

+ install-data-am install-exec install-exec-am install-info \

+ install-info-am install-man install-strip installcheck \

+ installcheck-am installdirs maintainer-clean \

+ maintainer-clean-generic mostlyclean mostlyclean-compile \

+ mostlyclean-generic pdf pdf-am ps ps-am tags uninstall \

+ uninstall-am uninstall-info-am

# Tell versions [3.59,3.63) of GNU make to not export all variables.

# Otherwise a system limit (for SysV at least) may be exceeded.

diff --git a/gnu/usr.bin/texinfo/lib/system.h b/gnu/usr.bin/texinfo/lib/system.h
index a32f2f918da..4a34f3c368d 100644
--- a/gnu/usr.bin/texinfo/lib/system.h
+++ b/gnu/usr.bin/texinfo/lib/system.h

@@ -1,7 +1,8 @@

/* system.h: system-dependent declarations; include this first.

- $Id: system.h,v 1.4 2002/06/10 13:51:03 espie Exp $

+ $Id: system.h,v 1.5 2006/07/17 16:12:36 espie Exp $

+ Foundation, Inc.

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

@@ -24,12 +25,18 @@

#include <config.h>

-/* <unistd.h> should be included before any preprocessor test

- of _POSIX_VERSION. */

-#ifdef HAVE_UNISTD_H

-#include <unistd.h>

-#endif /* HAVE_UNISTD_H */

+#ifdef MIKTEX

+#include <gnu-miktex.h>

+#define S_ISDIR(x) ((x)&_S_IFDIR)

+#else

+/* MiKTeX defines substring() in a separate DLL, where it has its

+ own __declspec declaration. We don't want to try to duplicate

+ this Microsoft-ism here. */

+extern char *substring (const char *, const char *);

+#endif

+/* We follow the order of header inclusion from Autoconf's

+ ac_includes_default, more or less. */

#include <stdio.h>

#include <sys/types.h>

#include <ctype.h>

@@ -43,14 +50,13 @@

#endif

/* For gettext (NLS). */

+#define const

#include "gettext.h"

+#undef const

#define _(String) gettext (String)

#define N_(String) (String)

-#ifndef HAVE_LC_MESSAGES

-#define LC_MESSAGES (-1)

-#endif

#ifdef STDC_HEADERS

#define getopt system_getopt

#include <stdlib.h>

@@ -61,16 +67,34 @@ extern char *getenv ();

/* Don't use bcopy! Use memmove if source and destination may overlap,

memcpy otherwise. */

-#ifdef HAVE_STRING_H

+#if HAVE_STRING_H

# if !STDC_HEADERS && HAVE_MEMORY_H

# include <memory.h>

# endif

# include <string.h>

-#else

+#endif

+#if HAVE_STRINGS_H

+/* Always include <strings.h> if we have it. This is because that's

+ what Autoconf's AC_CHECK_DECL does. On IBM AIX 4.2, strncasecmp is

+ only declared in strings.h. */

# include <strings.h>

+#endif

+#if !HAVE_STRNCASECMP || !HAVE_STRCASECMP

+# include "strcase.h"

+#endif

+#if !HAVE_DECL_MEMCHR

char *memchr ();

#endif

+/* <unistd.h> defines _POSIX_VERSION, but Paul Eggert points out that is

+ only supposed to be used in user code, not other system headers. */

+#ifdef HAVE_UNISTD_H

+#include <unistd.h>

+#endif /* HAVE_UNISTD_H */

#include <errno.h>

#ifndef errno

extern int errno;

@@ -177,30 +201,41 @@ extern int strcoll ();

# define HAVE_LONG_FILENAMES(dir) (pathconf (dir, _PC_NAME_MAX) > 12)

# define NULL_DEVICE "/dev/null"

# define DEFAULT_INFOPATH "c:/djgpp/info;/usr/local/info;/usr/info;."

-# else /* !__DJGPP__ */

+ /* DJGPP supports /dev/null, which is okay for Unix aficionados,

+ shell scripts and Makefiles, but interactive DOS die-hards

+ would probably want to have NUL as well. */

+# define ALSO_NULL_DEVICE "NUL"

+# else /* O_BINARY && !__DJGPP__ */

# define HAVE_LONG_FILENAMES(dir) (0)

# define NULL_DEVICE "NUL"

-# endif /* !__DJGPP__ */

+# endif /* O_BINARY && !__DJGPP__ */

# define SET_SCREEN_SIZE_HELPER terminal_prep_terminal()

# define DEFAULT_INFO_PRINT_COMMAND ">PRN"

-# else /* !__MSDOS__ */

+# else /* O_BINARY && !__MSDOS__ */

# define setmode(f,m) _setmode(f,m)

# define HAVE_LONG_FILENAMES(dir) (1)

# define NULL_DEVICE "NUL"

-# endif /* !__MSDOS__ */

-# define SET_BINARY(f) do {if (!isatty(f)) setmode(f,O_BINARY);} while(0)

+# endif /* O_BINARY && !__MSDOS__ */

+# ifdef __CYGWIN__

+# define DEFAULT_TMPDIR "/tmp/"

+# define PATH_SEP ":"

+# else /* O_BINARY && !__CYGWIN__ */

+# define DEFAULT_TMPDIR "c:/"

+# define PATH_SEP ";"

+# endif /* O_BINARY && !__CYGWIN__ */

+ /* Back to any O_BINARY system. */

+# define FILENAME_CMP strcasecmp

+# define FILENAME_CMPN strncasecmp

# define FOPEN_RBIN "rb"

# define FOPEN_WBIN "wb"

-# define IS_SLASH(c) ((c) == '/' || (c) == '\\')

# define HAVE_DRIVE(n) ((n)[0] && (n)[1] == ':')

+# define IS_SLASH(c) ((c) == '/' || (c) == '\\')

# define IS_ABSOLUTE(n) (IS_SLASH((n)[0]) || ((n)[0] && (n)[1] == ':'))

-# define FILENAME_CMP strcasecmp

-# define FILENAME_CMPN strncasecmp

-# define PATH_SEP ";"

-# define STRIP_DOT_EXE 1

-# define DEFAULT_TMPDIR "c:/"

# define PIPE_USE_FORK 0

-#else /* not O_BINARY */

+# define SET_BINARY(f) do {if (!isatty(f)) setmode(f,O_BINARY);} while(0)

+# define STRIP_DOT_EXE 1

+#else /* not O_BINARY, i.e., Unix */

# define SET_BINARY(f) (void)0

# define FOPEN_RBIN "r"

# define FOPEN_WBIN "w"

@@ -221,12 +256,8 @@ extern int strcoll ();

# define PIPE_USE_FORK 1

#endif /* not O_BINARY */

-/* DJGPP supports /dev/null, which is okay for Unix aficionados,

- shell scripts and Makefiles, but interactive DOS die-hards

- would probably want to have NUL as well. */

-#ifdef __DJGPP__

-# define ALSO_NULL_DEVICE "NUL"

-#else

+/* Everything but DJGPP. */

+#ifndef ALSO_NULL_DEVICE

# define ALSO_NULL_DEVICE ""

#endif

@@ -234,15 +265,27 @@ extern int strcoll ();

#include <pwd.h>

#endif

/* Some systems don't declare this function in pwd.h. */

-struct passwd *getpwnam ();

+struct passwd *getpwnam (const char *name);

/* Our library routines not included in any system library. */

-extern void *xmalloc (), *xrealloc ();

-extern char *xstrdup ();

-extern void xexit ();

-extern char *substring ();

+extern void *xmalloc (size_t), *xrealloc (void *, size_t);

+extern char *xstrdup (const char *);

+extern void xexit (int);

/* For convenience. */

#define STREQ(s1,s2) (strcmp (s1, s2) == 0)

+#define STRCASEEQ(s1,s2) (strcasecmp (s1, s2) == 0)

+#define STRNCASEEQ(s1,s2,n) (strncasecmp (s1, s2, n) == 0)

+/* We don't need anything fancy. If we did need something fancy, gnulib

+ has it. */

+#ifdef MIN

+#undef MIN

+#endif

+#define MIN(a,b) ((a) < (b) ? (a) : (b))

+#ifdef MAX

+#undef MAX

+#endif

+#define MAX(a,b) ((a) > (b) ? (a) : (b))

#endif /* TEXINFO_SYSTEM_H */