bk commit into 5.2 tree (jani:1.2094)

[jani]

Below is the list of changes that have just been committed into a local
5.2 repository of jani. When jani does a push these changes will
be propagated to the main repository and, within 24 hours after the
push, to the public repository.
For information on how to access the public repository
see http://dev.mysql.com/doc/mysql/en/installing-source-tree.html

ChangeSet
  1.2094 06/02/05 21:19:16 jani@stripped +1 -0
  Merge a193-229-222-105.elisa-laajakaista.fi:/home/my/bk/mysql-5.1-new
  into  a193-229-222-105.elisa-laajakaista.fi:/home/my/bk/mysql-5.2

  configure.in
    1.335 06/02/05 21:19:07 jani@stripped +0 -0
    Auto merged

# This is a BitKeeper patch.  What follows are the unified diffs for the
# set of deltas contained in the patch.  The rest of the patch, the part
# that BitKeeper cares about, is below these diffs.
# User:	jani
# Host:	a193-229-222-105.elisa-laajakaista.fi
# Root:	/home/my/bk/mysql-5.2/RESYNC

--- 1.334/configure.in	2006-02-05 00:57:25 +02:00
+++ 1.335/configure.in	2006-02-05 21:19:07 +02:00
@@ -2557,9 +2557,12 @@
 AC_SUBST(GXX)
 
 # Set configuration options for make_binary_distribution
+
+CONF_ARGS=
 case $SYSTEM_TYPE in
   *netware*)
     MAKE_BINARY_DISTRIBUTION_OPTIONS=--no-strip
+    CONF_ARGS=--host="$MACHINE_TYPE-$SYSTEM_TYPE"
     ;;
   *)
     MAKE_BINARY_DISTRIBUTION_OPTIONS=
@@ -2567,7 +2570,7 @@
 esac
 
 for CONF in $other_configures; do
-  (cd `dirname $CONF`; ./`basename $CONF` --build=$build_alias)
+  (cd `dirname $CONF`; ./`basename $CONF` $CONF_ARGS --build=$build_alias)
 done
 
 AC_SUBST(MAKE_BINARY_DISTRIBUTION_OPTIONS)