gnucash master: Properly nest AC_MSG_CHECKING and AC_MSG_RESULT calls to avoid confusing output.
Mike Alexander
mta at code.gnucash.org
Wed Jul 2 15:29:15 EDT 2014
Updated via https://github.com/Gnucash/gnucash/commit/d3389828 (commit)
from https://github.com/Gnucash/gnucash/commit/859866ad (commit)
commit d338982828ede52b93864a5c0098e01ea43292df
Author: Mike Alexander <mta at umich.edu>
Date: Wed Jul 2 15:26:12 2014 -0400
Properly nest AC_MSG_CHECKING and AC_MSG_RESULT calls to avoid confusing output.
diff --git a/configure.ac b/configure.ac
index a80751b..105e0e5 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1312,6 +1312,11 @@ AC_ARG_ENABLE(python-bindings,
###-------------------------------------------------------------------------
# This has to come after AC_PROG_CC _AND_ GNOME_COMPILE_WARNINGS
+AC_LANG([C++])
+AX_CHECK_COMPILE_FLAG([-Werror -Wno-deprecated-register],
+ [AM_CXXFLAGS="${AM_CXXFLAGS} -Wno-unused -Wno-deprecated-register"]
+ [AM_CXXFLAGS="${AM_CXXFLAGS} -Wno-unused"])
+AC_LANG([C])
AC_MSG_CHECKING(what extra warning flags to pass to the C compiler)
if test ${GCC}x = yesx
then
@@ -1320,11 +1325,6 @@ then
#We have a lot of unused variables. Don't warn until someone gets
#around to cleaning them up.
AM_CFLAGS="${AM_CFLAGS} -Wno-unused"
- AC_LANG([C++])
- AX_CHECK_COMPILE_FLAG([-Werror -Wno-deprecated-register],
- [AM_CXXFLAGS="${AM_CXXFLAGS} -Wno-unused -Wno-deprecated-register"]
- [AM_CXXFLAGS="${AM_CXXFLAGS} -Wno-unused"])
- AC_LANG([C])
# other flags...
# These next two are included in the GNOME_COMPILE_WARNINGS
#warnFLAGS="${warnFLAGS} -Wmissing-prototypes"
@@ -1367,9 +1367,7 @@ then
#include <stdio.h>
]],
[[ printf( "%s\n", "Hello World!");]])],
- [warnFLAGS="${warnFLAGS} -D_FORTIFY_SOURCE=2"
- AC_MSG_RESULT(OK)],
- [AC_MSG_RESULT(No)])
+ [warnFLAGS="${warnFLAGS} -D_FORTIFY_SOURCE=2"])
CFLAGS="$cflags_save"
AM_CFLAGS="${warnFLAGS} ${AM_CFLAGS}"
Summary of changes:
configure.ac | 14 ++++++--------
1 file changed, 6 insertions(+), 8 deletions(-)
More information about the gnucash-changes
mailing list