aboutsummaryrefslogtreecommitdiffstats
path: root/acinclude.m4
diff options
context:
space:
mode:
authorJoão Valverde <joao.valverde@tecnico.ulisboa.pt>2016-02-21 20:31:00 +0000
committerAlexis La Goutte <alexis.lagoutte@gmail.com>2016-02-23 13:10:28 +0000
commitd49e06a5176ed270c22e31078751194a4eec6ca9 (patch)
tree355e76c4d58ff7dfc90f510153edecd32c115916 /acinclude.m4
parent5d00f39d10ebba19ab2aea719606fa6b218a3658 (diff)
autotools: Display build flags in configure summary
Add more AX_APPEND_FLAGS to handle whitespace better too. Change-Id: I679fc76076c2d800e3524fe7bf22d0af8e58b284 Reviewed-on: https://code.wireshark.org/review/14062 Petri-Dish: João Valverde <j@v6e.pt> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
Diffstat (limited to 'acinclude.m4')
-rw-r--r--acinclude.m412
1 files changed, 6 insertions, 6 deletions
diff --git a/acinclude.m4 b/acinclude.m4
index 126334b340..95492f4b27 100644
--- a/acinclude.m4
+++ b/acinclude.m4
@@ -1412,7 +1412,7 @@ AC_LINK_IFELSE(
],
[
AC_MSG_RESULT(yes)
- WS_LDFLAGS="$WS_LDFLAGS $LD_OPTION"
+ AX_APPEND_FLAG([$LD_OPTION], [WS_LDFLAGS])
can_add_to_ldflags=yes
],
[
@@ -1604,7 +1604,7 @@ if test "x$ac_supports_gcc_flags" = "xyes" ; then
# added them, by setting CFLAGS to the saved value plus
# just the new option.
#
- WS_CFLAGS="$WS_CFLAGS $GCC_OPTION"
+ AX_APPEND_FLAG([$GCC_OPTION], [WS_CFLAGS])
if test "$CC" = "$CC_FOR_BUILD"; then
#
# We're building the build tools with the same compiler
@@ -1623,7 +1623,7 @@ if test "x$ac_supports_gcc_flags" = "xyes" ; then
# added them, by setting CFLAGS to the saved value plus
# just the new option.
#
- WS_CFLAGS="$WS_CFLAGS $GCC_OPTION"
+ AX_APPEND_FLAG([$GCC_OPTION], [WS_CFLAGS])
if test "$CC" = "$CC_FOR_BUILD"; then
#
# We're building the build tools with the same compiler
@@ -1710,7 +1710,7 @@ if test "x$ac_supports_gcc_flags" = "xyes" ; then
# added them, by setting CXXFLAGS to the saved value plus
# just the new option.
#
- WS_CXXFLAGS="$WS_CXXFLAGS $GCC_OPTION"
+ AX_APPEND_FLAG([$GCC_OPTION], [WS_CXXFLAGS])
],
[
AC_MSG_RESULT(yes)
@@ -1721,7 +1721,7 @@ if test "x$ac_supports_gcc_flags" = "xyes" ; then
# added them, by setting CXXFLAGS to the saved value plus
# just the new option.
#
- WS_CXXFLAGS="$WS_CXXFLAGS $GCC_OPTION"
+ AX_APPEND_FLAG([$GCC_OPTION], [WS_CXXFLAGS])
fi
],
[
@@ -1783,7 +1783,7 @@ if test "x$GCC" = "xyes" -o "x$CC" = "xclang" ; then
]])],
[
AC_MSG_RESULT(yes)
- WS_CPPFLAGS="$WS_CPPFLAGS -D_FORTIFY_SOURCE=2"
+ AX_APPEND_FLAG([-D_FORTIFY_SOURCE=2], [WS_CPPFLAGS])
],
[
AC_MSG_RESULT(no)