diff options
| -rw-r--r-- | config.make.in | 1 | ||||
| -rwxr-xr-x | configure | 38 | ||||
| -rw-r--r-- | configure.in | 27 | ||||
| -rw-r--r-- | manual/Makefile | 39 | ||||
| -rw-r--r-- | manual/libc.texinfo | 3 |
5 files changed, 15 insertions, 93 deletions
diff --git a/config.make.in b/config.make.in index a70249fec8..8b5d2c4353 100644 --- a/config.make.in +++ b/config.make.in @@ -107,7 +107,6 @@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ INSTALL_DATA = @INSTALL_DATA@ INSTALL_INFO = @INSTALL_INFO@ -OLD_DEBIAN_INSTALL_INFO = @OLD_DEBIAN_INSTALL_INFO@ LN_S = @LN_S@ MSGFMT = @MSGFMT@ diff --git a/configure b/configure index a051b392b4..e54db9801d 100755 --- a/configure +++ b/configure @@ -312,7 +312,7 @@ ac_includes_default="\ # include <unistd.h> #endif" -ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS with_fp with_cvs enable_check_abi oldest_abi subdirs force_install all_warnings build build_cpu build_vendor build_os host host_cpu host_vendor host_os base_machine sysnames INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA LN_S CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC OBJEXT BUILD_CC cross_compiling CPP CXX CXXFLAGS ac_ct_CXX AR OBJDUMP RANLIB ac_ct_RANLIB MIG AS LD PWD_P MAKE MSGFMT MAKEINFO SED AUTOCONF CCVERSION SYSINCLUDES libc_cv_gcc_static_libgcc BASH libc_cv_have_bash2 KSH libc_cv_have_ksh AWK PERL INSTALL_INFO OLD_DEBIAN_INSTALL_INFO BISON VERSIONING libc_cv_asm_protected_directive libc_cv_initfinit_array libc_cv_z_nodelete libc_cv_z_nodlopen libc_cv_z_initfirst libc_cv_Bgroup ASFLAGS_config libc_cv_z_combreloc libc_cv_z_execstack libc_cv_fpie libc_cv_have_initfini libc_cv_cpp_asm_debuginfo no_whole_archive exceptions LIBGD EGREP sizeof_long_double libc_cv_gcc_unwind_find_fde uname_sysname uname_release uname_version old_glibc_headers libc_cv_slibdir libc_cv_localedir libc_cv_sysconfdir libc_cv_rootsbindir libc_cv_forced_unwind use_ldconfig ldd_rewrite_script gnu_ld gnu_as elf xcoff static shared pic_default profile omitfp bounded static_nss nopic_initfini DEFINES linux_doors mach_interface_list VERSION RELEASE LIBOBJS LTLIBOBJS' +ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS with_fp with_cvs enable_check_abi oldest_abi subdirs force_install all_warnings build build_cpu build_vendor build_os host host_cpu host_vendor host_os base_machine sysnames INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA LN_S CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC OBJEXT BUILD_CC cross_compiling CPP CXX CXXFLAGS ac_ct_CXX AR OBJDUMP RANLIB ac_ct_RANLIB MIG AS LD PWD_P MAKE MSGFMT MAKEINFO SED AUTOCONF CCVERSION SYSINCLUDES libc_cv_gcc_static_libgcc BASH libc_cv_have_bash2 KSH libc_cv_have_ksh AWK PERL INSTALL_INFO BISON VERSIONING libc_cv_asm_protected_directive libc_cv_initfinit_array libc_cv_z_nodelete libc_cv_z_nodlopen libc_cv_z_initfirst libc_cv_Bgroup ASFLAGS_config libc_cv_z_combreloc libc_cv_z_execstack libc_cv_fpie libc_cv_have_initfini libc_cv_cpp_asm_debuginfo no_whole_archive exceptions LIBGD EGREP sizeof_long_double libc_cv_gcc_unwind_find_fde uname_sysname uname_release uname_version old_glibc_headers libc_cv_slibdir libc_cv_localedir libc_cv_sysconfdir libc_cv_rootsbindir libc_cv_forced_unwind use_ldconfig ldd_rewrite_script gnu_ld gnu_as elf xcoff static shared pic_default profile omitfp bounded static_nss nopic_initfini DEFINES linux_doors mach_interface_list VERSION RELEASE LIBOBJS LTLIBOBJS' ac_subst_files='' # Initialize some variables set by options. @@ -4553,41 +4553,6 @@ else echo "${ECHO_T}no" >&6 fi -if test "$INSTALL_INFO" != "no"; then -echo "$as_me:$LINENO: checking for old Debian install-info" >&5 -echo $ECHO_N "checking for old Debian install-info... $ECHO_C" >&6 -if test "${libc_cv_old_debian_install_info+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - mkdir conftest.d - # There is a hard ^_ on the next line. I am open to better ideas. - (echo ' ' - echo 'File: dir Node: Top This is the top of the INFO tree' - echo '* Menu:') >conftest.d/dir - (echo 'INFO-DIR-SECTION i-d-s works' - echo 'START-INFO-DIR-ENTRY' - echo '* Prog: (prog). Program.' - echo 'END-INFO-DIR-ENTRY') >conftest.d/prog.info - if $INSTALL_INFO --info-dir=conftest.d conftest.d/prog.info >&5 2>&1 - then - if grep -s 'i-d-s works' conftest.d/dir >/dev/null - then libc_cv_old_debian_install_info=no - else libc_cv_old_debian_install_info=yes - fi - else libc_cv_old_debian_install_info=no testfailed=t - fi - rm -fr conftest.d -fi -echo "$as_me:$LINENO: result: $libc_cv_old_debian_install_info" >&5 -echo "${ECHO_T}$libc_cv_old_debian_install_info" >&6 -if test -n "$testfailed" -then { echo "$as_me:$LINENO: WARNING: install-info errored out, check config.log" >&5 -echo "$as_me: WARNING: install-info errored out, check config.log" >&2;} -fi -OLD_DEBIAN_INSTALL_INFO=$libc_cv_old_debian_install_info -fi - - # Extract the first word of "bison", so it can be a program name with args. set dummy bison; ac_word=$2 echo "$as_me:$LINENO: checking for $ac_word" >&5 @@ -7857,7 +7822,6 @@ s,@libc_cv_have_ksh@,$libc_cv_have_ksh,;t t s,@AWK@,$AWK,;t t s,@PERL@,$PERL,;t t s,@INSTALL_INFO@,$INSTALL_INFO,;t t -s,@OLD_DEBIAN_INSTALL_INFO@,$OLD_DEBIAN_INSTALL_INFO,;t t s,@BISON@,$BISON,;t t s,@VERSIONING@,$VERSIONING,;t t s,@libc_cv_asm_protected_directive@,$libc_cv_asm_protected_directive,;t t diff --git a/configure.in b/configure.in index 50e18eb09a..9314a3223a 100644 --- a/configure.in +++ b/configure.in @@ -850,33 +850,6 @@ if test "$PERL" != no && fi AC_PATH_PROG(INSTALL_INFO, install-info, no, $PATH:/usr/local/bin:/usr/local/sbin:/usr/bin:/usr/sbin:/bin:/sbin) -if test "$INSTALL_INFO" != "no"; then -AC_CACHE_CHECK(for old Debian install-info, libc_cv_old_debian_install_info, - [mkdir conftest.d - # There is a hard ^_ on the next line. I am open to better ideas. - (echo ' ' - echo 'File: dir Node: Top This is the top of the INFO tree' - echo '* Menu:') >conftest.d/dir - (echo 'INFO-DIR-SECTION i-d-s works' - echo 'START-INFO-DIR-ENTRY' - echo '* Prog: (prog). Program.' - echo 'END-INFO-DIR-ENTRY') >conftest.d/prog.info - if $INSTALL_INFO --info-dir=conftest.d conftest.d/prog.info >&AS_MESSAGE_LOG_FD 2>&1 - then - if grep -s 'i-d-s works' conftest.d/dir >/dev/null - then libc_cv_old_debian_install_info=no - else libc_cv_old_debian_install_info=yes - fi - else libc_cv_old_debian_install_info=no testfailed=t - fi - rm -fr conftest.d]) -if test -n "$testfailed" -then AC_MSG_WARN([install-info errored out, check config.log]) -fi -OLD_DEBIAN_INSTALL_INFO=$libc_cv_old_debian_install_info -fi -AC_SUBST(OLD_DEBIAN_INSTALL_INFO) - AC_PATH_PROG(BISON, bison, no, $PATH:/usr/local/bin:/usr/bin:/bin) AC_CACHE_CHECK(for signed size_t type, libc_cv_signed_size_t, [dnl diff --git a/manual/Makefile b/manual/Makefile index d9ae04b112..8bcc5d0ae2 100644 --- a/manual/Makefile +++ b/manual/Makefile @@ -1,4 +1,4 @@ -# Copyright (C) 1992-1999, 2000, 2001, 2002 Free Software Foundation, Inc. +# Copyright (C) 1992-1999,2000,2001,2002,2003 Free Software Foundation, Inc. # This file is part of the GNU C Library. # The GNU C Library is free software; you can redistribute it and/or @@ -42,7 +42,7 @@ TEXI2PDF = texi2dvi --pdf ifneq ($(strip $(MAKEINFO)),:) all: info -info: libc.info dir-add.info +info: libc.info endif # scripts we use @@ -74,7 +74,8 @@ examples = $(filter-out $(foreach d, $(add-ons), ../$d/%.c.texi), \ chapters.% top-menu.%: libc-texinfo.sh $(texis) Makefile AWK=$(AWK) $(SHELL) $< '$(chapters)' '$(add-chapters)' '$(appendices)' -libc.dvi libc.pdf libc.info: chapters.texi top-menu.texi libm-err.texi +libc.dvi libc.pdf libc.info: chapters.texi top-menu.texi dir-add.texi \ + libm-err.texi libc.dvi libc.pdf: texinfo.tex html: libc/index.html @@ -91,11 +92,11 @@ stamp-summary: summary.awk $(filter-out summary.texi, $(texis)) # Generate a file which can be added to the `dir' content to provide direct # access to the documentation of the function, variables, and other # definitions. -dir-add.info: xtract-typefun.awk $(texis) - (echo "INFO-DIR-SECTION GNU C library functions"; \ - echo "START-INFO-DIR-ENTRY"; \ +dir-add.texi: xtract-typefun.awk $(texis) + (echo "@dircategory GNU C library functions and macros"; \ + echo "@direntry"; \ $(AWK) -f $^ | sort; \ - echo "END-INFO-DIR-ENTRY") > $@.new + echo "@end direntry") > $@.new mv -f $@.new $@ # The table with the math errors is generated. @@ -134,7 +135,7 @@ minimal-dist = summary.awk texis.awk tsort.awk libc-texinfo.sh libc.texinfo \ doc-only-dist = Makefile COPYING.LIB distribute = $(minimal-dist) $(examples) stdio-fp.c \ libc.info* libc.?? libc.??s texinfo.tex \ - xtract-typefun.awk dir-add.info dir libm-err-tab.pl + xtract-typefun.awk dir-add.texi dir libm-err-tab.pl export distribute := $(distribute) tar-it = tar chovf $@ $^ @@ -163,14 +164,14 @@ glibc-doc-$(edition).tar: $(doc-only-dist) $(distribute) .PHONY: mostlyclean distclean realclean clean mostlyclean: - -rm -f libc.dvi libc.pdf libc.tmp libc.info* dir-add.info + -rm -f libc.dvi libc.pdf libc.tmp libc.info* -rm -f $(objpfx)stubs $(objpfx)distinfo -rm -f $(foreach o,$(object-suffixes-for-libc),$(objpfx)stamp$o) clean: mostlyclean distclean: clean indices = cp fn pg tp vr ky realclean: distclean - -rm -f texis summary.texi stamp-summary *.c.texi + -rm -f texis summary.texi stamp-summary *.c.texi dir-add.texi -rm -f $(foreach index,$(indices),libc.$(index) libc.$(index)s) -rm -f libc.log libc.aux libc.toc dir-add.texinfo -rm -f top-menu.texi chapters.texi @@ -178,27 +179,11 @@ realclean: distclean .PHONY: install subdir_install installdirs install-data install-data subdir_install: install ifneq ($(strip $(MAKEINFO)),:) -# There are two variants of install-info out there. The GNU version -# knows about the INFO-DIR-SECTION tag, the Debian version doesn't. -ifneq ($(OLD_DEBIAN_INSTALL_INFO),yes) -install: $(inst_infodir)/libc.info dir-add.info +install: $(inst_infodir)/libc.info @if $(SHELL) -c '$(INSTALL_INFO) --version' >/dev/null 2>&1; then \ test -f $(inst_infodir)/dir || $(INSTALL_DATA) dir $(inst_infodir);\ $(INSTALL_INFO) --info-dir=$(inst_infodir) $(inst_infodir)/libc.info;\ - $(INSTALL_INFO) --info-dir=$(inst_infodir) dir-add.info;\ else : ; fi -else -install: $(inst_infodir)/libc.info dir-add.info - @if $(SHELL) -c '$(INSTALL_INFO) --version' >/dev/null 2>&1; then \ - test -f $(inst_infodir)/dir || $(INSTALL_DATA) dir $(inst_infodir);\ - $(INSTALL_INFO) --info-dir=$(inst_infodir) \ - --section '^GNU Libraries:' 'GNU Libraries:' \ - $(inst_infodir)/libc.info;\ - $(INSTALL_INFO) --info-dir=$(inst_infodir) \ - --section '^GNU C Library functions:' 'GNU C Library functions:' \ - dir-add.info;\ - else : ; fi -endif endif # Catchall implicit rule for other installation targets from the parent. install-%: ; diff --git a/manual/libc.texinfo b/manual/libc.texinfo index 84d11c3ee5..152044d6b2 100644 --- a/manual/libc.texinfo +++ b/manual/libc.texinfo @@ -9,6 +9,7 @@ @direntry * Libc: (libc). C library. @end direntry +@include dir-add.texi @c This tells texinfo.tex to use the real section titles in xrefs in @c place of the node name, when no section title is explicitly given. @@ -28,7 +29,7 @@ This file documents the GNU C library. This is Edition @value{EDITION}, last updated @value{UPDATED}, of @cite{The GNU C Library Reference Manual}, for Version @value{VERSION}. -Copyright (C) 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2001, 2002 Free Software Foundation, Inc. +Copyright (C) 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2001, 2002, 2003 Free Software Foundation, Inc. Permission is granted to copy, distribute and/or modify this document under the terms of the GNU Free Documentation License, Version 1.1 or |