Whack OpenSSL configuration to pull its notion of the CPU from

autoconf rather than deducing this on its own, so that we can use
pbuilder and pbuilder-dist to build both 32-bit and 64-bit packages on
the same 64-bit Ubuntu machine.  See #423.

svn path=/trunk/; revision=5124

1 files changed, 8 insertions, 2 deletions

diff --git a/configure b/configure
index f45966c7..131386e6 100755
--- a/configure
+++ b/configure
@@ -2294,6 +2294,12 @@ ac_config_sub="$SHELL $ac_aux_dir/config.sub"  # Please don't use this var.
 ac_configure="$SHELL $ac_aux_dir/configure"  # Please don't use this var.
 
 
+
+# I'm not sure we should really be using the $host_* variables as we
+# are, some of the stuff we're doing with them looks more like
+# $target_* to me now, but on the theory that we should not fix things
+# that aren't broken, stick with $host_* for now.
+
 # Make sure we can run config.sub.
 $SHELL "$ac_aux_dir/config.sub" sun4 >/dev/null 2>&1 ||
   as_fn_error $? "cannot run $SHELL $ac_aux_dir/config.sub" "$LINENO" 5
@@ -5000,9 +5006,9 @@ $as_echo_n "checking what configuration target to use when building OpenSSL... "
 	*)
 		if test $build_openssl_asm = yes
 		then
-			OPENSSL_CONFIG_COMMAND='./config'
+			OPENSSL_CONFIG_COMMAND="MACHINE=$host_cpu ./config"
 		else
-			OPENSSL_CONFIG_COMMAND='./config no-asm'
+			OPENSSL_CONFIG_COMMAND="MACHINE=$host_cpu ./config no-asm"
 		fi
 		;;
 	esac