configure.in:

  Temporary work around to pass --build=... to configure
  in storage engine sub directory
print_file.cpp:
  HP-UX compiler don't like variable shadowing
AsyncFile.cpp:
  Cast result from strstr() to char* for HP-UX compile
trigger_definitions.h:
  "MIN" and "MAX" are not used for trigger stuff, move to a more global include
ndb_global.h.in:
  Define "MIN" and "MAX" globally for all NDB, in case the platform does not have it (like Solaris).
  Moved here from "include/kernel/trigger_definitions.h".
Makefile.am:
  Add missing ha_* files to EXTRA_mysqld_SOURCES

configure.in

@@ -2504,7 +2504,7 @@ case $SYSTEM_TYPE in
 esac
 
 for CONF in $other_configures; do
-  (cd `dirname $CONF`; ./`basename $CONF`)
+  (cd `dirname $CONF`; ./`basename $CONF` --build=$build_alias)
 done
 
 AC_SUBST(MAKE_BINARY_DISTRIBUTION_OPTIONS)

sql/Makefile.am

@@ -98,9 +98,12 @@ mysqld_SOURCES =	sql_lex.cc sql_handler.cc sql_partition.cc \
 			sql_plugin.cc\
 			handlerton.cc
 EXTRA_mysqld_SOURCES =	ha_innodb.cc ha_berkeley.cc ha_archive.cc \
+			ha_innodb.h  ha_berkeley.h  ha_archive.h \
 			ha_blackhole.cc ha_federated.cc ha_ndbcluster.cc \
-			ha_partition.cc \
-			examples/ha_tina.cc examples/ha_example.cc
+			ha_blackhole.h  ha_federated.h  ha_ndbcluster.h \
+			ha_partition.cc ha_partition.h \
+			examples/ha_tina.cc examples/ha_example.cc \
+			examples/ha_tina.h  examples/ha_example.h
 mysqld_DEPENDENCIES =	@mysql_se_objs@
 gen_lex_hash_SOURCES =	gen_lex_hash.cc
 gen_lex_hash_LDADD =	$(LDADD) $(CXXLDFLAGS)

storage/ndb/include/kernel/trigger_definitions.h

@@ -21,14 +21,6 @@
 #include "ndb_limits.h"
 #include <signaldata/DictTabInfo.hpp>
 
-#ifndef MIN
-#define MIN(x,y) (((x)<(y))?(x):(y))
-#endif
-
-#ifndef MAX
-#define MAX(x,y) (((x)>(y))?(x):(y))
-#endif
-
 #define ILLEGAL_TRIGGER_ID ((Uint32)(~0))
 
 struct TriggerType {

storage/ndb/include/ndb_global.h.in

@@ -137,4 +137,12 @@ extern "C" {
 
 #endif /* SCO */
 
+#ifndef MIN
+#define MIN(x,y) (((x)<(y))?(x):(y))
+#endif
+
+#ifndef MAX
+#define MAX(x,y) (((x)>(y))?(x):(y))
+#endif
+
 #endif

storage/ndb/src/kernel/blocks/ndbfs/AsyncFile.cpp

@@ -983,7 +983,7 @@ void AsyncFile::createDirectories()
   char* tmp;
   const char * name = theFileName.c_str();
   const char * base = theFileName.get_base_name();
-  while((tmp = strstr(base, DIR_SEPARATOR)))
+  while((tmp = (char *)strstr(base, DIR_SEPARATOR)))
   {
     char t = tmp[0];
     tmp[0] = 0;

storage/ndb/src/kernel/blocks/print_file.cpp

@@ -83,11 +83,11 @@ int main(int argc, char ** argv)
     }
     
     Uint32 sz;
-    Uint32 i = 0;
+    Uint32 j = 0;
     do {
       buffer.grow(g_page_size);
       sz = fread(buffer.get_data(), 1, g_page_size, f);
-      if((* g_print_page)(i++, buffer.get_data(), sz))
+      if((* g_print_page)(j++, buffer.get_data(), sz))
 	break;
     } while(sz == g_page_size);