[folks] Relocate the g-i scanner args in configure for consistency.

[Travis Reitter <treitter src gnome org>]

commit d37fe1c327c65781d2766cbd1984901d884eb506
Author: Travis Reitter <travis reitter collabora co uk>
Date:   Sun Nov 14 16:30:26 2010 -0800

    Relocate the g-i scanner args in configure for consistency.

 configure.ac |    6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)
---
diff --git a/configure.ac b/configure.ac
index 858844b..be35121 100644
--- a/configure.ac
+++ b/configure.ac
@@ -245,8 +245,6 @@ AS_COMPILER_FLAG([-Wno-unused-parameter],
 
 m4_if(folks_released, [1], [],
     [
-        ERROR_INTROSPECTION_SCANNER_ARGS="$ERROR_INTROSPECTION_SCANNER_ARGS \
-                --warn-error"
         if test x$werror = xyes; then
             ERROR_CFLAGS="$ERROR_CFLAGS -Werror"
         fi
@@ -272,7 +270,9 @@ AC_SUBST([ERROR_CFLAGS])
 
 # Vala-related flags
 AS_IF([test "x$enable_vala" = "xyes"],
-      [ERROR_VALAFLAGS="$ERROR_VALAFLAGS --fatal-warnings"])
+      [ERROR_INTROSPECTION_SCANNER_ARGS="\
+                        $ERROR_INTROSPECTION_SCANNER_ARGS --warn-error"
+       ERROR_VALAFLAGS="$ERROR_VALAFLAGS --fatal-warnings"])
 
 AC_SUBST([ERROR_INTROSPECTION_SCANNER_ARGS])
 AC_SUBST([ERROR_VALAFLAGS])