mirror of
https://git.savannah.gnu.org/git/guile.git
synced 2025-04-29 19:30:36 +02:00
Avoid Gnulib unistr/* modules
(unistr/base, unistr/u8-mbtouc, unistr/u8-mbtouc-unsafe) (unistr/u8-mbtoucr, unistr/u8-prev unistr/u8-uctomb, unitypes): --avoid these modules.
This commit is contained in:
Andy Wingo
parent
d484bfbace
commit
b05b67b2b3
16 changed files with 4 additions and 2705 deletions
|
|
@ -27,7 +27,7 @@
|
|||
|
||||
|
||||
# Specification in the form of a command-line invocation:
|
||||
# gnulib-tool --import --local-dir=gnulib-local --lib=libgnu --source-base=lib --m4-base=m4 --doc-base=doc --tests-base=tests --aux-dir=build-aux --avoid=lock --lgpl=3 --conditional-dependencies --libtool --macro-prefix=gl --no-vc-files accept alignof alloca-opt announce-gen autobuild bind byteswap c-strcase canonicalize-lgpl ceil clock-time close connect copysign dirfd duplocale environ extensions flock floor fpieee frexp fstat fsync full-read full-write func gendocs getaddrinfo getlogin getpeername getsockname getsockopt git-version-gen gitlog-to-changelog gnu-web-doc-update gnupload havelib iconv_open-utf inet_ntop inet_pton isfinite isinf isnan ldexp lib-symbol-versions lib-symbol-visibility libunistring link listen localcharset locale log1p lstat maintainer-makefile malloc-gnu malloca mkdir mkstemp nl_langinfo nproc open pipe-posix pipe2 poll putenv readlink recv recvfrom regex rename rmdir select send sendto setenv setsockopt shutdown socket stat-time stdlib strftime striconveh string sys_stat time times trunc unistd verify vsnprintf warnings wchar
|
||||
# gnulib-tool --import --local-dir=gnulib-local --lib=libgnu --source-base=lib --m4-base=m4 --doc-base=doc --tests-base=tests --aux-dir=build-aux --avoid=lock --avoid=unistr/base --avoid=unistr/u8-mbtouc --avoid=unistr/u8-mbtouc-unsafe --avoid=unistr/u8-mbtoucr --avoid=unistr/u8-prev --avoid=unistr/u8-uctomb --avoid=unitypes --lgpl=3 --conditional-dependencies --libtool --macro-prefix=gl --no-vc-files accept alignof alloca-opt announce-gen autobuild bind byteswap c-strcase canonicalize-lgpl ceil clock-time close connect copysign dirfd duplocale environ extensions flock floor fpieee frexp fstat fsync full-read full-write func gendocs getaddrinfo getlogin getpeername getsockname getsockopt git-version-gen gitlog-to-changelog gnu-web-doc-update gnupload havelib iconv_open-utf inet_ntop inet_pton isfinite isinf isnan ldexp lib-symbol-versions lib-symbol-visibility libunistring link listen localcharset locale log1p lstat maintainer-makefile malloc-gnu malloca mkdir mkstemp nl_langinfo nproc open pipe-posix pipe2 poll putenv readlink recv recvfrom regex rename rmdir select send sendto setenv setsockopt shutdown socket stat-time stdlib strftime striconveh string sys_stat time times trunc unistd verify vsnprintf warnings wchar
|
||||
|
||||
# Specification in the form of a few gnulib-tool.m4 macro invocations:
|
||||
gl_LOCAL_DIR([gnulib-local])
|
||||
|
|
@ -126,7 +126,7 @@ gl_MODULES([
|
|||
warnings
|
||||
wchar
|
||||
])
|
||||
gl_AVOID([ lock])
|
||||
gl_AVOID([ lock unistr/base unistr/u8-mbtouc unistr/u8-mbtouc-unsafe unistr/u8-mbtoucr unistr/u8-prev unistr/u8-uctomb unitypes])
|
||||
gl_SOURCE_BASE([lib])
|
||||
gl_M4_BASE([m4])
|
||||
gl_PO_BASE([])
|
||||
|
|
|
|||
|
|
@ -42,7 +42,6 @@ AC_DEFUN([gl_EARLY],
|
|||
AC_REQUIRE([gl_USE_SYSTEM_EXTENSIONS])
|
||||
AC_REQUIRE([gl_PROG_AR_RANLIB])
|
||||
|
||||
AC_REQUIRE([AM_PROG_CC_C_O])
|
||||
# Code from module absolute-header:
|
||||
# Code from module accept:
|
||||
# Code from module alignof:
|
||||
|
|
@ -117,7 +116,6 @@ AC_DEFUN([gl_EARLY],
|
|||
# Code from module include_next:
|
||||
# Code from module inet_ntop:
|
||||
# Code from module inet_pton:
|
||||
# Code from module inline:
|
||||
# Code from module intprops:
|
||||
# Code from module isfinite:
|
||||
# Code from module isinf:
|
||||
|
|
@ -197,7 +195,6 @@ AC_DEFUN([gl_EARLY],
|
|||
# Code from module snippet/_Noreturn:
|
||||
# Code from module snippet/arg-nonnull:
|
||||
# Code from module snippet/c++defs:
|
||||
# Code from module snippet/unused-parameter:
|
||||
# Code from module snippet/warn-on-use:
|
||||
# Code from module snprintf:
|
||||
# Code from module socket:
|
||||
|
|
@ -234,13 +231,6 @@ AC_DEFUN([gl_EARLY],
|
|||
# Code from module times:
|
||||
# Code from module trunc:
|
||||
# Code from module unistd:
|
||||
# Code from module unistr/base:
|
||||
# Code from module unistr/u8-mbtouc:
|
||||
# Code from module unistr/u8-mbtouc-unsafe:
|
||||
# Code from module unistr/u8-mbtoucr:
|
||||
# Code from module unistr/u8-prev:
|
||||
# Code from module unistr/u8-uctomb:
|
||||
# Code from module unitypes:
|
||||
# Code from module unsetenv:
|
||||
# Code from module useless-if-before-free:
|
||||
# Code from module vasnprintf:
|
||||
|
|
@ -436,7 +426,6 @@ AC_DEFUN([gl_INIT],
|
|||
gl_PREREQ_INET_PTON
|
||||
fi
|
||||
gl_ARPA_INET_MODULE_INDICATOR([inet_pton])
|
||||
gl_INLINE
|
||||
gl_ISFINITE
|
||||
if test $REPLACE_ISFINITE = 1; then
|
||||
AC_LIBOBJ([isfinite])
|
||||
|
|
@ -702,17 +691,6 @@ AC_DEFUN([gl_INIT],
|
|||
fi
|
||||
gl_MATH_MODULE_INDICATOR([trunc])
|
||||
gl_UNISTD_H
|
||||
gl_LIBUNISTRING_LIBHEADER([0.9.4], [unistr.h])
|
||||
gl_MODULE_INDICATOR([unistr/u8-mbtouc])
|
||||
gl_LIBUNISTRING_MODULE([0.9.4], [unistr/u8-mbtouc])
|
||||
gl_MODULE_INDICATOR([unistr/u8-mbtouc-unsafe])
|
||||
gl_LIBUNISTRING_MODULE([0.9.4], [unistr/u8-mbtouc-unsafe])
|
||||
gl_MODULE_INDICATOR([unistr/u8-mbtoucr])
|
||||
gl_LIBUNISTRING_MODULE([0.9], [unistr/u8-mbtoucr])
|
||||
gl_LIBUNISTRING_MODULE([0.9], [unistr/u8-prev])
|
||||
gl_MODULE_INDICATOR([unistr/u8-uctomb])
|
||||
gl_LIBUNISTRING_MODULE([0.9], [unistr/u8-uctomb])
|
||||
gl_LIBUNISTRING_LIBHEADER([0.9.4], [unitypes.h])
|
||||
gl_FUNC_VSNPRINTF
|
||||
gl_STDIO_MODULE_INDICATOR([vsnprintf])
|
||||
gl_WCHAR_H
|
||||
|
|
@ -1698,7 +1676,6 @@ AC_DEFUN([gl_FILE_LIST], [
|
|||
build-aux/snippet/_Noreturn.h
|
||||
build-aux/snippet/arg-nonnull.h
|
||||
build-aux/snippet/c++defs.h
|
||||
build-aux/snippet/unused-parameter.h
|
||||
build-aux/snippet/warn-on-use.h
|
||||
build-aux/useless-if-before-free
|
||||
build-aux/vc-list-files
|
||||
|
|
@ -1906,16 +1883,6 @@ AC_DEFUN([gl_FILE_LIST], [
|
|||
lib/trunc.c
|
||||
lib/unistd.c
|
||||
lib/unistd.in.h
|
||||
lib/unistr.in.h
|
||||
lib/unistr/u8-mbtouc-aux.c
|
||||
lib/unistr/u8-mbtouc-unsafe-aux.c
|
||||
lib/unistr/u8-mbtouc-unsafe.c
|
||||
lib/unistr/u8-mbtouc.c
|
||||
lib/unistr/u8-mbtoucr.c
|
||||
lib/unistr/u8-prev.c
|
||||
lib/unistr/u8-uctomb-aux.c
|
||||
lib/unistr/u8-uctomb.c
|
||||
lib/unitypes.in.h
|
||||
lib/unsetenv.c
|
||||
lib/vasnprintf.c
|
||||
lib/vasnprintf.h
|
||||
|
|
@ -1983,7 +1950,6 @@ AC_DEFUN([gl_FILE_LIST], [
|
|||
m4/include_next.m4
|
||||
m4/inet_ntop.m4
|
||||
m4/inet_pton.m4
|
||||
m4/inline.m4
|
||||
m4/intmax_t.m4
|
||||
m4/inttypes_h.m4
|
||||
m4/isfinite.m4
|
||||
|
|
@ -1999,7 +1965,6 @@ AC_DEFUN([gl_FILE_LIST], [
|
|||
m4/lib-ld.m4
|
||||
m4/lib-link.m4
|
||||
m4/lib-prefix.m4
|
||||
m4/libunistring-base.m4
|
||||
m4/libunistring.m4
|
||||
m4/link.m4
|
||||
m4/localcharset.m4
|
||||
|
|
|
|||
40
m4/inline.m4
40
m4/inline.m4
|
|
@ -1,40 +0,0 @@
|
|||
# inline.m4 serial 4
|
||||
dnl Copyright (C) 2006, 2009-2016 Free Software Foundation, Inc.
|
||||
dnl This file is free software; the Free Software Foundation
|
||||
dnl gives unlimited permission to copy and/or distribute it,
|
||||
dnl with or without modifications, as long as this notice is preserved.
|
||||
|
||||
dnl Test for the 'inline' keyword or equivalent.
|
||||
dnl Define 'inline' to a supported equivalent, or to nothing if not supported,
|
||||
dnl like AC_C_INLINE does. Also, define HAVE_INLINE if 'inline' or an
|
||||
dnl equivalent is effectively supported, i.e. if the compiler is likely to
|
||||
dnl drop unused 'static inline' functions.
|
||||
AC_DEFUN([gl_INLINE],
|
||||
[
|
||||
AC_REQUIRE([AC_C_INLINE])
|
||||
AC_CACHE_CHECK([whether the compiler generally respects inline],
|
||||
[gl_cv_c_inline_effective],
|
||||
[if test $ac_cv_c_inline = no; then
|
||||
gl_cv_c_inline_effective=no
|
||||
else
|
||||
dnl GCC defines __NO_INLINE__ if not optimizing or if -fno-inline is
|
||||
dnl specified.
|
||||
dnl Use AC_COMPILE_IFELSE here, not AC_EGREP_CPP, because the result
|
||||
dnl depends on optimization flags, which can be in CFLAGS.
|
||||
dnl (AC_EGREP_CPP looks only at the CPPFLAGS.)
|
||||
AC_COMPILE_IFELSE(
|
||||
[AC_LANG_PROGRAM([[]],
|
||||
[[#ifdef __NO_INLINE__
|
||||
#error "inline is not effective"
|
||||
#endif]])],
|
||||
[gl_cv_c_inline_effective=yes],
|
||||
[gl_cv_c_inline_effective=no])
|
||||
fi
|
||||
])
|
||||
if test $gl_cv_c_inline_effective = yes; then
|
||||
AC_DEFINE([HAVE_INLINE], [1],
|
||||
[Define to 1 if the compiler supports one of the keywords
|
||||
'inline', '__inline__', '__inline' and effectively inlines
|
||||
functions marked as such.])
|
||||
fi
|
||||
])
|
||||
|
|
@ -1,141 +0,0 @@
|
|||
# libunistring-base.m4 serial 5
|
||||
dnl Copyright (C) 2010-2016 Free Software Foundation, Inc.
|
||||
dnl This file is free software; the Free Software Foundation
|
||||
dnl gives unlimited permission to copy and/or distribute it,
|
||||
dnl with or without modifications, as long as this notice is preserved.
|
||||
|
||||
dnl From Paolo Bonzini and Bruno Haible.
|
||||
|
||||
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 Module (even if the sources of Module itself do not
|
||||
dnl change).
|
||||
|
||||
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.
|
||||
AM_CONDITIONAL(AS_TR_CPP([LIBUNISTRING_COMPILE_$2]),
|
||||
[gl_LIBUNISTRING_VERSION_CMP([$1])])
|
||||
])
|
||||
|
||||
dnl gl_LIBUNISTRING_LIBHEADER([VERSION], [HeaderFile])
|
||||
dnl Declares that HeaderFile should be created, unless we are linking
|
||||
dnl with libunistring and its version is >= the given VERSION.
|
||||
dnl HeaderFile should be relative to the lib directory and end in '.h'.
|
||||
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_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.
|
||||
dnl
|
||||
dnl You have to bump the VERSION argument to the next projected version
|
||||
dnl number each time you make a non-comment change to the HeaderFile.
|
||||
|
||||
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
|
||||
LIBUNISTRING_[]AS_TR_CPP([$2])='$2'
|
||||
else
|
||||
LIBUNISTRING_[]AS_TR_CPP([$2])=
|
||||
fi
|
||||
AC_SUBST([LIBUNISTRING_]AS_TR_CPP([$2]))
|
||||
])
|
||||
|
||||
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.
|
||||
changequote(,)
|
||||
gl_libunistring_sed_extract_major='/^[0-9]/{s/^\([0-9]*\).*/\1/p;q;}
|
||||
i\
|
||||
0
|
||||
q
|
||||
'
|
||||
gl_libunistring_sed_extract_minor='/^[0-9][0-9]*[.][0-9]/{s/^[0-9]*[.]\([0-9]*\).*/\1/p;q;}
|
||||
i\
|
||||
0
|
||||
q
|
||||
'
|
||||
gl_libunistring_sed_extract_subminor='/^[0-9][0-9]*[.][0-9][0-9]*[.][0-9]/{s/^[0-9]*[.][0-9]*[.]\([0-9]*\).*/\1/p;q;}
|
||||
i\
|
||||
0
|
||||
q
|
||||
'
|
||||
changequote([,])
|
||||
|
||||
if test "$HAVE_LIBUNISTRING" = yes; then
|
||||
LIBUNISTRING_VERSION_MAJOR=`echo "$LIBUNISTRING_VERSION" | sed -n -e "$gl_libunistring_sed_extract_major"`
|
||||
LIBUNISTRING_VERSION_MINOR=`echo "$LIBUNISTRING_VERSION" | sed -n -e "$gl_libunistring_sed_extract_minor"`
|
||||
LIBUNISTRING_VERSION_SUBMINOR=`echo "$LIBUNISTRING_VERSION" | sed -n -e "$gl_libunistring_sed_extract_subminor"`
|
||||
fi
|
||||
])
|
||||
|
||||
dnl gl_LIBUNISTRING_VERSION_CMP([VERSION])
|
||||
dnl Expands to a shell statement that evaluates to true if LIBUNISTRING_VERSION
|
||||
dnl is less than the VERSION argument.
|
||||
AC_DEFUN([gl_LIBUNISTRING_VERSION_CMP],
|
||||
[ { test "$HAVE_LIBUNISTRING" != yes \
|
||||
|| {
|
||||
dnl AS_LITERAL_IF exists and works fine since autoconf-2.59 at least.
|
||||
AS_LITERAL_IF([$1],
|
||||
[dnl This is the optimized variant, that assumes the argument is a literal:
|
||||
m4_pushdef([requested_version_major],
|
||||
[gl_LIBUNISTRING_ARG_OR_ZERO(m4_bpatsubst([$1], [^\([0-9]*\).*], [\1]), [])])
|
||||
m4_pushdef([requested_version_minor],
|
||||
[gl_LIBUNISTRING_ARG_OR_ZERO(m4_bpatsubst([$1], [^[0-9]*[.]\([0-9]*\).*], [\1]), [$1])])
|
||||
m4_pushdef([requested_version_subminor],
|
||||
[gl_LIBUNISTRING_ARG_OR_ZERO(m4_bpatsubst([$1], [^[0-9]*[.][0-9]*[.]\([0-9]*\).*], [\1]), [$1])])
|
||||
test $LIBUNISTRING_VERSION_MAJOR -lt requested_version_major \
|
||||
|| { test $LIBUNISTRING_VERSION_MAJOR -eq requested_version_major \
|
||||
&& { test $LIBUNISTRING_VERSION_MINOR -lt requested_version_minor \
|
||||
|| { test $LIBUNISTRING_VERSION_MINOR -eq requested_version_minor \
|
||||
&& test $LIBUNISTRING_VERSION_SUBMINOR -lt requested_version_subminor
|
||||
}
|
||||
}
|
||||
}
|
||||
m4_popdef([requested_version_subminor])
|
||||
m4_popdef([requested_version_minor])
|
||||
m4_popdef([requested_version_major])
|
||||
],
|
||||
[dnl This is the unoptimized variant:
|
||||
requested_version_major=`echo '$1' | sed -n -e "$gl_libunistring_sed_extract_major"`
|
||||
requested_version_minor=`echo '$1' | sed -n -e "$gl_libunistring_sed_extract_minor"`
|
||||
requested_version_subminor=`echo '$1' | sed -n -e "$gl_libunistring_sed_extract_subminor"`
|
||||
test $LIBUNISTRING_VERSION_MAJOR -lt $requested_version_major \
|
||||
|| { test $LIBUNISTRING_VERSION_MAJOR -eq $requested_version_major \
|
||||
&& { test $LIBUNISTRING_VERSION_MINOR -lt $requested_version_minor \
|
||||
|| { test $LIBUNISTRING_VERSION_MINOR -eq $requested_version_minor \
|
||||
&& test $LIBUNISTRING_VERSION_SUBMINOR -lt $requested_version_subminor
|
||||
}
|
||||
}
|
||||
}
|
||||
])
|
||||
}
|
||||
}])
|
||||
|
||||
dnl gl_LIBUNISTRING_ARG_OR_ZERO([ARG], [ORIG]) expands to ARG if it is not the
|
||||
dnl same as ORIG, otherwise to 0.
|
||||
m4_define([gl_LIBUNISTRING_ARG_OR_ZERO], [m4_if([$1], [$2], [0], [$1])])
|
||||
Loading…
Add table
Add a link
Reference in a new issue