From 708e9ed990683e7ba1bddef4d2a5fe155b2236f5 Mon Sep 17 00:00:00 2001
From: Derek Atkins <derek@ihtfp.com>
Date: Sun, 5 Mar 2006 19:33:00 +0000
Subject: [PATCH] 	* configure.in: change the g-wrap 1.3 + GCC4 behavior.
 	  only warn the user (not blow out) if they explicitly request 	 
 --enable-error-on-warning.   But still blow out if they 	  didn't
 specifically request it and we turned it on by default.

git-svn-id: svn+ssh://svn.gnucash.org/repo/gnucash/trunk@13493 57a11ea4-9604-0410-9ed3-97b8803252fd
---
 ChangeLog    |  5 +++++
 configure.in | 20 ++++++++++++++++----
 2 files changed, 21 insertions(+), 4 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index b2871cad96..35884f9d9e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -22,6 +22,11 @@
 	  Fix a compiler warning so the code builds properly:
 	  - warning: suggest parentheses around assignment used as truth value
 
+	* configure.in: change the g-wrap 1.3 + GCC4 behavior.
+	  only warn the user (not blow out) if they explicitly request
+	  --enable-error-on-warning.   But still blow out if they
+	  didn't specifically request it and we turned it on by default.
+
 2006-03-05  Christian Stimming  <stimming@tuhh.de>
 
 	* src/register/ledger-core/split-register-control.c: Fix missing
diff --git a/configure.in b/configure.in
index 737c449f93..5817018718 100644
--- a/configure.in
+++ b/configure.in
@@ -2019,10 +2019,11 @@ then
 
   # Enable error-on-warning by default -- I'm tired of fixing other
   # people's missing #includes, etc.
+  gnc_error_on_warning=auto
   AC_ARG_ENABLE(error-on-warning,
     [  --disable-error-on-warning    disable treating compile warnings as errors],
     [case "${enableval}" in
-       yes) warnFLAGS="${warnFLAGS} -Werror" ;;
+       yes) warnFLAGS="${warnFLAGS} -Werror" ; gnc_error_on_warning=yes ;;
        no)  gnc_error_on_warning=no ;;
        *) AC_MSG_ERROR(bad value ${enableval} for --enable-error-on-warning) ;;
      esac],
@@ -2042,9 +2043,11 @@ then
 	warnFLAGS="${warnFLAGS} -Wdeclaration-after-statement -Wno-pointer-sign"
 	# rpmbuild on FC4 forces this flag. Can't hurt to always compile with it.
 	warnFLAGS="${warnFLAGS} -D_FORTIFY_SOURCE=2"
-	if test "x$gnc_error_on_warning" = x -a $gwrap_major_version = 1 -a $gwrap_minor_version -lt 9 ; then
-	    # This is g-wrap 1.3 + gcc4 + --enable-error-on-warning
-	    AC_MSG_ERROR([
+	if test $gwrap_major_version = 1 -a $gwrap_minor_version -lt 9 ; then
+	    # This is g-wrap 1.3 + gcc4.  Test error-on-warning
+            case "$gnc_error_on_warning" in
+	    auto)
+	      AC_MSG_ERROR([
 
   Sorry, your current configuration will not compile.  You are
   running g-wrap 1.3.x, GCC4, and --enable-error-on-warning, which
@@ -2055,6 +2058,15 @@ then
   You can find it at http://www.nongnu.org/g-wrap/ .
 
 ])
+	      ;;
+	    yes)
+	      AC_MSG_WARN([
+
+  g-wrap 1.3.x and GCC4 may cause build problems.  You have been warned!
+
+])
+	      ;;
+	    esac
 	  fi
 	fi
      fi