From 4fa8feff0af88fb3c7dd3fceb722dabe48b6dfa0 Mon Sep 17 00:00:00 2001 From: Peter Williams Date: Mon, 3 Sep 2018 17:28:40 -0400 Subject: [PATCH 1/8] Mark (v)snprintf as available `configure` checks whether `snprintf` is available by attempting to link with it. Windows didn't used to provide it at all. However, newer Windows does provide it, but as an inline C implementation, so direct linking doesn't work. For our purposes, the inline implementation is equivalent to a libc that provides the functions, so hack our configure scripts to mark these functions as available. --- configure.ac | 2 ++ gettext-runtime/configure.ac | 2 ++ gettext-runtime/libasprintf/configure.ac | 2 ++ gettext-tools/configure.ac | 2 ++ gettext-tools/examples/configure.ac | 2 ++ 5 files changed, 10 insertions(+) diff --git a/configure.ac b/configure.ac index f4e54ea..ef64e67 100644 --- a/configure.ac +++ b/configure.ac @@ -22,6 +22,8 @@ AC_INIT([gettext], [bug-gettext@gnu.org]) AC_CONFIG_SRCDIR([gettext-tools/src/msgfmt.c]) AC_CONFIG_AUX_DIR([build-aux]) +ac_cv_func_snprintf=yes +ac_cv_func_vsnprintf=yes AM_INIT_AUTOMAKE([1.13 silent-rules parallel-tests tar-ustar]) dnl Override automake's tar command used for creating distributions. diff --git a/gettext-runtime/configure.ac b/gettext-runtime/configure.ac index 126d069..66f26fa 100644 --- a/gettext-runtime/configure.ac +++ b/gettext-runtime/configure.ac @@ -22,6 +22,8 @@ AC_INIT([gettext-runtime], [bug-gettext@gnu.org]) AC_CONFIG_SRCDIR([intl/dcigettext.c]) AC_CONFIG_AUX_DIR([../build-aux]) +ac_cv_func_snprintf=yes +ac_cv_func_vsnprintf=yes AM_INIT_AUTOMAKE([1.11.1 silent-rules parallel-tests]) AC_CONFIG_HEADERS([config.h]) diff --git a/gettext-runtime/libasprintf/configure.ac b/gettext-runtime/libasprintf/configure.ac index 2fe76cf..31a06db 100644 --- a/gettext-runtime/libasprintf/configure.ac +++ b/gettext-runtime/libasprintf/configure.ac @@ -20,6 +20,8 @@ AC_PREREQ([2.64]) AC_INIT([libasprintf], [1.0]) AC_CONFIG_SRCDIR([vasprintf.c]) AC_CONFIG_AUX_DIR([../../build-aux]) +ac_cv_func_snprintf=yes +ac_cv_func_vsnprintf=yes AM_INIT_AUTOMAKE([silent-rules]) AC_CONFIG_HEADERS([config.h]) diff --git a/gettext-tools/configure.ac b/gettext-tools/configure.ac index 3610ee3..6c75ccc 100644 --- a/gettext-tools/configure.ac +++ b/gettext-tools/configure.ac @@ -22,6 +22,8 @@ AC_INIT([gettext-tools], [bug-gettext@gnu.org]) AC_CONFIG_SRCDIR([src/msgfmt.c]) AC_CONFIG_AUX_DIR([../build-aux]) +ac_cv_func_snprintf=yes +ac_cv_func_vsnprintf=yes AM_INIT_AUTOMAKE([1.11.1 silent-rules parallel-tests]) AC_CONFIG_HEADERS([config.h]) diff --git a/gettext-tools/examples/configure.ac b/gettext-tools/examples/configure.ac index 249fd14..4db994e 100644 --- a/gettext-tools/examples/configure.ac +++ b/gettext-tools/examples/configure.ac @@ -22,6 +22,8 @@ AC_INIT([gettext-examples], [bug-gettext@gnu.org]) AC_CONFIG_SRCDIR([installpaths.in]) AC_CONFIG_AUX_DIR([../../build-aux]) +ac_cv_func_snprintf=yes +ac_cv_func_vsnprintf=yes AM_INIT_AUTOMAKE([silent-rules]) dnl Installation directories.