changeset 22478:5ca2b792a5fd

8033292: only warn, not fail, on unknown variables in configure Reviewed-by: erikj
author ihse
date Fri, 31 Jan 2014 10:24:58 +0100
parents 789f51111cb9
children 43e372703313
files common/autoconf/basics.m4 common/autoconf/generated-configure.sh
diffstat 2 files changed, 4 insertions(+), 3 deletions(-) [+]
line wrap: on
line diff
--- a/common/autoconf/basics.m4	Wed Jan 29 22:55:43 2014 +0100
+++ b/common/autoconf/basics.m4	Fri Jan 31 10:24:58 2014 +0100
@@ -250,7 +250,7 @@
   if test "x$CONFIGURE_OVERRIDDEN_VARIABLES" != x; then
     # Replace the separating ! with spaces before presenting for end user.
     unknown_variables=${CONFIGURE_OVERRIDDEN_VARIABLES//!/ }
-    AC_MSG_ERROR([The following variables are unknown to configure: $unknown_variables])
+    AC_MSG_WARN([The following variables might be unknown to configure: $unknown_variables])
   fi
 ])
 
--- a/common/autoconf/generated-configure.sh	Wed Jan 29 22:55:43 2014 +0100
+++ b/common/autoconf/generated-configure.sh	Fri Jan 31 10:24:58 2014 +0100
@@ -4087,7 +4087,7 @@
 #CUSTOM_AUTOCONF_INCLUDE
 
 # Do not change or remove the following line, it is needed for consistency checks:
-DATE_WHEN_GENERATED=1391032272
+DATE_WHEN_GENERATED=1391160222
 
 ###############################################################################
 #
@@ -48539,7 +48539,8 @@
   if test "x$CONFIGURE_OVERRIDDEN_VARIABLES" != x; then
     # Replace the separating ! with spaces before presenting for end user.
     unknown_variables=${CONFIGURE_OVERRIDDEN_VARIABLES//!/ }
-    as_fn_error $? "The following variables are unknown to configure: $unknown_variables" "$LINENO" 5
+    { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: The following variables might be unknown to configure: $unknown_variables" >&5
+$as_echo "$as_me: WARNING: The following variables might be unknown to configure: $unknown_variables" >&2;}
   fi