fix setting of HOST_{PRE,SUF}FIX in case --host option is specified but --build is...

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@59905 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/configure b/configure
index e8015b9cdac4ca5a6fd22fb175b1a14faa7e6cba..3264aa501a837613bbd1d774d39e8dfeb61e1692 100755 (executable)
--- a/configure
+++ b/configure
@@ -1,5 +1,5 @@
 #! /bin/sh
 #! /bin/sh

-# From configure.in Id: configure.in 59458 2009-03-09 22:41:02Z VZ .
+# From configure.in Id: configure.in 59561 2009-03-15 16:07:56Z KO .

 # Guess values for system-dependent variables and create Makefiles.
 # Generated by GNU Autoconf 2.61 for wxWidgets 2.9.0.
 #
 # Guess values for system-dependent variables and create Makefiles.
 # Generated by GNU Autoconf 2.61 for wxWidgets 2.9.0.
 #


@@ -2536,7 +2536,7 @@ case $host_os in *\ *) host_os=`echo "$host_os" | sed 's/ /-/g'`;; esac
 
 
 
 
 
 

-if test "$cross_compiling" = "yes"; then
+if test "$cross_compiling" != "no"; then

     HOST_PREFIX="${host_alias}-"
     HOST_SUFFIX="-$host_alias"
 else
     HOST_PREFIX="${host_alias}-"
     HOST_SUFFIX="-$host_alias"
 else


@@ -47052,7 +47052,7 @@ echo "$as_me: WARNING: GStreamer not available... disabling wxMediaCtrl" >&2;}
 fi
 
 
 fi
 
 

-if test "$cross_compiling" = "yes"; then
+if test "$cross_compiling" != "no"; then

         OSINFO="\"$host\""
 else
         OSINFO=`uname -s -r -m`
         OSINFO="\"$host\""
 else
         OSINFO=`uname -s -r -m`

diff --git a/configure.in b/configure.in
index ec8304c746e00b33f0568306016d7ff953ceb92a..4a3a15e38958dd417d868b647f5067b7441614de 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -26,7 +26,10 @@ dnl sets build, host variables and the same with _alias
 AC_CANONICAL_BUILD
 AC_CANONICAL_HOST
 
 AC_CANONICAL_BUILD
 AC_CANONICAL_HOST
 

-if test "$cross_compiling" = "yes"; then
+dnl notice that if --host was given but --build was not, cross_compiling is
+dnl only set to "maybe" and not "yes" and will be either set to "yes" later or
+dnl configure will exit with error in AC_PROG_CC so don't test for = "yes" here
+if test "$cross_compiling" != "no"; then

     HOST_PREFIX="${host_alias}-"
     HOST_SUFFIX="-$host_alias"
 else
     HOST_PREFIX="${host_alias}-"
     HOST_SUFFIX="-$host_alias"
 else


@@ -7290,7 +7293,7 @@ dnl ---------------------------------------------------------------------------
 dnl get the string with OS info - used by wxGetOsDescription() on MacOS X
 dnl ---------------------------------------------------------------------------
 
 dnl get the string with OS info - used by wxGetOsDescription() on MacOS X
 dnl ---------------------------------------------------------------------------
 

-if test "$cross_compiling" = "yes"; then
+if test "$cross_compiling" != "no"; then

     dnl Use best guess from host as we can't use uname when cross compiling
     OSINFO="\"$host\""
 else
     dnl Use best guess from host as we can't use uname when cross compiling
     OSINFO="\"$host\""
 else