>From e7321362b30dbbf7266e4e84077109b081a9c25a Mon Sep 17 00:00:00 2001 From: Bruno Haible Date: Mon, 13 Jul 2020 11:29:51 +0200 Subject: [PATCH 1/2] Fix build failure during "make check". * bootstrap.conf (libpoke_modules): Add vasprintf-posix. (ACLOCAL_FLAGS): New variable. * Makefile.am (ACLOCAL_AMFLAGS): Add -I options for the second and third gnulib-tool invocation. * configure.ac: Invoke libpoke_EARLY, gui_EARLY, libpoke_INIT, gui_INIT. --- ChangeLog | 9 +++++++++ Makefile.am | 2 +- bootstrap.conf | 5 +++++ configure.ac | 4 ++++ 4 files changed, 19 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index 1452947..3bcf137 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,12 @@ +2020-07-13 Bruno Haible + + Fix build failure during "make check". + * bootstrap.conf (libpoke_modules): Add vasprintf-posix. + (ACLOCAL_FLAGS): New variable. + * Makefile.am (ACLOCAL_AMFLAGS): Add -I options for the second and third + gnulib-tool invocation. + * configure.ac: Invoke libpoke_EARLY, gui_EARLY, libpoke_INIT, gui_INIT. + 2020-07-12 Jose E. Marchesi * testsuite/Makefile.am (EXTRA_DIST): Add libpoke. diff --git a/Makefile.am b/Makefile.am index 8c93962..9651e00 100644 --- a/Makefile.am +++ b/Makefile.am @@ -1,4 +1,4 @@ -ACLOCAL_AMFLAGS = -I m4 +ACLOCAL_AMFLAGS = -I m4 -I m4/libpoke -I m4/gui SUBDIRS = jitter gl maps pickles gl-libpoke gl-gui libpoke poke gui doc \ man testsuite etc po diff --git a/bootstrap.conf b/bootstrap.conf index d6760b1..634b8ac 100644 --- a/bootstrap.conf +++ b/bootstrap.conf @@ -73,6 +73,7 @@ libpoke_modules=" signal-h tempname tmpdir + vasprintf-posix xalloc strstr " @@ -93,6 +94,10 @@ source_base=gl # gnulib library name gnulib_name=libgnu +# Support for additional gnulib-tool invocations +# (keep this consistent with ACLOCAL_AMFLAGS in Makefile.am) +ACLOCAL_FLAGS='-I m4/libpoke -I m4/gui' + checkout_only_file= # Additional xgettext options to use. Use "\\\newline" to break lines. diff --git a/configure.ac b/configure.ac index 472dda3..4a7f7c2 100644 --- a/configure.ac +++ b/configure.ac @@ -37,6 +37,8 @@ AC_DEFINE([PACKAGE_BUGZILLA],["https://sourceware.org/bugzilla/describecomponent AC_PROG_CC gl_EARLY +libpoke_EARLY +gui_EARLY LT_INIT AC_PROG_CC_C99 @@ -56,6 +58,8 @@ AC_CANONICAL_HOST canonical=$host gl_INIT +libpoke_INIT +gui_INIT # GNU help2man creates man pages from --help output; in many cases, this # is sufficient, and obviates the need to maintain man pages separately. -- 2.7.4