gnucash master: Multiple changes pushed

[Mike Alexander]

Updated	 via  https://github.com/Gnucash/gnucash/commit/e818c21a (commit)
	 via  https://github.com/Gnucash/gnucash/commit/7f746724 (commit)
	from  https://github.com/Gnucash/gnucash/commit/79d16808 (commit)



commit e818c21aa0c3dd4406c450c11f09a5ba7a4cb5e0
Merge: 79d1680 7f74672
Author: Mike Alexander <mta at umich.edu>
Date:   Mon May 5 16:32:02 2014 -0400

    Merge branch 'maint'

diff --cc configure.ac
index d4fa873,be11ca1..81981a1
--- a/configure.ac
+++ b/configure.ac
@@@ -1340,13 -1326,10 +1339,11 @@@ the
  #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"
    fi
 -  CFLAGS="${warnFLAGS} ${CFLAGS}"
 +  AM_CFLAGS="${warnFLAGS} ${AM_CFLAGS}"
 +  AM_CXXFLAGS="${warnXXFLAGS} ${AM_CXXFLAGS}"
  else
    warnFLAGS=none
  fi

commit 7f746724fed793c4334bfdd0b3ef33f8cd358bd4
Author: Mike Alexander <mta at umich.edu>
Date:   Mon May 5 16:27:08 2014 -0400

    Don't nest AC_MSG_CHECKING calls, it produces confuing output.

diff --git a/configure.ac b/configure.ac
index db40582..be11ca1 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1317,7 +1317,6 @@ then
       warnFLAGS="${warnFLAGS} -Wdeclaration-after-statement"
     fi
   elif test "`echo ${GCC_VERSION} | cut -d. -f1`" -ge 4; then
-         AC_MSG_CHECKING(OK To use fortify source?)
          # This is gcc >= 4.x.x
          warnFLAGS="${warnFLAGS} -Wdeclaration-after-statement -Wno-pointer-sign"
          # rpmbuild on FC4 forces this flag. Only add it when optimizing
@@ -1327,9 +1326,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"
   fi
   CFLAGS="${warnFLAGS} ${CFLAGS}"



Summary of changes:
 configure.ac | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)