Skip to content

Commit c8d3bbb

Browse files
dgarskedgarske
authored
Merge pull request #347 from ejohnstown/m4-update
M4 Update
2 parents d2f98af + dbea6e6 commit c8d3bbb

6 files changed

Lines changed: 220 additions & 172 deletions

File tree

‎configure.ac‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@ AC_CONFIG_AUX_DIR([build-aux])
1010
: ${CFLAGS=""}
1111

1212
AC_CANONICAL_HOST
13+
AC_CANONICAL_TARGET
1314

1415
AM_INIT_AUTOMAKE([1.11 -Wall -Werror -Wno-portability foreign tar-ustar subdir-objects no-define color-tests])
1516

@@ -45,8 +46,7 @@ AC_PROG_CC
4546
AM_PROG_CC_C_O
4647
AC_PROG_INSTALL
4748

48-
# Checks for header files.
49-
AC_HEADER_STDC
49+
# Checks for type sizes.
5050
AC_CHECK_SIZEOF([long long])
5151
AC_CHECK_SIZEOF([long])
5252
AC_CHECK_SIZEOF([off_t])

‎m4/ax_am_jobserver.m4‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,9 @@
3333
# and this notice are preserved. This file is offered as-is, without any
3434
# warranty.
3535

36-
#serial 8
36+
#serial 8.1
37+
# Local update: Make the increment of enable-jobserver so it isn't executable
38+
# and is more posix syntax.
3739

