migrate EXTERNAL_WARNINGS_NOT_ERRORS out of set_soenv

3 files changed, 4 insertions, 6 deletions

diff --git a/config_host.mk.in b/config_host.mk.in
index f423dec0e185..268b6f7e049f 100644
--- a/config_host.mk.in
+++ b/config_host.mk.in
@@ -116,6 +116,7 @@ export ENABLE_XMLSEC="@ENABLE_XMLSEC@"
 export ENABLE_ZENITY="@ENABLE_ZENITY@"
 export EPM="@EPM@"
 export EPM_FLAGS="@EPM_FLAGS@"
+export EXTERNAL_WARNINGS_NOT_ERRORS="@EXTERNAL_WARNINGS_NOT_ERRORS@"
 export FLUTE_JAR="@FLUTE_JAR@"
 export FONTCONFIG_CFLAGS="@FONTCONFIG_CFLAGS@"
 export FONTCONFIG_LIBS="@FONTCONFIG_LIBS@"
diff --git a/configure.in b/configure.in
index d1fb3748e40e..499e4b85b5b6 100644
--- a/configure.in
+++ b/configure.in
@@ -3163,13 +3163,13 @@ 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"
+    EXTERNAL_WARNINGS_NOT_ERRORS="FALSE"
     AC_MSG_RESULT([yes])
 else
-    ENABLE_WERROR="FALSE"
+    EXTERNAL_WARNINGS_NOT_ERRORS="TRUE"
     AC_MSG_RESULT([no])
 fi
-AC_SUBST(ENABLE_WERROR)
+AC_SUBST(EXTERNAL_WARNINGS_NOT_ERRORS)
 
 dnl Set the ENABLE_DEBUG variable. (Activate --enable-symbols)
 dnl ===================================================================
diff --git a/set_soenv.in b/set_soenv.in
index e87c8799c94b..3acfe8599d9c 100755
--- a/set_soenv.in
+++ b/set_soenv.in
@@ -710,9 +710,6 @@ ToFile( "WITH_POOR_HELP_LOCALIZATIONS", $WITH_POOR_HELP_LOCALIZATIONS, "e" );
 if ("@ENABLE_DEBUG@" eq "TRUE") {
 ToFile( "debug",             "true",             "e" );
 }
-if ("@ENABLE_WERROR@" eq "FALSE") {
-ToFile( "EXTERNAL_WARNINGS_NOT_ERRORS", "TRUE",  "e" );
-}
 ToFile( "PROEXT",            $PROEXT,            "e" );
 ToFile( "nodep",             "@nodep@",          "e" );
 ToFile( "TARFILE_LOCATION",  $TARFILE_LOCATION,  "e" );