osmith
/
wireshark
forked from osmocom/wireshark
1
0
Fork 0
Code Pull Requests Releases Wiki Activity

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>
This commit is contained in:
João Valverde 2016-02-21 20:31:00 +00:00 committed by Alexis La Goutte
parent 5d00f39d10
commit d49e06a517
2 changed files with 18 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
acinclude.m4
View File

@ -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)

13
configure.ac
View File

@ -1432,7 +1432,7 @@ if test "x$ac_cv_enable_usr_local" = "xyes" ; then
# as various packages we use ("libpcap", "zlib", "adns")
# may have been installed under "/usr/local/include".
#
WS_CPPFLAGS="$WS_CPPFLAGS -I/usr/local/include"
AX_APPEND_FLAG([-I/usr/local/include], [WS_CPPFLAGS])
#
# Arrange that we search for libraries in "/usr/local/lib".
@ -3424,6 +3424,17 @@ else
ssh_userauth_agent_message="no"
fi
echo ""
echo " CPPFLAGS: $WS_CPPFLAGS $CPPFLAGS"
echo ""
echo " CFLAGS: $WS_CFLAGS $CFLAGS"
echo ""
echo " CXXFLAGS: $WS_CXXFLAGS $CXXFLAGS"
echo ""
echo " LDFLAGS: $WS_LDFLAGS $LDFLAGS"
echo ""
echo " LIBS: $LIBS"
echo ""
echo "The Wireshark package has been configured with the following options."
echo " Build wireshark : $enable_wireshark_qt$qt_lib_message"