bk commit into 5.0 tree (iggy:1.2290) BUG#22224

[Ignacio Galarza]

Below is the list of changes that have just been committed into a local
5.0 repository of iggy. When iggy 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@stripped, 2006-09-28 15:18:33-04:00, iggy@stripped +2 -0
  Bug#22224: Windows build depends on ib_config.h
    
  This change has already been made to 5.1.

  CMakeLists.txt@stripped, 2006-09-28 15:18:30-04:00, iggy@stripped +4 -2
    Removed dependancy on ib_config.h
    Added conditionals for InnoDB and BDB directories.

  innobase/include/univ.i@stripped, 2006-09-28 15:18:31-04:00,
iggy@stripped +2 -0
    ib_config.h is not required for Windows.

# 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:	iggy
# Host:	rolltop.ignatz42.dyndns.org
# Root:	/mnt/storeage/bug22224/my50-bug22224

--- 1.1/CMakeLists.txt	2006-09-28 15:18:41 -04:00
+++ 1.2/CMakeLists.txt	2006-09-28 15:18:41 -04:00
@@ -29,8 +29,6 @@
 ENDIF (WITH_MYISAMMRG_STORAGE_ENGINE)
 
 IF(WITH_INNOBASE_STORAGE_ENGINE)
-  CONFIGURE_FILE(${CMAKE_SOURCE_DIR}/innobase/ib_config.h.in
-               ${CMAKE_SOURCE_DIR}/innobase/ib_config.h @ONLY)
   ADD_DEFINITIONS(-D HAVE_INNOBASE_DB)
   ADD_DEFINITIONS(-D WITH_INNOBASE_STORAGE_ENGINE)
   SET (mysql_plugin_defs "${mysql_plugin_defs},builtin_innobase_plugin")
@@ -123,8 +121,12 @@
 ADD_SUBDIRECTORY(myisam)
 ADD_SUBDIRECTORY(myisammrg)
 ADD_SUBDIRECTORY(client)
+IF(WITH_BERKELEY_STORAGE_ENGINE)
 ADD_SUBDIRECTORY(bdb)
+ENDIF(WITH_BERKELEY_STORAGE_ENGINE)
+IF(WITH_INNOBASE_STORAGE_ENGINE)
 ADD_SUBDIRECTORY(innobase)
+ENDIF(WITH_INNOBASE_STORAGE_ENGINE)
 ADD_SUBDIRECTORY(sql)
 ADD_SUBDIRECTORY(sql/examples)
 ADD_SUBDIRECTORY(server-tools/instance-manager)

--- 1.48/innobase/include/univ.i	2006-09-28 15:18:41 -04:00
+++ 1.49/innobase/include/univ.i	2006-09-28 15:18:41 -04:00
@@ -39,8 +39,10 @@
 #undef PACKAGE
 #undef VERSION
 
+#if !defined(__WIN__) && !defined(WIN64) && !defined(_WIN64)
 /* Include the header file generated by GNU autoconf */
 #include "../ib_config.h"
+#endif
 
 #ifdef HAVE_SCHED_H
 #include <sched.h>