• R/O
  • SSH
  • HTTPS

tsukurimashou: Commit


Commit MetaInfo

Revision672 (tree)
Time2018-04-08 06:21:05
Authormskala

Log Message

another warning fix, and build system changes for recent Automake

Change Summary

Incremental Difference

--- trunk/icemap/fileout.c (revision 671)
+++ trunk/icemap/fileout.c (revision 672)
@@ -19,6 +19,8 @@
1919 * mskala@ansuz.sooke.bc.ca
2020 */
2121
22+#define _GNU_SOURCE
23+
2224 #include <stdarg.h>
2325 #include <stdio.h>
2426 #include <stdlib.h>
--- trunk/configure.ac (revision 671)
+++ trunk/configure.ac (revision 672)
@@ -199,7 +199,7 @@
199199 AC_CONFIG_SRCDIR([hamlog/hamlog])
200200 AC_CONFIG_HEADERS([config.h])
201201 AC_CONFIG_MACRO_DIR([m4])
202-AC_REVISION([$Id: configure.ac 5795 2017-11-21 21:32:34Z mskala $])
202+AC_REVISION([$Id: configure.ac 5991 2018-04-07 20:47:37Z mskala $])
203203 AC_COPYRIGHT([Copyright (C) 2011, 2012, 2013, 2014, 2015, 2016, 2017 Matthew Skala])
204204 AC_SUBST([release_date],["November 17, 2017"])
205205 # this must be early so it will happen before depfiles
@@ -207,6 +207,7 @@
207207 s#TESTS = #TESTS = \$(otf_DATA) #;dnl
208208 s#^all: config.h#all: kill-empty config.h#],
209209 [rm -f pfb-stamp* chl-stamp])
210+TSU_FIX_CONFIG_STATUS
210211 AM_SILENT_RULES
211212 #
212213 ############################################################################
--- trunk/m4/tsu_fix_config_status.m4 (revision 0)
+++ trunk/m4/tsu_fix_config_status.m4 (revision 672)
@@ -0,0 +1,33 @@
1+#
2+# SYNOPSIS
3+#
4+# TSU_FIX_CONFIG_STATUS
5+#
6+# DESCRIPTION
7+#
8+# Modify the config.status file to make it filter certain "include" lines
9+# out of the Makefile when processing the Makefile for use in depfile
10+# generation. This is necessary because Automake 15.1 introduced a
11+# drastic change in depfile generation: formerly, it used sed to extract
12+# only the recipes needed for depfile generation, whereas now it attempts
13+# to run Make on basically the entire Makefile during configuration. In
14+# the case of Tsukurimashou, this change has the effect of spinning up the
15+# whole build system to generate expensive include files needed for
16+# generating the actual fonts, and since configure is still in progress at
17+# that point, the effort to generate those files fails and ends up
18+# creating an infinite loop.
19+#
20+# LICENSE
21+#
22+# This macro is released to the public domain by its author,
23+# Matthew Skala <mskala@ansuz.sooke.bc.ca>.
24+
25+#serial 1
26+
27+AC_DEFUN([TSU_FIX_CONFIG_STATUS], [
28+ AC_CONFIG_COMMANDS_POST([
29+ AC_MSG_NOTICE([fixing config.status])
30+ "$PERL" -i -pe 's/\| \$MAKE -f - am--depfiles/| grep -v dnl
31+ "^include makefile" | \$MAKE -f - am--depfiles/' config.status
32+ ])
33+])
--- trunk/m4/tsu_bad_paths.m4 (revision 671)
+++ trunk/m4/tsu_bad_paths.m4 (revision 672)
@@ -20,7 +20,7 @@
2020 # This macro is released to the public domain by its author,
2121 # Matthew Skala <mskala@ansuz.sooke.bc.ca>.
2222
23-#serial 1
23+#serial 2
2424
2525 AC_DEFUN([TSU_BAD_PATHS], [
2626 AC_MSG_CHECKING([for bad paths])
@@ -28,10 +28,13 @@
2828 all_bad_paths=''
2929 for sv in $ac_subst_vars ; do
3030 eval vv='"'\$$sv'"'
31- if test -e "$vv" ; then
31+ if echo "$sv" | egrep '_FALSE|_TRUE|ifGNUmake' > /dev/null ; then
32+ # these variable names are exempt
33+ true
34+ elif test -e "$vv" ; then
3235 if echo "$vv" | grep -q '@<:@ #$&():;<=>\\`|\?\*"'"'@:>@" ; then
3336 has_bad_paths=yes
34- all_bad_paths="$all_bad_paths $vv
37+ all_bad_paths="$all_bad_paths $sv=$vv
3538 "
3639 fi
3740 fi
Show on old repository browser