INTEGRATION: CWS nowerror01 (1.174.2); FILE MERGED

2006/08/22 11:34:50 fridrich_strba 1.174.2.2: Issue number:  67671
Submitted by:  fridrich_strba
Reviewed by:   n/a
Remedy to rene's pickyness
2006/08/22 11:02:12 fridrich_strba 1.174.2.1: Issue number:  67671
Submitted by:  fridrich_strba
Reviewed by:   rene
Make warning != error default for configure builds

config_office/configure.in

@@ -3,7 +3,7 @@ dnl *     vi:set sw=3 ts=3 et:
 dnl *
 dnl * Name: configure.in
 dnl * Auth: Willem van Dorp, Ross Nicholson, Oisin Boydell - Sun Microsystems Ireland
-dnl * Date: $Date: 2006-08-22 13:19:10 $
+dnl * Date: $Date: 2006-08-28 12:35:18 $
 dnl *
 dnl * Desc: This file serves as input for the GNU autoconf package
 dnl *       in order to create a configure script.
@@ -12,7 +12,7 @@ dnl *       necessary to build OpenOffice.org
 dnl *
 dnl *
 dnl ******************************************************************/
-AC_REVISION( $Revision: 1.175 $ )
+AC_REVISION( $Revision: 1.176 $ )
 AC_PREREQ(2.50)
 AC_INIT()
 echo "$@" >config.parms
@@ -135,6 +135,10 @@ AC_ARG_ENABLE(symbols,
                           --enable-symbols=SMALL sets the gcc -g1 setting
                           which is smaller.
 ],,)
+AC_ARG_ENABLE(werror,
+[  --enable-werror         Turn warnings to errors. (Has no effect in modules where
+                          the treating of warnings as errors is disabled explicitely)
+],,)
 AC_ARG_ENABLE(debug,
 [  --enable-debug:         Include debugging symbols from --enable-symbols
                           plus extra debugging code.  Extra large build!
@@ -867,6 +871,22 @@ if test "$_os" = "WINNT"; then
    AC_SUBST(VC_STANDARD)
 fi
 
+dnl ===================================================================
+dnl Set the ENABLE_WERROR variable. (Activate --enable-werror)
+dnl ===================================================================
+AC_MSG_CHECKING([whether to turn warnings to errors])
+if test -n "$enable_werror" && test "$enable_werror" != "no"; then
+   ENABLE_WERROR="TRUE"
+   AC_MSG_RESULT([yes])
+   AC_MSG_WARN([Turning warnings to errors has no effect in modules or])
+   AC_MSG_WARN([on platforms where it has been disabled explicitely])
+   echo "Turning warnings to errors has no effect in modules or on platforms where it has been disabled explicitely" >> warn
+else
+   ENABLE_WERROR="FALSE"
+   AC_MSG_RESULT([no])
+fi
+AC_SUBST(ENABLE_WERROR)
+
 dnl ===================================================================
 dnl Set the ENABLE_DEBUG variable. (Activate --enable-symbols)
 dnl ===================================================================
@@ -928,7 +948,6 @@ else
 fi
 AC_SUBST(ENABLE_SYMBOLS)
 
-
 dnl ===================================================================
 dnl Build options
 dnl ===================================================================