3840
AC_DEFUN([AX_AM_JOBSERVER], [
3941
AC_REQUIRE([AX_COUNT_CPUS])
@@ -45,7 +47,7 @@ AC_DEFUN([AX_AM_JOBSERVER], [
4547
],, [enable_jobserver=m4_ifval([$1],[$1],[yes])])
4648
if test "x$enable_jobserver" = "xyes"; then
4749
enable_jobserver=$CPU_COUNT
48-
((enable_jobserver++))
50+
: $((enable_jobserver+=1))
4951
fi
5052
m4_pattern_allow(AM_MAKEFLAGS)
5153
if test "x$enable_jobserver" != "xno"; then

‎m4/ax_create_generic_config.m4‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
# DESCRIPTION
1010
#
1111
# Creates a generic PACKAGE-config file that has all the things that you
12-
# want, hmm, well, atleast it has --cflags, --version, --libs. Ahhm, did
12+
# want, hmm, well, at least it has --cflags, --version, --libs. Ahhm, did
1313
# you see ax_path_generic in the autoconf-archive? ;-)
1414
#
1515
# this macros saves you all the typing for a pkg-config.in script, you
@@ -78,7 +78,7 @@ echo 'package="'$P'"' >>$F
7878
echo 'version="'$V'"' >>$F
7979
echo 'libs="'$L'"' >>$F
8080
echo ' ' >>$F
81-
# in the order of occurence a standard automake Makefile
81+
# in the order of occurrence a standard automake Makefile
8282
echo 'prefix="'$prefix'"' >>$F
8383
echo 'exec_prefix="'$exec_prefix'"' >>$F
8484
echo 'bindir="'$bindir'"' >>$F

‎m4/ax_harden_compiler_flags.m4‎

Lines changed: 58 additions & 52 deletions
Original file line numberDiff line numberDiff line change
@@ -60,8 +60,11 @@
6060
# AX_APPEND_COMPILE_FLAGS([-Wlogical-op],,[$ax_append_compile_cflags_extra])
6161
# AX_APPEND_COMPILE_FLAGS([-fstack-check],,[$ax_append_compile_cflags_extra]) -- problems with fastmath stack size checks
6262
# AX_APPEND_COMPILE_FLAGS([-floop-parallelize-all],,[$ax_append_compile_cflags_extra]) -- causes RSA verify problem on x64
63+
# AX_APPEND_COMPILE_FLAGS([-Wunreachable-code],,[$ax_append_compile_cflags_extra]) -- older clang and when gcc had it are buggy
64+
# AX_APPEND_COMPILE_FLAGS([-fPIE],,[$ax_append_compile_cflags_extra]) -- Flag for executables not libraries
6365

64-
#serial 4
66+
#serial 4.2
67+
# changes: deleted the clearing of CFLAGS
6568

6669
AC_DEFUN([AX_HARDEN_LINKER_FLAGS], [
6770
AX_REQUIRE_DEFINED([AX_CHECK_LINK_FLAG])
@@ -100,63 +103,66 @@
100103
101104
ac_cv_warnings_as_errors=no
102105
ax_append_compile_cflags_extra=
103-
AX_APPEND_COMPILE_FLAGS([-Werror],[ax_append_compile_cflags_extra])
104-
AS_IF([test "x$ac_cv_vcs_checkout" = "xyes"],
105-
[AX_APPEND_COMPILE_FLAGS([-Werror],[AM_CFLAGS])
106-
ac_cv_warnings_as_errors="yes"])
107-
108-
dnl The main configure script handles setting the debugging flags.
109-
dnl AS_IF([test "$ax_enable_debug" = "yes"], [
110-
dnl AX_APPEND_COMPILE_FLAGS([-g],[AM_CFLAGS])
111-
dnl AX_APPEND_COMPILE_FLAGS([-ggdb],[AM_CFLAGS],[$ax_append_compile_cflags_extra])
112-
dnl AX_APPEND_COMPILE_FLAGS([-O0],[AM_CFLAGS],[$ax_append_compile_cflags_extra])
113-
dnl ],[])
114-
115-
AX_APPEND_COMPILE_FLAGS([-Wno-pragmas],[AM_CFLAGS],[$ax_append_compile_cflags_extra])
116-
117-
AX_APPEND_COMPILE_FLAGS([-Wall],[AM_CFLAGS],[$ax_append_compile_cflags_extra])
118-
AX_APPEND_COMPILE_FLAGS([-Wno-strict-aliasing],[AM_CFLAGS],[$ax_append_compile_cflags_extra])
119-
AX_APPEND_COMPILE_FLAGS([-Wextra],[AM_CFLAGS],[$ax_append_compile_cflags_extra])
120-
AX_APPEND_COMPILE_FLAGS([-Wunknown-pragmas],[AM_CFLAGS],[$ax_append_compile_cflags_extra])
121-
AX_APPEND_COMPILE_FLAGS([-Wthis-test-should-fail],[AM_CFLAGS],[$ax_append_compile_cflags_extra])
106+
AS_IF([test "$ac_cv_vcs_checkout" = "yes"],[
107+
AX_APPEND_COMPILE_FLAGS([-Werror])
108+
ac_cv_warnings_as_errors=yes
109+
],[
110+
AX_APPEND_COMPILE_FLAGS([-Werror],[ax_append_compile_cflags_extra])
111+
])
112+
113+
AS_IF([test "$ax_enable_debug" = "yes"], [
114+
AX_APPEND_COMPILE_FLAGS([-g])
115+
AX_APPEND_COMPILE_FLAGS([-ggdb],,[$ax_append_compile_cflags_extra])
116+
AX_APPEND_COMPILE_FLAGS([-O0],,[$ax_append_compile_cflags_extra])
117+
],[])
118+
119+
AX_APPEND_COMPILE_FLAGS([-Wno-pragmas],,[$ax_append_compile_cflags_extra])
120+
121+
AX_APPEND_COMPILE_FLAGS([-Wall],,[$ax_append_compile_cflags_extra])
122+
AX_APPEND_COMPILE_FLAGS([-Wno-strict-aliasing],,[$ax_append_compile_cflags_extra])
123+
AX_APPEND_COMPILE_FLAGS([-Wextra],,[$ax_append_compile_cflags_extra])
124+
AX_APPEND_COMPILE_FLAGS([-Wunknown-pragmas],,[$ax_append_compile_cflags_extra])
125+
AX_APPEND_COMPILE_FLAGS([-Wthis-test-should-fail],,[$ax_append_compile_cflags_extra])
122126
dnl Anything below this comment please keep sorted.
123-
AS_IF([test "x$CC" != "xclang"],
124-
[AX_APPEND_COMPILE_FLAGS([--param=ssp-buffer-size=1],[AM_CFLAGS],[$ax_append_compile_cflags_extra])])
125-
AX_APPEND_COMPILE_FLAGS([-Waddress],[AM_CFLAGS],[$ax_append_compile_cflags_extra])
126-
AX_APPEND_COMPILE_FLAGS([-Warray-bounds],[AM_CFLAGS],[$ax_append_compile_cflags_extra])
127-
AX_APPEND_COMPILE_FLAGS([-Wbad-function-cast],[AM_CFLAGS],[$ax_append_compile_cflags_extra])
127+
AS_IF([test "$CC" = "clang"],[],[
128+
AX_APPEND_COMPILE_FLAGS([--param=ssp-buffer-size=1],,[$ax_append_compile_cflags_extra])
129+
])
130+
AX_APPEND_COMPILE_FLAGS([-Waddress],,[$ax_append_compile_cflags_extra])
131+
AX_APPEND_COMPILE_FLAGS([-Warray-bounds],,[$ax_append_compile_cflags_extra])
132+
AX_APPEND_COMPILE_FLAGS([-Wbad-function-cast],,[$ax_append_compile_cflags_extra])
128133
dnl Not in use -Wc++-compat
129-
AX_APPEND_COMPILE_FLAGS([-Wchar-subscripts],[AM_CFLAGS],[$ax_append_compile_cflags_extra])
130-
AX_APPEND_COMPILE_FLAGS([-Wcomment],[AM_CFLAGS],[$ax_append_compile_cflags_extra])
131-
AX_APPEND_COMPILE_FLAGS([-Wfloat-equal],[AM_CFLAGS],[$ax_append_compile_cflags_extra])
132-
AX_APPEND_COMPILE_FLAGS([-Wformat-security],[AM_CFLAGS],[$ax_append_compile_cflags_extra])
133-
AX_APPEND_COMPILE_FLAGS([-Wformat=2],[AM_CFLAGS],[$ax_append_compile_cflags_extra])
134-
AX_APPEND_COMPILE_FLAGS([-Wmaybe-uninitialized],[AM_CFLAGS],[$ax_append_compile_cflags_extra])
135-
AX_APPEND_COMPILE_FLAGS([-Wmissing-field-initializers],[AM_CFLAGS],[$ax_append_compile_cflags_extra])
136-
AX_APPEND_COMPILE_FLAGS([-Wmissing-noreturn],[AM_CFLAGS],[$ax_append_compile_cflags_extra])
137-
AX_APPEND_COMPILE_FLAGS([-Wmissing-prototypes],[AM_CFLAGS],[$ax_append_compile_cflags_extra])
138-
AX_APPEND_COMPILE_FLAGS([-Wnested-externs],[AM_CFLAGS],[$ax_append_compile_cflags_extra])
139-
AX_APPEND_COMPILE_FLAGS([-Wnormalized=id],[AM_CFLAGS],[$ax_append_compile_cflags_extra])
140-
AX_APPEND_COMPILE_FLAGS([-Woverride-init],[AM_CFLAGS],[$ax_append_compile_cflags_extra])
141-
AX_APPEND_COMPILE_FLAGS([-Wpointer-arith],[AM_CFLAGS],[$ax_append_compile_cflags_extra])
142-
AX_APPEND_COMPILE_FLAGS([-Wpointer-sign],[AM_CFLAGS],[$ax_append_compile_cflags_extra])
143-
AX_APPEND_COMPILE_FLAGS([-Wredundant-decls],[AM_CFLAGS],[$ax_append_compile_cflags_extra])
144-
AX_APPEND_COMPILE_FLAGS([-Wshadow],[AM_CFLAGS],[$ax_append_compile_cflags_extra])
145-
AX_APPEND_COMPILE_FLAGS([-Wshorten-64-to-32],[AM_CFLAGS],[$ax_append_compile_cflags_extra])
146-
AX_APPEND_COMPILE_FLAGS([-Wsign-compare],[AM_CFLAGS],[$ax_append_compile_cflags_extra])
147-
AX_APPEND_COMPILE_FLAGS([-Wstrict-overflow=1],[AM_CFLAGS],[$ax_append_compile_cflags_extra])
148-
AX_APPEND_COMPILE_FLAGS([-Wstrict-prototypes],[AM_CFLAGS],[$ax_append_compile_cflags_extra])
149-
AX_APPEND_COMPILE_FLAGS([-Wswitch-enum],[AM_CFLAGS],[$ax_append_compile_cflags_extra])
150-
AX_APPEND_COMPILE_FLAGS([-Wundef],[AM_CFLAGS],[$ax_append_compile_cflags_extra])
151-
AX_APPEND_COMPILE_FLAGS([-Wunused],[AM_CFLAGS],[$ax_append_compile_cflags_extra])
152-
AX_APPEND_COMPILE_FLAGS([-Wunused-result],[AM_CFLAGS],[$ax_append_compile_cflags_extra])
153-
AX_APPEND_COMPILE_FLAGS([-Wunused-variable],[AM_CFLAGS],[$ax_append_compile_cflags_extra])
154-
AX_APPEND_COMPILE_FLAGS([-Wwrite-strings],[AM_CFLAGS],[$ax_append_compile_cflags_extra])
155-
AX_APPEND_COMPILE_FLAGS([-fwrapv],[AM_CFLAGS],[$ax_append_compile_cflags_extra])
134+
AX_APPEND_COMPILE_FLAGS([-Wchar-subscripts],,[$ax_append_compile_cflags_extra])
135+
AX_APPEND_COMPILE_FLAGS([-Wcomment],,[$ax_append_compile_cflags_extra])
136+
AX_APPEND_COMPILE_FLAGS([-Wfloat-equal],,[$ax_append_compile_cflags_extra])
137+
AX_APPEND_COMPILE_FLAGS([-Wformat-security],,[$ax_append_compile_cflags_extra])
138+
AX_APPEND_COMPILE_FLAGS([-Wformat=2],,[$ax_append_compile_cflags_extra])
139+
AX_APPEND_COMPILE_FLAGS([-Wmaybe-uninitialized],,[$ax_append_compile_cflags_extra])
140+
AX_APPEND_COMPILE_FLAGS([-Wmissing-field-initializers],,[$ax_append_compile_cflags_extra])
141+
AX_APPEND_COMPILE_FLAGS([-Wmissing-noreturn],,[$ax_append_compile_cflags_extra])
142+
AX_APPEND_COMPILE_FLAGS([-Wmissing-prototypes],,[$ax_append_compile_cflags_extra])
143+
AX_APPEND_COMPILE_FLAGS([-Wnested-externs],,[$ax_append_compile_cflags_extra])
144+
AX_APPEND_COMPILE_FLAGS([-Wnormalized=id],,[$ax_append_compile_cflags_extra])
145+
AX_APPEND_COMPILE_FLAGS([-Woverride-init],,[$ax_append_compile_cflags_extra])
146+
AX_APPEND_COMPILE_FLAGS([-Wpointer-arith],,[$ax_append_compile_cflags_extra])
147+
AX_APPEND_COMPILE_FLAGS([-Wpointer-sign],,[$ax_append_compile_cflags_extra])
148+
AX_APPEND_COMPILE_FLAGS([-Wredundant-decls],,[$ax_append_compile_cflags_extra])
149+
AX_APPEND_COMPILE_FLAGS([-Wshadow],,[$ax_append_compile_cflags_extra])
150+
AX_APPEND_COMPILE_FLAGS([-Wshorten-64-to-32],,[$ax_append_compile_cflags_extra])
151+
AX_APPEND_COMPILE_FLAGS([-Wsign-compare],,[$ax_append_compile_cflags_extra])
152+
AX_APPEND_COMPILE_FLAGS([-Wstrict-overflow=1],,[$ax_append_compile_cflags_extra])
153+
AX_APPEND_COMPILE_FLAGS([-Wstrict-prototypes],,[$ax_append_compile_cflags_extra])
154+
AX_APPEND_COMPILE_FLAGS([-Wswitch-enum],,[$ax_append_compile_cflags_extra])
155+
AX_APPEND_COMPILE_FLAGS([-Wundef],,[$ax_append_compile_cflags_extra])
156+
AX_APPEND_COMPILE_FLAGS([-Wunused],,[$ax_append_compile_cflags_extra])
157+
AX_APPEND_COMPILE_FLAGS([-Wunused-result],,[$ax_append_compile_cflags_extra])
158+
AX_APPEND_COMPILE_FLAGS([-Wunused-variable],,[$ax_append_compile_cflags_extra])
159+
AX_APPEND_COMPILE_FLAGS([-Wwrite-strings],,[$ax_append_compile_cflags_extra])
160+
AX_APPEND_COMPILE_FLAGS([-fwrapv],,[$ax_append_compile_cflags_extra])
156161
AC_LANG_POP
157162
])
158163

159164
AC_DEFUN([AX_HARDEN_CXX_COMPILER_FLAGS], [
165+
AC_REQUIRE_DEFINED([AX_APPEND_COMPILE_FLAGS])
160166
AC_REQUIRE([AX_HARDEN_CC_COMPILER_FLAGS])
161167
AC_LANG_PUSH([C++])
162168

0 commit comments

Comments
 (0)