From: kvishwanatha
Date: December 7 2005 4:07pm
Subject: bk commit into 4.1 tree (bldsql:1.2488)
List-Archive: http://lists.mysql.com/commits/9
Message-Id: <200512071607.jB7G7rE3007789@blr-naas-nwl03.blr.novell.com>

Below is the list of changes that have just been committed into a local
4.1 repository of bldsql. When bldsql 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.2488 05/12/07 21:37:42 bldsql@stripped +2 -0
  Trying to fix the build for NetWare.
  This check-in can be ignored.

  configure.in
    1.402 05/12/07 21:37:33 bldsql@stripped +1 -1
    Trying to fix the build for NetWare.
    This check-in can be ignored.

  Makefile.am
    1.76 05/12/07 21:37:33 bldsql@stripped +2 -1
    Trying to fix the build for NetWare.
    This check-in can be ignored.

# 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:	bldsql
# Host:	blr-naas-nwl03.blr.novell.com
# Root:	/home/bldsql/bk/mysql-4.1-mainbk-test

--- 1.75/Makefile.am	2005-12-07 20:11:20 +05:30
+++ 1.76/Makefile.am	2005-12-07 21:37:33 +05:30
@@ -49,7 +49,6 @@
 CLEANFILES = $(BUILT_SOURCES) bdb/build_unix/db.h
 DISTCLEANFILES = ac_available_languages_fragment
 
-all-local: $(BUILT_SOURCES)
 
 linked_include_sources:
 	cd include; $(MAKE) link_sources
@@ -82,6 +81,8 @@
 linked_server_sources:
 	cd sql; $(MAKE) link_sources
 	echo timestamp > linked_server_sources
+
+all-local: $(BUILT_SOURCES)
 
 # Create permission databases
 init-db:		all

--- 1.401/configure.in	2005-12-07 20:33:23 +05:30
+++ 1.402/configure.in	2005-12-07 21:37:33 +05:30
@@ -2324,7 +2324,7 @@
 MYSQL_CHECK_OPENSSL
 
 libmysqld_dirs=
-linked_libmysqld_targets="linked_libmysqld_sources linked_libmysqldex_sources"
+linked_libmysqld_targets=
 if test "$with_embedded_server" = "yes"
 then
   libmysqld_dirs=libmysqld