mirror of
https://git.savannah.gnu.org/git/guile.git
synced 2025-04-29 19:30:36 +02:00
Update Gnulib to v0.0-3966-g9f737c8 for `libunistring' m4 fixes.
This commit is contained in:
Ludovic Courtès
parent
615eb45521
commit
6f32e5c739
7 changed files with 99 additions and 51 deletions
|
|
@ -1400,6 +1400,7 @@ time.h: time.in.h $(CXXDEFS_H) $(ARG_NONNULL_H) $(WARN_ON_USE_H)
|
|||
-e 's|@''REPLACE_MKTIME''@|$(REPLACE_MKTIME)|g' \
|
||||
-e 's|@''REPLACE_NANOSLEEP''@|$(REPLACE_NANOSLEEP)|g' \
|
||||
-e 's|@''REPLACE_TIMEGM''@|$(REPLACE_TIMEGM)|g' \
|
||||
-e 's|@''PTHREAD_H_DEFINES_STRUCT_TIMESPEC''@|$(PTHREAD_H_DEFINES_STRUCT_TIMESPEC)|g' \
|
||||
-e 's|@''SYS_TIME_H_DEFINES_STRUCT_TIMESPEC''@|$(SYS_TIME_H_DEFINES_STRUCT_TIMESPEC)|g' \
|
||||
-e 's|@''TIME_H_DEFINES_STRUCT_TIMESPEC''@|$(TIME_H_DEFINES_STRUCT_TIMESPEC)|g' \
|
||||
-e '/definitions of _GL_FUNCDECL_RPL/r $(CXXDEFS_H)' \
|
||||
|
|
@ -1566,46 +1567,41 @@ EXTRA_DIST += unistr.in.h
|
|||
|
||||
## begin gnulib module unistr/u8-mbtouc
|
||||
|
||||
|
||||
EXTRA_DIST += unistr/u8-mbtouc-aux.c unistr/u8-mbtouc.c
|
||||
|
||||
EXTRA_libgnu_la_SOURCES += unistr/u8-mbtouc-aux.c unistr/u8-mbtouc.c
|
||||
if LIBUNISTRING_COMPILE_UNISTR_U8_MBTOUC
|
||||
libgnu_la_SOURCES += unistr/u8-mbtouc.c unistr/u8-mbtouc-aux.c
|
||||
endif
|
||||
|
||||
## end gnulib module unistr/u8-mbtouc
|
||||
|
||||
## begin gnulib module unistr/u8-mbtouc-unsafe
|
||||
|
||||
|
||||
EXTRA_DIST += unistr/u8-mbtouc-unsafe-aux.c unistr/u8-mbtouc-unsafe.c
|
||||
|
||||
EXTRA_libgnu_la_SOURCES += unistr/u8-mbtouc-unsafe-aux.c unistr/u8-mbtouc-unsafe.c
|
||||
if LIBUNISTRING_COMPILE_UNISTR_U8_MBTOUC_UNSAFE
|
||||
libgnu_la_SOURCES += unistr/u8-mbtouc-unsafe.c unistr/u8-mbtouc-unsafe-aux.c
|
||||
endif
|
||||
|
||||
## end gnulib module unistr/u8-mbtouc-unsafe
|
||||
|
||||
## begin gnulib module unistr/u8-mbtoucr
|
||||
|
||||
|
||||
EXTRA_DIST += unistr/u8-mbtoucr.c
|
||||
|
||||
EXTRA_libgnu_la_SOURCES += unistr/u8-mbtoucr.c
|
||||
if LIBUNISTRING_COMPILE_UNISTR_U8_MBTOUCR
|
||||
libgnu_la_SOURCES += unistr/u8-mbtoucr.c
|
||||
endif
|
||||
|
||||
## end gnulib module unistr/u8-mbtoucr
|
||||
|
||||
## begin gnulib module unistr/u8-prev
|
||||
|
||||
|
||||
EXTRA_DIST += unistr/u8-prev.c
|
||||
|
||||
EXTRA_libgnu_la_SOURCES += unistr/u8-prev.c
|
||||
if LIBUNISTRING_COMPILE_UNISTR_U8_PREV
|
||||
libgnu_la_SOURCES += unistr/u8-prev.c
|
||||
endif
|
||||
|
||||
## end gnulib module unistr/u8-prev
|
||||
|
||||
## begin gnulib module unistr/u8-uctomb
|
||||
|
||||
|
||||
EXTRA_DIST += unistr/u8-uctomb-aux.c unistr/u8-uctomb.c
|
||||
|
||||
EXTRA_libgnu_la_SOURCES += unistr/u8-uctomb-aux.c unistr/u8-uctomb.c
|
||||
if LIBUNISTRING_COMPILE_UNISTR_U8_UCTOMB
|
||||
libgnu_la_SOURCES += unistr/u8-uctomb.c unistr/u8-uctomb-aux.c
|
||||
endif
|
||||
|
||||
## end gnulib module unistr/u8-uctomb
|
||||
|
||||
|
|
|
|||
|
|
@ -48,10 +48,20 @@
|
|||
|
||||
/* Some systems don't define struct timespec (e.g., AIX 4.1, Ultrix 4.3).
|
||||
Or they define it with the wrong member names or define it in <sys/time.h>
|
||||
(e.g., FreeBSD circa 1997). */
|
||||
(e.g., FreeBSD circa 1997). Stock Mingw does not define it, but the
|
||||
pthreads-win32 library defines it in <pthread.h>. */
|
||||
# if ! @TIME_H_DEFINES_STRUCT_TIMESPEC@
|
||||
# if @SYS_TIME_H_DEFINES_STRUCT_TIMESPEC@
|
||||
# include <sys/time.h>
|
||||
# elif @PTHREAD_H_DEFINES_STRUCT_TIMESPEC@
|
||||
# include <pthread.h>
|
||||
/* The pthreads-win32 <pthread.h> also defines a couple of broken macros. */
|
||||
# undef asctime_r
|
||||
# undef ctime_r
|
||||
# undef gmtime_r
|
||||
# undef localtime_r
|
||||
# undef rand_r
|
||||
# undef strtok_r
|
||||
# else
|
||||
|
||||
# ifdef __cplusplus
|
||||
|
|
|
|||
|
|
@ -354,18 +354,18 @@ AC_DEFUN([gl_INIT],
|
|||
gl_LIBUNISTRING_LIBHEADER([0.9.2], [unistr.h])
|
||||
# Code from module unistr/u8-mbtouc:
|
||||
gl_MODULE_INDICATOR([unistr/u8-mbtouc])
|
||||
gl_LIBUNISTRING_LIBSOURCE([0.9], [unistr/u8-mbtouc.c unistr/u8-mbtouc-aux.c])
|
||||
gl_LIBUNISTRING_MODULE([0.9], [unistr/u8-mbtouc])
|
||||
# Code from module unistr/u8-mbtouc-unsafe:
|
||||
gl_MODULE_INDICATOR([unistr/u8-mbtouc-unsafe])
|
||||
gl_LIBUNISTRING_LIBSOURCE([0.9], [unistr/u8-mbtouc-unsafe.c unistr/u8-mbtouc-unsafe-aux.c])
|
||||
gl_LIBUNISTRING_MODULE([0.9], [unistr/u8-mbtouc-unsafe])
|
||||
# Code from module unistr/u8-mbtoucr:
|
||||
gl_MODULE_INDICATOR([unistr/u8-mbtoucr])
|
||||
gl_LIBUNISTRING_LIBSOURCE([0.9], [unistr/u8-mbtoucr.c])
|
||||
gl_LIBUNISTRING_MODULE([0.9], [unistr/u8-mbtoucr])
|
||||
# Code from module unistr/u8-prev:
|
||||
gl_LIBUNISTRING_LIBSOURCE([0.9], [unistr/u8-prev.c])
|
||||
gl_LIBUNISTRING_MODULE([0.9], [unistr/u8-prev])
|
||||
# Code from module unistr/u8-uctomb:
|
||||
gl_MODULE_INDICATOR([unistr/u8-uctomb])
|
||||
gl_LIBUNISTRING_LIBSOURCE([0.9], [unistr/u8-uctomb.c unistr/u8-uctomb-aux.c])
|
||||
gl_LIBUNISTRING_MODULE([0.9], [unistr/u8-uctomb])
|
||||
# Code from module unitypes:
|
||||
gl_LIBUNISTRING_LIBHEADER([0.9], [unitypes.h])
|
||||
# Code from module unused-parameter:
|
||||
|
|
|
|||
16
m4/iconv.m4
16
m4/iconv.m4
|
|
@ -1,4 +1,4 @@
|
|||
# iconv.m4 serial 10 (gettext-0.18.1)
|
||||
# iconv.m4 serial 11 (gettext-0.18.1)
|
||||
dnl Copyright (C) 2000-2002, 2007-2010 Free Software Foundation, Inc.
|
||||
dnl This file is free software; the Free Software Foundation
|
||||
dnl gives unlimited permission to copy and/or distribute it,
|
||||
|
|
@ -173,7 +173,19 @@ int main ()
|
|||
dnl Define AM_ICONV using AC_DEFUN_ONCE for Autoconf >= 2.64, in order to
|
||||
dnl avoid warnings like
|
||||
dnl "warning: AC_REQUIRE: `AM_ICONV' was expanded before it was required".
|
||||
m4_version_prereq([2.64],[AC_DEFUN_ONCE],[AC_DEFUN])([AM_ICONV],
|
||||
dnl This is tricky because of the way 'aclocal' is implemented:
|
||||
dnl - It requires defining an auxiliary macro whose name ends in AC_DEFUN.
|
||||
dnl Otherwise aclocal's initial scan pass would miss the macro definition.
|
||||
dnl - It requires a line break inside the AC_DEFUN_ONCE and AC_DEFUN expansions.
|
||||
dnl Otherwise aclocal would emit many "Use of uninitialized value $1"
|
||||
dnl warnings.
|
||||
m4_define([gl_iconv_AC_DEFUN],
|
||||
m4_version_prereq([2.64],
|
||||
[[AC_DEFUN_ONCE(
|
||||
[$1], [$2])]],
|
||||
[[AC_DEFUN(
|
||||
[$1], [$2])]]))
|
||||
gl_iconv_AC_DEFUN([AM_ICONV],
|
||||
[
|
||||
AM_ICONV_LINK
|
||||
if test "$am_cv_func_iconv" = yes; then
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
# libunistring-base.m4 serial 2
|
||||
# libunistring-base.m4 serial 5
|
||||
dnl Copyright (C) 2010 Free Software Foundation, Inc.
|
||||
dnl This file is free software; the Free Software Foundation
|
||||
dnl gives unlimited permission to copy and/or distribute it,
|
||||
|
|
@ -6,29 +6,26 @@ dnl with or without modifications, as long as this notice is preserved.
|
|||
|
||||
dnl From Paolo Bonzini and Bruno Haible.
|
||||
|
||||
dnl gl_LIBUNISTRING_LIBSOURCE([VERSION], [SourceFile])
|
||||
dnl Declares that SourceFile should be compiled, unless we are linking
|
||||
dnl with libunistring and its version is >= the given VERSION.
|
||||
dnl SourceFile should be relative to the lib directory and end in '.c'.
|
||||
dnl gl_LIBUNISTRING_MODULE([VERSION], [Module])
|
||||
dnl Declares that the source files of Module should be compiled, unless we
|
||||
dnl are linking with libunistring and its version is >= the given VERSION.
|
||||
dnl Defines an automake conditional LIBUNISTRING_COMPILE_$MODULE that is
|
||||
dnl true if the source files of Module should be compiled.
|
||||
dnl This macro is to be used for public libunistring API, not for
|
||||
dnl undocumented API.
|
||||
dnl
|
||||
dnl You have to bump the VERSION argument to the next projected version
|
||||
dnl number each time you make a change that affects the behaviour of the
|
||||
dnl functions defined in SourceFile (even if SourceFile itself does not
|
||||
dnl functions defined in Module (even if the sources of Module itself do not
|
||||
dnl change).
|
||||
|
||||
AC_DEFUN([gl_LIBUNISTRING_LIBSOURCE],
|
||||
AC_DEFUN([gl_LIBUNISTRING_MODULE],
|
||||
[
|
||||
AC_REQUIRE([gl_LIBUNISTRING_LIB_PREPARE])
|
||||
dnl Use the variables HAVE_LIBUNISTRING, LIBUNISTRING_VERSION from
|
||||
dnl gl_LIBUNISTRING_CORE if that macro has been run.
|
||||
if gl_LIBUNISTRING_VERSION_CMP([$1])
|
||||
then
|
||||
m4_foreach_w([gl_source_file], [$2],
|
||||
[AC_LIBOBJ(m4_bpatsubst(m4_defn([gl_source_file]), [\.c$], []))
|
||||
])
|
||||
fi
|
||||
AM_CONDITIONAL(AS_TR_CPP([LIBUNISTRING_COMPILE_$2]),
|
||||
[gl_LIBUNISTRING_VERSION_CMP([$1])])
|
||||
])
|
||||
|
||||
dnl gl_LIBUNISTRING_LIBHEADER([VERSION], [HeaderFile])
|
||||
|
|
@ -39,8 +36,8 @@ dnl Prepares for substituting LIBUNISTRING_HEADERFILE (to HeaderFile or empty).
|
|||
dnl
|
||||
dnl When we are linking with the already installed libunistring and its version
|
||||
dnl is < VERSION, we create HeaderFile here, because we may compile functions
|
||||
dnl (via gl_LIBUNISTRING_LIBSOURCE above) that are not contained in the
|
||||
dnl installed version.
|
||||
dnl (via gl_LIBUNISTRING_MODULE above) that are not contained in the installed
|
||||
dnl version.
|
||||
dnl When we are linking with the already installed libunistring and its version
|
||||
dnl is > VERSION, we don't create HeaderFile here: it could cause compilation
|
||||
dnl errors in other libunistring header files if some types are missing.
|
||||
|
|
@ -53,8 +50,7 @@ AC_DEFUN([gl_LIBUNISTRING_LIBHEADER],
|
|||
AC_REQUIRE([gl_LIBUNISTRING_LIB_PREPARE])
|
||||
dnl Use the variables HAVE_LIBUNISTRING, LIBUNISTRING_VERSION from
|
||||
dnl gl_LIBUNISTRING_CORE if that macro has been run.
|
||||
if gl_LIBUNISTRING_VERSION_CMP([$1])
|
||||
then
|
||||
if gl_LIBUNISTRING_VERSION_CMP([$1]); then
|
||||
LIBUNISTRING_[]AS_TR_CPP([$2])='$2'
|
||||
else
|
||||
LIBUNISTRING_[]AS_TR_CPP([$2])=
|
||||
|
|
@ -66,6 +62,9 @@ dnl Miscellaneous preparations/initializations.
|
|||
|
||||
AC_DEFUN([gl_LIBUNISTRING_LIB_PREPARE],
|
||||
[
|
||||
dnl Ensure that HAVE_LIBUNISTRING is fully determined at this point.
|
||||
m4_ifdef([gl_LIBUNISTRING], [AC_REQUIRE([gl_LIBUNISTRING])])
|
||||
|
||||
AC_REQUIRE([AC_PROG_AWK])
|
||||
|
||||
dnl Sed expressions to extract the parts of a version number.
|
||||
|
|
@ -135,8 +134,7 @@ AC_DEFUN([gl_LIBUNISTRING_VERSION_CMP],
|
|||
}
|
||||
])
|
||||
}
|
||||
}
|
||||
])
|
||||
}])
|
||||
|
||||
dnl gl_LIBUNISTRING_ARG_OR_ZERO([ARG], [ORIG]) expands to ARG if it is not the
|
||||
dnl same as ORIG, otherwise to 0.
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
# libunistring.m4 serial 6
|
||||
# libunistring.m4 serial 9
|
||||
dnl Copyright (C) 2009-2010 Free Software Foundation, Inc.
|
||||
dnl This file is free software; the Free Software Foundation
|
||||
dnl gives unlimited permission to copy and/or distribute it,
|
||||
|
|
@ -12,9 +12,24 @@ dnl augments the CPPFLAGS variable, and #defines HAVE_LIBUNISTRING to 1.
|
|||
dnl Otherwise, it sets and AC_SUBSTs HAVE_LIBUNISTRING=no and LIBUNISTRING and
|
||||
dnl LTLIBUNISTRING to empty.
|
||||
|
||||
AC_DEFUN([gl_LIBUNISTRING],
|
||||
dnl Define gl_LIBUNISTRING using AC_DEFUN_ONCE for Autoconf >= 2.64, in order
|
||||
dnl to avoid warnings like
|
||||
dnl "warning: AC_REQUIRE: `gl_LIBUNISTRING' was expanded before it was required".
|
||||
dnl This is tricky because of the way 'aclocal' is implemented:
|
||||
dnl - It requires defining an auxiliary macro whose name ends in AC_DEFUN.
|
||||
dnl Otherwise aclocal's initial scan pass would miss the macro definition.
|
||||
dnl - It requires a line break inside the AC_DEFUN_ONCE and AC_DEFUN expansions.
|
||||
dnl Otherwise aclocal would emit many "Use of uninitialized value $1"
|
||||
dnl warnings.
|
||||
m4_define([gl_libunistring_AC_DEFUN],
|
||||
m4_version_prereq([2.64],
|
||||
[[AC_DEFUN_ONCE(
|
||||
[$1], [$2])]],
|
||||
[[AC_DEFUN(
|
||||
[$1], [$2])]]))
|
||||
gl_libunistring_AC_DEFUN([gl_LIBUNISTRING],
|
||||
[
|
||||
AC_BEFORE([$0], [gl_LIBUNISTRING_LIBSOURCE])
|
||||
AC_BEFORE([$0], [gl_LIBUNISTRING_MODULE])
|
||||
AC_BEFORE([$0], [gl_LIBUNISTRING_LIBHEADER])
|
||||
AC_BEFORE([$0], [gl_LIBUNISTRING_LIB_PREPARE])
|
||||
|
||||
|
|
|
|||
19
m4/time_h.m4
19
m4/time_h.m4
|
|
@ -2,6 +2,8 @@
|
|||
|
||||
# Copyright (C) 2000-2001, 2003-2007, 2009-2010 Free Software Foundation, Inc.
|
||||
|
||||
# serial 2
|
||||
|
||||
# This file 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.
|
||||
|
|
@ -24,7 +26,7 @@ AC_DEFUN([gl_HEADER_TIME_H_BODY],
|
|||
])
|
||||
|
||||
dnl Define HAVE_STRUCT_TIMESPEC if `struct timespec' is declared
|
||||
dnl in time.h or sys/time.h.
|
||||
dnl in time.h, sys/time.h, or pthread.h.
|
||||
|
||||
AC_DEFUN([gl_CHECK_TYPE_STRUCT_TIMESPEC],
|
||||
[
|
||||
|
|
@ -41,6 +43,7 @@ AC_DEFUN([gl_CHECK_TYPE_STRUCT_TIMESPEC],
|
|||
|
||||
TIME_H_DEFINES_STRUCT_TIMESPEC=0
|
||||
SYS_TIME_H_DEFINES_STRUCT_TIMESPEC=0
|
||||
PTHREAD_H_DEFINES_STRUCT_TIMESPEC=0
|
||||
if test $gl_cv_sys_struct_timespec_in_time_h = yes; then
|
||||
TIME_H_DEFINES_STRUCT_TIMESPEC=1
|
||||
else
|
||||
|
|
@ -55,10 +58,24 @@ AC_DEFUN([gl_CHECK_TYPE_STRUCT_TIMESPEC],
|
|||
[gl_cv_sys_struct_timespec_in_sys_time_h=no])])
|
||||
if test $gl_cv_sys_struct_timespec_in_sys_time_h = yes; then
|
||||
SYS_TIME_H_DEFINES_STRUCT_TIMESPEC=1
|
||||
else
|
||||
AC_CACHE_CHECK([for struct timespec in <pthread.h>],
|
||||
[gl_cv_sys_struct_timespec_in_pthread_h],
|
||||
[AC_COMPILE_IFELSE(
|
||||
[AC_LANG_PROGRAM(
|
||||
[[#include <pthread.h>
|
||||
]],
|
||||
[[static struct timespec x; x.tv_sec = x.tv_nsec;]])],
|
||||
[gl_cv_sys_struct_timespec_in_pthread_h=yes],
|
||||
[gl_cv_sys_struct_timespec_in_pthread_h=no])])
|
||||
if test $gl_cv_sys_struct_timespec_in_pthread_h = yes; then
|
||||
PTHREAD_H_DEFINES_STRUCT_TIMESPEC=1
|
||||
fi
|
||||
fi
|
||||
fi
|
||||
AC_SUBST([TIME_H_DEFINES_STRUCT_TIMESPEC])
|
||||
AC_SUBST([SYS_TIME_H_DEFINES_STRUCT_TIMESPEC])
|
||||
AC_SUBST([PTHREAD_H_DEFINES_STRUCT_TIMESPEC])
|
||||
])
|
||||
|
||||
AC_DEFUN([gl_TIME_MODULE_INDICATOR],
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue