- Issue #14324: Fix configure tests for cross builds.

when configured --with(out)-computed-gotos for a cross, use this value instead of defaulting to no.

1 files changed, 37 insertions, 34 deletions

diff --git a/configure b/configure
index 8f5845d..ee518cc 100755
--- a/configure
+++ b/configure
@@ -14022,13 +14022,47 @@ $as_echo "#define HAVE_BROKEN_MBSTOWCS 1" >>confdefs.h
 
 fi
 
+# Check for --with-computed-gotos
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for --with-computed-gotos" >&5
+$as_echo_n "checking for --with-computed-gotos... " >&6; }
+
+# Check whether --with-computed-gotos was given.
+if test "${with_computed_gotos+set}" = set; then :
+  withval=$with_computed_gotos;
+if test "$withval" = yes
+then
+
+$as_echo "#define USE_COMPUTED_GOTOS 1" >>confdefs.h
+
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
+fi
+if test "$withval" = no
+then
+
+$as_echo "#define USE_COMPUTED_GOTOS 0" >>confdefs.h
+
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no value specified" >&5
+$as_echo "no value specified" >&6; }
+fi
+
+
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CC supports computed gotos" >&5
 $as_echo_n "checking whether $CC supports computed gotos... " >&6; }
 if ${ac_cv_computed_gotos+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   if test "$cross_compiling" = yes; then :
-  ac_cv_computed_gotos=no
+  if test "${with_computed_gotos+set}" = set; then
+   ac_cv_computed_gotos="$with_computed_gotos -- configured --with(out)-computed-gotos"
+ else
+   ac_cv_computed_gotos=no
+ fi
 else
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
@@ -14058,42 +14092,11 @@ fi
 
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_computed_gotos" >&5
 $as_echo "$ac_cv_computed_gotos" >&6; }
-if test "$ac_cv_computed_gotos" = yes
-then
+case "$ac_cv_computed_gotos" in yes*)
 
 $as_echo "#define HAVE_COMPUTED_GOTOS 1" >>confdefs.h
 
-fi
-
-# Check for --with-computed-gotos
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for --with-computed-gotos" >&5
-$as_echo_n "checking for --with-computed-gotos... " >&6; }
-
-# Check whether --with-computed-gotos was given.
-if test "${with_computed_gotos+set}" = set; then :
-  withval=$with_computed_gotos;
-if test "$withval" = yes
-then
-
-$as_echo "#define USE_COMPUTED_GOTOS 1" >>confdefs.h
-
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; }
-fi
-if test "$withval" = no
-then
-
-$as_echo "#define USE_COMPUTED_GOTOS 0" >>confdefs.h
-
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no value specified" >&5
-$as_echo "no value specified" >&6; }
-fi
-
+esac
 
 case $ac_sys_system in
 AIX*)