With the option --single-configure, gnulib-tool.py omits many
autoconf snippets from the generated configure.ac:
$ GNULIB_TOOL_IMPL=py ./test-create-testdir-1.sh
Files ./test-create-testdir-1.result/configure.ac and
tmp1933038-result/configure.ac differ
FAIL: gnulib-tool's result has unexpected differences.
$ diff -u ./test-create-testdir-1.result/configure.ac
tmp1933038-result/configure.ac
--- ./test-create-testdir-1.result/configure.ac 2024-03-19 17:27:54.615029935
+0100
+++ tmp1933038-result/configure.ac 2024-03-23 17:33:11.564801331 +0100
@@ -294,10 +294,6 @@
AC_REQUIRE([gl_SYS_SOCKET_H])
gl_CONDITIONAL([GL_COND_OBJ_BIND], [test "$ac_cv_header_winsock2_h" = yes])
gl_SYS_SOCKET_MODULE_INDICATOR([bind])
- gt_LOCALE_FR
- gt_LOCALE_FR_UTF8
- gt_LOCALE_FR
- gt_LOCALE_TR_UTF8
gl_FUNC_CALLOC_GNU
if test $REPLACE_CALLOC_FOR_CALLOC_GNU = 1; then
AC_LIBOBJ([calloc])
@@ -413,9 +409,6 @@
gl_PREREQ_GETTIMEOFDAY
])
gl_SYS_TIME_MODULE_INDICATOR([gettimeofday])
- gl_MUSL_LIBC
- dnl Distinguish OpenBSD >= 6.2 from OpenBSD < 6.2.
- gl_CHECK_FUNCS_ANDROID([duplocale], [[#include <locale.h>]])
gl_FUNC_INET_PTON
gl_CONDITIONAL([GL_COND_OBJ_INET_PTON],
[test $HAVE_INET_PTON = 0 || test $REPLACE_INET_PTON = 1])
@@ -423,7 +416,6 @@
gl_PREREQ_INET_PTON
])
gl_ARPA_INET_MODULE_INDICATOR([inet_pton])
- AC_C_BIGENDIAN
gl_INTTYPES_H
gl_FUNC_IOCTL
gl_CONDITIONAL([GL_COND_OBJ_IOCTL],
@@ -448,26 +440,12 @@
AC_LIBOBJ([isnanl])
gl_PREREQ_ISNANL
fi
- AC_REQUIRE([gl_LONG_DOUBLE_VS_DOUBLE])
- gt_LOCALE_FR
- gt_LOCALE_FR_UTF8
- gt_LOCALE_JA
- gt_LOCALE_ZH_CN
- gt_LOCALE_FR
- gt_LOCALE_FR_UTF8
- gt_LOCALE_JA
- gt_LOCALE_ZH_CN
AC_REQUIRE([gl_LARGEFILE])
AC_REQUIRE([gl_SYS_SOCKET_H])
gl_CONDITIONAL([GL_COND_OBJ_LISTEN], [test "$ac_cv_header_winsock2_h" = yes])
gl_SYS_SOCKET_MODULE_INDICATOR([listen])
- gl_CHECK_FUNCS_ANDROID([newlocale], [[#include <locale.h>]])
gl_LOCALENAME
gl_LOCALE_MODULE_INDICATOR([localename])
- gl_CHECK_FUNCS_ANDROID([newlocale], [[#include <locale.h>]])
- AC_CHECK_HEADERS_ONCE([semaphore.h])
- AC_CHECK_DECLS_ONCE([alarm])
- AC_REQUIRE([gl_SEMAPHORE])
gl_FUNC_LSTAT
gl_CONDITIONAL([GL_COND_OBJ_LSTAT], [test $REPLACE_LSTAT = 1])
AM_COND_IF([GL_COND_OBJ_LSTAT], [
@@ -488,21 +466,12 @@
gl_MATH_H
gl_MATH_H_REQUIRE_DEFAULTS
AC_PROG_MKDIR_P
- gt_LOCALE_FR
- gt_LOCALE_FR_UTF8
- gt_LOCALE_JA
- gt_LOCALE_ZH_CN
- gt_LOCALE_FR_UTF8
gl_FUNC_MEMCHR
gl_CONDITIONAL([GL_COND_OBJ_MEMCHR], [test $REPLACE_MEMCHR = 1])
AM_COND_IF([GL_COND_OBJ_MEMCHR], [
gl_PREREQ_MEMCHR
])
gl_STRING_MODULE_INDICATOR([memchr])
- dnl Check for prerequisites for memory fence checks.
- gl_FUNC_MMAP_ANON
- AC_CHECK_HEADERS_ONCE([sys/mman.h])
- AC_CHECK_FUNCS_ONCE([mprotect])
gl_MINMAX
AC_REQUIRE([gl_MSVC_INVAL])
gl_CONDITIONAL([GL_COND_OBJ_MSVC_INVAL],
@@ -515,14 +484,9 @@
gl_CONDITIONAL([GL_COND_OBJ_NANOSLEEP],
[test $HAVE_NANOSLEEP = 0 || test $REPLACE_NANOSLEEP = 1])
gl_TIME_MODULE_INDICATOR([nanosleep])
- AC_CHECK_DECLS_ONCE([alarm])
gl_HEADER_NETINET_IN
gl_CONDITIONAL_HEADER([netinet/in.h])
AC_PROG_MKDIR_P
- gt_LOCALE_FR
- gt_LOCALE_FR_UTF8
- gt_FUNC_USELOCALE
- gl_MUSL_LIBC
gl_FUNC_OPEN
gl_CONDITIONAL([GL_COND_OBJ_OPEN], [test $REPLACE_OPEN = 1])
AM_COND_IF([GL_COND_OBJ_OPEN], [
@@ -540,7 +504,6 @@
gl_CONDITIONAL([GL_COND_OBJ_PSELECT],
[test $HAVE_PSELECT = 0 || test $REPLACE_PSELECT = 1])
gl_SYS_SELECT_MODULE_INDICATOR([pselect])
- AC_CHECK_HEADERS_ONCE([sys/wait.h])
gl_PTHREAD_H
gl_PTHREAD_H_REQUIRE_DEFAULTS
AC_PROG_MKDIR_P
@@ -610,7 +573,6 @@
gl_FUNC_SELECT
gl_CONDITIONAL([GL_COND_OBJ_SELECT], [test $REPLACE_SELECT = 1])
gl_SYS_SELECT_MODULE_INDICATOR([select])
- AC_CHECK_HEADERS_ONCE([sys/wait.h])
gl_FUNC_SETENV
gl_CONDITIONAL([GL_COND_OBJ_SETENV],
[test $HAVE_SETENV = 0 || test $REPLACE_SETENV = 1])
@@ -621,10 +583,6 @@
gl_PREREQ_SETLOCALE
])
gl_LOCALE_MODULE_INDICATOR([setlocale])
- gt_LOCALE_FR
- gt_LOCALE_FR_UTF8
- gt_LOCALE_JA
- gt_LOCALE_ZH_CN
AC_REQUIRE([gl_SYS_SOCKET_H])
gl_CONDITIONAL([GL_COND_OBJ_SETSOCKOPT],
[test "$ac_cv_header_winsock2_h" = yes])
@@ -645,7 +603,6 @@
gl_CONDITIONAL([GL_COND_OBJ_SLEEP],
[test $HAVE_SLEEP = 0 || test $REPLACE_SLEEP = 1])
gl_UNISTD_MODULE_INDICATOR([sleep])
- AC_CHECK_DECLS_ONCE([alarm])
gl_SNAN
gl_NAN_MIPS
AC_REQUIRE([gl_SYS_SOCKET_H])
@@ -676,8 +633,6 @@
gl_SYS_STAT_MODULE_INDICATOR([stat])
gl_STAT_TIME
gl_STAT_BIRTHTIME
- AC_REQUIRE([gt_TYPE_WCHAR_T])
- AC_REQUIRE([gt_TYPE_WINT_T])
gl_STDIO_H
gl_STDIO_H_REQUIRE_DEFAULTS
AC_PROG_MKDIR_P
@@ -706,7 +661,6 @@
gl_STDIO_MODULE_INDICATOR([fputs])
gl_STDIO_MODULE_INDICATOR([puts])
gl_STDIO_MODULE_INDICATOR([fwrite])
- gl_DOUBLE_EXPONENT_LOCATION
gl_FUNC_STRERROR
gl_CONDITIONAL([GL_COND_OBJ_STRERROR], [test $REPLACE_STRERROR = 1])
gl_MODULE_INDICATOR([strerror])
@@ -742,7 +696,6 @@
gl_SYS_SOCKET_H
gl_SYS_SOCKET_H_REQUIRE_DEFAULTS
AC_PROG_MKDIR_P
- AC_CHECK_FUNCS_ONCE([shutdown])
gl_SYS_STAT_H
gl_SYS_STAT_H_REQUIRE_DEFAULTS
AC_PROG_MKDIR_P
@@ -774,10 +727,6 @@
gl_CONDITIONAL([GL_COND_OBJ_USLEEP],
[test $HAVE_USLEEP = 0 || test $REPLACE_USLEEP = 1])
gl_UNISTD_MODULE_INDICATOR([usleep])
- gt_LOCALE_FR
- gt_LOCALE_FR_UTF8
- gt_LOCALE_JA
- gt_LOCALE_ZH_CN
gl_FUNC_WCTOB
gl_CONDITIONAL([GL_COND_OBJ_WCTOB],
[test $HAVE_WCTOB = 0 || test $REPLACE_WCTOB = 1])
This patch fixes it.
2024-03-23 Bruno Haible <br...@clisp.org>
gnulib-tool.py: Fix autoconf snippets inclusion if --single-configure.
* pygnulib/GLTestDir.py (GLTestDir.execute): Correct the arguments
passed to autoconfSnippets.
diff --git a/pygnulib/GLTestDir.py b/pygnulib/GLTestDir.py
index c1ab923386..120186f509 100644
--- a/pygnulib/GLTestDir.py
+++ b/pygnulib/GLTestDir.py
@@ -630,10 +630,10 @@ class GLTestDir(object):
emit += self.emitter.shellvars_init(False, sourcebase)
if single_configure:
emit += self.emitter.autoconfSnippets(main_modules, main_modules,
moduletable,
- 0, False, False, False,
replace_auxdir)
+ 0, True, False, False,
replace_auxdir)
else: # if not single_configure
emit += self.emitter.autoconfSnippets(modules, modules,
moduletable,
- 1, False, False, False,
replace_auxdir)
+ 1, True, False, False,
replace_auxdir)
emit += self.emitter.initmacro_end(macro_prefix, False)
if single_configure:
emit += ' gltests_libdeps=\n'
@@ -647,7 +647,7 @@ class GLTestDir(object):
emit += ' m4_pushdef([gl_MODULE_INDICATOR_CONDITION], '
emit += '[$gl_module_indicator_condition])\n'
snippets = self.emitter.autoconfSnippets(tests_modules,
main_modules + tests_modules,
- moduletable, 1, True,
False, False, replace_auxdir)
+ moduletable, 0, True,
False, False, replace_auxdir)
emit += snippets
emit += ' m4_popdef([gl_MODULE_INDICATOR_CONDITION])\n'
emit += self.emitter.initmacro_end('%stests' % macro_prefix, True)
