[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Guile-commits] 01/02: Use gnulib for mktime
|
From: |
Mike Gran |
|
Subject: |
[Guile-commits] 01/02: Use gnulib for mktime |
|
Date: |
Tue, 10 Apr 2018 19:43:26 -0400 (EDT) |
mike121 pushed a commit to branch wip-mingw-guile-2.2
in repository guile.
commit ebfff0c6a9497e636760cd85fb4cec5b7ef12d03
Author: Michael Gran <address@hidden>
Date: Tue Apr 10 16:30:54 2018 -0700
Use gnulib for mktime
* lib/Makefile.am: updated
* m4/gnulib-cache.m4: updated
* m4/gnulib-comp.m4: updated
---
lib/Makefile.am | 4 +---
m4/gnulib-cache.m4 | 3 ++-
m4/gnulib-comp.m4 | 33 ++++++++++++---------------------
3 files changed, 15 insertions(+), 25 deletions(-)
diff --git a/lib/Makefile.am b/lib/Makefile.am
index 83e5927..1e52604 100644
--- a/lib/Makefile.am
+++ b/lib/Makefile.am
@@ -21,7 +21,7 @@
# the same distribution terms as the rest of that program.
#
# Generated by gnulib-tool.
-# Reproduce by: 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 accept4
alignof alloca-opt announce-gen autobuild bind byteswap c-strcase [...]
+# Reproduce by: 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 accept4
alignof alloca-opt announce-gen autobuild bind byteswap c-strcase [...]
AUTOMAKE_OPTIONS = 1.9.6 gnits
@@ -1573,9 +1573,7 @@ EXTRA_libgnu_la_SOURCES += mkostemp.c
## begin gnulib module mktime
-if gl_GNULIB_ENABLED_mktime
-endif
EXTRA_DIST += mktime-internal.h mktime.c
EXTRA_libgnu_la_SOURCES += mktime.c
diff --git a/m4/gnulib-cache.m4 b/m4/gnulib-cache.m4
index 5942841..cde476e 100644
--- a/m4/gnulib-cache.m4
+++ b/m4/gnulib-cache.m4
@@ -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 --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 accept4
alignof alloca-opt announce-gen autobuild bind byteswap c-strcase canonicaliz
[...]
+# 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 accept4
alignof alloca-opt announce-gen autobuild bind byteswap c-strcase canonicaliz
[...]
# Specification in the form of a few gnulib-tool.m4 macro invocations:
gl_LOCAL_DIR([gnulib-local])
@@ -93,6 +93,7 @@ gl_MODULES([
malloca
mkdir
mkostemp
+ mktime
nl_langinfo
nproc
open
diff --git a/m4/gnulib-comp.m4 b/m4/gnulib-comp.m4
index 227a216..070c2e9 100644
--- a/m4/gnulib-comp.m4
+++ b/m4/gnulib-comp.m4
@@ -539,6 +539,12 @@ AC_DEFUN([gl_INIT],
fi
gl_MODULE_INDICATOR([mkostemp])
gl_STDLIB_MODULE_INDICATOR([mkostemp])
+ gl_FUNC_MKTIME
+ if test $REPLACE_MKTIME = 1; then
+ AC_LIBOBJ([mktime])
+ gl_PREREQ_MKTIME
+ fi
+ gl_TIME_MODULE_INDICATOR([mktime])
AC_REQUIRE([gl_MSVC_INVAL])
if test $HAVE_MSVC_INVALID_PARAMETER_HANDLER = 1; then
AC_LIBOBJ([msvc-inval])
@@ -747,7 +753,6 @@ AC_DEFUN([gl_INIT],
gl_gnulib_enabled_mbsinit=false
gl_gnulib_enabled_mbtowc=false
gl_gnulib_enabled_memchr=false
- gl_gnulib_enabled_mktime=false
gl_gnulib_enabled_5264294aa0a5557541b53c8c741f7f31=false
gl_gnulib_enabled_pathmax=false
gl_gnulib_enabled_raise=false
@@ -987,24 +992,6 @@ AC_SUBST([LTALLOCA])
gl_gnulib_enabled_memchr=true
fi
}
- func_gl_gnulib_m4code_mktime ()
- {
- if ! $gl_gnulib_enabled_mktime; then
- gl_FUNC_MKTIME
- if test $REPLACE_MKTIME = 1; then
- AC_LIBOBJ([mktime])
- gl_PREREQ_MKTIME
- fi
- gl_TIME_MODULE_INDICATOR([mktime])
- gl_gnulib_enabled_mktime=true
- if test $REPLACE_MKTIME = 1; then
- func_gl_gnulib_m4code_intprops
- fi
- if test $REPLACE_MKTIME = 1; then
- func_gl_gnulib_m4code_time_r
- fi
- fi
- }
func_gl_gnulib_m4code_5264294aa0a5557541b53c8c741f7f31 ()
{
if ! $gl_gnulib_enabled_5264294aa0a5557541b53c8c741f7f31; then
@@ -1014,7 +1001,6 @@ AC_SUBST([LTALLOCA])
gl_PREREQ_MKTIME
fi
gl_gnulib_enabled_5264294aa0a5557541b53c8c741f7f31=true
- func_gl_gnulib_m4code_mktime
fi
}
func_gl_gnulib_m4code_pathmax ()
@@ -1300,6 +1286,12 @@ AC_SUBST([LTALLOCA])
if test $HAVE_MKOSTEMP = 0; then
func_gl_gnulib_m4code_tempname
fi
+ if test $REPLACE_MKTIME = 1; then
+ func_gl_gnulib_m4code_intprops
+ fi
+ if test $REPLACE_MKTIME = 1; then
+ func_gl_gnulib_m4code_time_r
+ fi
if test $HAVE_NL_LANGINFO = 0 || test $REPLACE_NL_LANGINFO = 1; then
func_gl_gnulib_m4code_localeconv
fi
@@ -1400,7 +1392,6 @@ AC_SUBST([LTALLOCA])
AM_CONDITIONAL([gl_GNULIB_ENABLED_mbsinit], [$gl_gnulib_enabled_mbsinit])
AM_CONDITIONAL([gl_GNULIB_ENABLED_mbtowc], [$gl_gnulib_enabled_mbtowc])
AM_CONDITIONAL([gl_GNULIB_ENABLED_memchr], [$gl_gnulib_enabled_memchr])
- AM_CONDITIONAL([gl_GNULIB_ENABLED_mktime], [$gl_gnulib_enabled_mktime])
AM_CONDITIONAL([gl_GNULIB_ENABLED_5264294aa0a5557541b53c8c741f7f31],
[$gl_gnulib_enabled_5264294aa0a5557541b53c8c741f7f31])
AM_CONDITIONAL([gl_GNULIB_ENABLED_pathmax], [$gl_gnulib_enabled_pathmax])
AM_CONDITIONAL([gl_GNULIB_ENABLED_raise], [$gl_gnulib_enabled_raise])