[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
texinfo update (Wed Sep 21 08:52:01 EDT 2005)
|
From: |
Karl Berry |
|
Subject: |
texinfo update (Wed Sep 21 08:52:01 EDT 2005) |
|
Date: |
Wed, 21 Sep 2005 08:53:20 -0400 |
Index: lib/memcpy.c
===================================================================
RCS file: /cvsroot/texinfo/texinfo/lib/memcpy.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -c -r1.3 -r1.4
*** lib/memcpy.c 15 May 2005 00:00:07 -0000 1.3
--- lib/memcpy.c 21 Sep 2005 12:30:36 -0000 1.4
***************
*** 16,22 ****
/* Written by Jim Meyering <address@hidden>. */
! #if HAVE_CONFIG_H
# include <config.h>
#endif
--- 16,22 ----
/* Written by Jim Meyering <address@hidden>. */
! #ifdef HAVE_CONFIG_H
# include <config.h>
#endif
Index: lib/memmove.c
===================================================================
RCS file: /cvsroot/texinfo/texinfo/lib/memmove.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -c -r1.2 -r1.3
*** lib/memmove.c 10 Sep 2003 13:17:12 -0000 1.2
--- lib/memmove.c 21 Sep 2005 12:30:36 -0000 1.3
***************
*** 3,9 ****
In the public domain.
By David MacKenzie <address@hidden>. */
! #if HAVE_CONFIG_H
# include <config.h>
#endif
--- 3,9 ----
In the public domain.
By David MacKenzie <address@hidden>. */
! #ifdef HAVE_CONFIG_H
# include <config.h>
#endif
Index: lib/mkstemp.c
===================================================================
RCS file: /cvsroot/texinfo/texinfo/lib/mkstemp.c,v
retrieving revision 1.4
retrieving revision 1.5
diff -c -r1.4 -r1.5
*** lib/mkstemp.c 6 Jun 2005 12:35:10 -0000 1.4
--- lib/mkstemp.c 21 Sep 2005 12:30:36 -0000 1.5
***************
*** 15,21 ****
with this program; if not, write to the Free Software Foundation,
Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */
! #include <config.h>
/* Disable the definition of mkstemp to rpl_mkstemp (from config.h) in this
file. Otherwise, we'd get conflicting prototypes for rpl_mkstemp on
--- 15,23 ----
with this program; if not, write to the Free Software Foundation,
Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */
! #ifdef HAVE_CONFIG_H
! # include <config.h>
! #endif
/* Disable the definition of mkstemp to rpl_mkstemp (from config.h) in this
file. Otherwise, we'd get conflicting prototypes for rpl_mkstemp on
Index: lib/strcasecmp.c
===================================================================
RCS file: /cvsroot/texinfo/texinfo/lib/strcasecmp.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -c -r1.3 -r1.4
*** lib/strcasecmp.c 15 May 2005 00:00:07 -0000 1.3
--- lib/strcasecmp.c 21 Sep 2005 12:30:36 -0000 1.4
***************
*** 1,5 ****
! /* strcasecmp.c -- case insensitive string comparator
! Copyright (C) 1998, 1999 Free Software 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
--- 1,7 ----
! /* Case-insensitive string comparison function.
! Copyright (C) 1998, 1999, 2005 Free Software Foundation, Inc.
! Written by Bruno Haible <address@hidden>, 2005,
! based on earlier glibc code.
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
***************
*** 15,66 ****
along with this program; if not, write to the Free Software Foundation,
Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */
! #if HAVE_CONFIG_H
# include <config.h>
#endif
! #ifdef LENGTH_LIMIT
! # define STRXCASECMP_FUNCTION strncasecmp
! # define STRXCASECMP_DECLARE_N , size_t n
! # define LENGTH_LIMIT_EXPR(Expr) Expr
! #else
! # define STRXCASECMP_FUNCTION strcasecmp
! # define STRXCASECMP_DECLARE_N /* empty */
! # define LENGTH_LIMIT_EXPR(Expr) 0
! #endif
- #include <stddef.h>
#include <ctype.h>
! #define TOLOWER(Ch) (isupper (Ch) ? tolower (Ch) : (Ch))
! /* Compare {{no more than N characters of }}strings S1 and S2,
! ignoring case, returning less than, equal to or
! greater than zero if S1 is lexicographically less
! than, equal to or greater than S2. */
int
! STRXCASECMP_FUNCTION (const char *s1, const char *s2 STRXCASECMP_DECLARE_N)
{
! register const unsigned char *p1 = (const unsigned char *) s1;
! register const unsigned char *p2 = (const unsigned char *) s2;
! unsigned char c1, c2;
!
! if (p1 == p2 || LENGTH_LIMIT_EXPR (n == 0))
return 0;
! do
{
! c1 = TOLOWER (*p1);
! c2 = TOLOWER (*p2);
! if (LENGTH_LIMIT_EXPR (--n == 0) || c1 == '\0')
! break;
! ++p1;
! ++p2;
}
! while (c1 == c2);
! return c1 - c2;
}
--- 17,98 ----
along with this program; if not, write to the Free Software Foundation,
Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */
! #ifdef HAVE_CONFIG_H
# include <config.h>
#endif
! /* Specification. */
! #include "strcase.h"
#include <ctype.h>
! #if HAVE_MBRTOWC
! # include "mbuiter.h"
! #endif
! #define TOLOWER(Ch) (isupper (Ch) ? tolower (Ch) : (Ch))
+ /* Compare strings S1 and S2, ignoring case, returning less than, equal to or
+ greater than zero if S1 is lexicographically less than, equal to or greater
+ than S2.
+ Note: This function may, in multibyte locales, return 0 for strings of
+ different lengths! */
int
! strcasecmp (const char *s1, const char *s2)
{
! if (s1 == s2)
return 0;
! /* Be careful not to look at the entire extent of s1 or s2 until needed.
! This is useful because when two strings differ, the difference is
! most often already in the very few first characters. */
! #if HAVE_MBRTOWC
! if (MB_CUR_MAX > 1)
{
! mbui_iterator_t iter1;
! mbui_iterator_t iter2;
! mbui_init (iter1, s1);
! mbui_init (iter2, s2);
! while (mbui_avail (iter1) && mbui_avail (iter2))
! {
! int cmp = mb_casecmp (mbui_cur (iter1), mbui_cur (iter2));
!
! if (cmp != 0)
! return cmp;
!
! mbui_advance (iter1);
! mbui_advance (iter2);
! }
! if (mbui_avail (iter1))
! /* s2 terminated before s1. */
! return 1;
! if (mbui_avail (iter2))
! /* s1 terminated before s2. */
! return -1;
! return 0;
}
! else
! #endif
! {
! const unsigned char *p1 = (const unsigned char *) s1;
! const unsigned char *p2 = (const unsigned char *) s2;
! unsigned char c1, c2;
!
! do
! {
! c1 = TOLOWER (*p1);
! c2 = TOLOWER (*p2);
!
! if (c1 == '\0')
! break;
!
! ++p1;
! ++p2;
! }
! while (c1 == c2);
! return c1 - c2;
! }
}
Index: lib/strerror.c
===================================================================
RCS file: /cvsroot/texinfo/texinfo/lib/strerror.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -c -r1.3 -r1.4
*** lib/strerror.c 15 May 2005 00:00:07 -0000 1.3
--- lib/strerror.c 21 Sep 2005 12:30:36 -0000 1.4
***************
*** 17,23 ****
along with this program; if not, write to the Free Software Foundation,
Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */
! #if HAVE_CONFIG_H
# include <config.h>
#endif
--- 17,23 ----
along with this program; if not, write to the Free Software Foundation,
Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */
! #ifdef HAVE_CONFIG_H
# include <config.h>
#endif
Index: lib/strncasecmp.c
===================================================================
RCS file: /cvsroot/texinfo/texinfo/lib/strncasecmp.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -c -r1.1 -r1.2
*** lib/strncasecmp.c 3 Sep 2002 15:51:40 -0000 1.1
--- lib/strncasecmp.c 21 Sep 2005 12:30:36 -0000 1.2
***************
*** 1,2 ****
! #define LENGTH_LIMIT
! #include "strcasecmp.c"
--- 1,58 ----
! /* strncasecmp.c -- case insensitive string comparator
! Copyright (C) 1998, 1999 Free Software 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
! 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; if not, write to the Free Software Foundation,
! Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */
!
! #ifdef HAVE_CONFIG_H
! # include <config.h>
! #endif
!
! /* Specification. */
! #include "strcase.h"
!
! #include <ctype.h>
!
! #define TOLOWER(Ch) (isupper (Ch) ? tolower (Ch) : (Ch))
!
! /* Compare no more than N bytes of strings S1 and S2,
! ignoring case, returning less than, equal to or
! greater than zero if S1 is lexicographically less
! than, equal to or greater than S2. */
!
! int
! strncasecmp (const char *s1, const char *s2, size_t n)
! {
! register const unsigned char *p1 = (const unsigned char *) s1;
! register const unsigned char *p2 = (const unsigned char *) s2;
! unsigned char c1, c2;
!
! if (p1 == p2 || n == 0)
! return 0;
!
! do
! {
! c1 = TOLOWER (*p1);
! c2 = TOLOWER (*p2);
!
! if (--n == 0 || c1 == '\0')
! break;
!
! ++p1;
! ++p2;
! }
! while (c1 == c2);
!
! return c1 - c2;
! }
Index: lib/tempname.c
===================================================================
RCS file: /cvsroot/texinfo/texinfo/lib/tempname.c,v
retrieving revision 1.9
retrieving revision 1.10
diff -c -r1.9 -r1.10
*** lib/tempname.c 3 Jul 2005 12:55:36 -0000 1.9
--- lib/tempname.c 21 Sep 2005 12:30:36 -0000 1.10
***************
*** 17,23 ****
with this program; if not, write to the Free Software Foundation,
Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */
! #if HAVE_CONFIG_H
# include <config.h>
#endif
--- 17,23 ----
with this program; if not, write to the Free Software Foundation,
Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */
! #ifdef HAVE_CONFIG_H
# include <config.h>
#endif
Index: m4/lib-link.m4
===================================================================
RCS file: /cvsroot/texinfo/texinfo/m4/lib-link.m4,v
retrieving revision 1.6
retrieving revision 1.7
diff -c -r1.6 -r1.7
*** m4/lib-link.m4 16 Mar 2005 13:08:36 -0000 1.6
--- m4/lib-link.m4 21 Sep 2005 12:30:36 -0000 1.7
***************
*** 1,4 ****
! # lib-link.m4 serial 6 (gettext-0.14.3)
dnl Copyright (C) 2001-2005 Free Software Foundation, Inc.
dnl This file is free software; the Free Software Foundation
dnl gives unlimited permission to copy and/or distribute it,
--- 1,4 ----
! # lib-link.m4 serial 7 (gettext-0.15)
dnl Copyright (C) 2001-2005 Free Software Foundation, Inc.
dnl This file is free software; the Free Software Foundation
dnl gives unlimited permission to copy and/or distribute it,
***************
*** 126,131 ****
--- 126,132 ----
dnl Sets the LIB${NAME}, LTLIB${NAME} and INC${NAME} variables.
AC_DEFUN([AC_LIB_LINKFLAGS_BODY],
[
+ AC_REQUIRE([AC_LIB_PREPARE_MULTILIB])
define([NAME],[translit([$1],[abcdefghijklmnopqrstuvwxyz./-],
[ABCDEFGHIJKLMNOPQRSTUVWXYZ___])])
dnl By default, look in $includedir and $libdir.
***************
*** 148,154 ****
])
else
additional_includedir="$withval/include"
! additional_libdir="$withval/lib"
fi
fi
])
--- 149,155 ----
])
else
additional_includedir="$withval/include"
! additional_libdir="$withval/$acl_libdirstem"
fi
fi
])
***************
*** 248,254 ****
dnl Linking with a shared library. We attempt to hardcode its
dnl directory into the executable's runpath, unless it's the
dnl standard /usr/lib.
! if test "$enable_rpath" = no || test "X$found_dir" =
"X/usr/lib"; then
dnl No hardcoding is needed.
LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }$found_so"
else
--- 249,255 ----
dnl Linking with a shared library. We attempt to hardcode its
dnl directory into the executable's runpath, unless it's the
dnl standard /usr/lib.
! if test "$enable_rpath" = no || test "X$found_dir" =
"X/usr/$acl_libdirstem"; then
dnl No hardcoding is needed.
LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }$found_so"
else
***************
*** 334,341 ****
dnl Assume the include files are nearby.
additional_includedir=
case "$found_dir" in
! */lib | */lib/)
! basedir=`echo "X$found_dir" | sed -e 's,^X,,' -e
's,/lib/*$,,'`
additional_includedir="$basedir/include"
;;
esac
--- 335,342 ----
dnl Assume the include files are nearby.
additional_includedir=
case "$found_dir" in
! */$acl_libdirstem | */$acl_libdirstem/)
! basedir=`echo "X$found_dir" | sed -e 's,^X,,' -e
"s,/$acl_libdirstem/"'*$,,'`
additional_includedir="$basedir/include"
;;
esac
***************
*** 396,404 ****
dnl 3. if it's already present in $LDFLAGS or the
already
dnl constructed $LIBNAME,
dnl 4. if it doesn't exist as a directory.
! if test "X$additional_libdir" != "X/usr/lib"; then
haveit=
! if test "X$additional_libdir" = "X/usr/local/lib"; then
if test -n "$GCC"; then
case $host_os in
linux* | gnu* | k*bsd*-gnu) haveit=yes;;
--- 397,405 ----
dnl 3. if it's already present in $LDFLAGS or the
already
dnl constructed $LIBNAME,
dnl 4. if it doesn't exist as a directory.
! if test "X$additional_libdir" != "X/usr/$acl_libdirstem";
then
haveit=
! if test "X$additional_libdir" =
"X/usr/local/$acl_libdirstem"; then
if test -n "$GCC"; then
case $host_os in
linux* | gnu* | k*bsd*-gnu) haveit=yes;;
Index: m4/lib-prefix.m4
===================================================================
RCS file: /cvsroot/texinfo/texinfo/m4/lib-prefix.m4,v
retrieving revision 1.5
retrieving revision 1.6
diff -c -r1.5 -r1.6
*** m4/lib-prefix.m4 14 Mar 2005 13:06:23 -0000 1.5
--- m4/lib-prefix.m4 21 Sep 2005 12:30:36 -0000 1.6
***************
*** 1,4 ****
! # lib-prefix.m4 serial 4 (gettext-0.14.2)
dnl Copyright (C) 2001-2005 Free Software Foundation, Inc.
dnl This file is free software; the Free Software Foundation
dnl gives unlimited permission to copy and/or distribute it,
--- 1,4 ----
! # lib-prefix.m4 serial 5 (gettext-0.15)
dnl Copyright (C) 2001-2005 Free Software Foundation, Inc.
dnl This file is free software; the Free Software Foundation
dnl gives unlimited permission to copy and/or distribute it,
***************
*** 24,29 ****
--- 24,30 ----
AC_BEFORE([$0], [AC_LIB_LINKFLAGS])
AC_REQUIRE([AC_PROG_CC])
AC_REQUIRE([AC_CANONICAL_HOST])
+ AC_REQUIRE([AC_LIB_PREPARE_MULTILIB])
AC_REQUIRE([AC_LIB_PREPARE_PREFIX])
dnl By default, look in $includedir and $libdir.
use_additional=yes
***************
*** 45,51 ****
])
else
additional_includedir="$withval/include"
! additional_libdir="$withval/lib"
fi
fi
])
--- 46,52 ----
])
else
additional_includedir="$withval/include"
! additional_libdir="$withval/$acl_libdirstem"
fi
fi
])
***************
*** 87,93 ****
dnl 2. if it's already present in $LDFLAGS,
dnl 3. if it's /usr/local/lib and we are using GCC on Linux,
dnl 4. if it doesn't exist as a directory.
! if test "X$additional_libdir" != "X/usr/lib"; then
haveit=
for x in $LDFLAGS; do
AC_LIB_WITH_FINAL_PREFIX([eval x=\"$x\"])
--- 88,94 ----
dnl 2. if it's already present in $LDFLAGS,
dnl 3. if it's /usr/local/lib and we are using GCC on Linux,
dnl 4. if it doesn't exist as a directory.
! if test "X$additional_libdir" != "X/usr/$acl_libdirstem"; then
haveit=
for x in $LDFLAGS; do
AC_LIB_WITH_FINAL_PREFIX([eval x=\"$x\"])
***************
*** 97,103 ****
fi
done
if test -z "$haveit"; then
! if test "X$additional_libdir" = "X/usr/local/lib"; then
if test -n "$GCC"; then
case $host_os in
linux*) haveit=yes;;
--- 98,104 ----
fi
done
if test -z "$haveit"; then
! if test "X$additional_libdir" = "X/usr/local/$acl_libdirstem"; then
if test -n "$GCC"; then
case $host_os in
linux*) haveit=yes;;
***************
*** 150,153 ****
--- 151,185 ----
$1
exec_prefix="$acl_save_exec_prefix"
prefix="$acl_save_prefix"
+ ])
+
+ dnl AC_LIB_PREPARE_MULTILIB creates a variable acl_libdirstem, containing
+ dnl the basename of the libdir, either "lib" or "lib64".
+ AC_DEFUN([AC_LIB_PREPARE_MULTILIB],
+ [
+ dnl There is no formal standard regarding lib and lib64. The current
+ dnl practice is that on a system supporting 32-bit and 64-bit instruction
+ dnl sets or ABIs, 64-bit libraries go under $prefix/lib64 and 32-bit
+ dnl libraries go under $prefix/lib. We determine the compiler's default
+ dnl mode by looking at the compiler's library search path. If at least
+ dnl of its elements ends in /lib64 or points to a directory whose absolute
+ dnl pathname ends in /lib64, we assume a 64-bit ABI. Otherwise we use the
+ dnl default, namely "lib".
+ acl_libdirstem=lib
+ searchpath=`(LC_ALL=C $CC -print-search-dirs) 2>/dev/null | sed -n -e
's,^libraries: ,,p' | sed -e 's,^=,,'`
+ if test -n "$searchpath"; then
+ acl_save_IFS="${IFS= }"; IFS=":"
+ for searchdir in $searchpath; do
+ if test -d "$searchdir"; then
+ case "$searchdir" in
+ */lib64/ | */lib64 ) acl_libdirstem=lib64 ;;
+ *) searchdir=`cd "$searchdir" && pwd`
+ case "$searchdir" in
+ */lib64 ) acl_libdirstem=lib64 ;;
+ esac ;;
+ esac
+ fi
+ done
+ IFS="$acl_save_IFS"
+ fi
])
P lib/memcpy.c
P lib/memmove.c
P lib/mkstemp.c
P lib/strcasecmp.c
P lib/strerror.c
P lib/strncasecmp.c
P lib/tempname.c
P m4/lib-link.m4
P m4/lib-prefix.m4
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- texinfo update (Wed Sep 21 08:52:01 EDT 2005),
Karl Berry <=