From: Date: October 14 2006 8:04pm
Subject: bk commit into 5.1 tree (kent:1.2319) BUG#18888
List-Archive: http://lists.mysql.com/commits/13702
X-Bug: 18888
Message-Id: <20061014180440.AB7EEFC77EF@c-4e4072d5.010-2112-6f72651.cust.bredbandsbolaget.se>

Below is the list of changes that have just been committed into a local
5.1 repository of kent. When kent 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-10-14 20:03:49+02:00, kent@stripped +1 -0
  Makefile.am:
    Configure flags makes "lex_hash.h" differ, don't distribute
    pregenerated file, build it after configure (bug#18888).

  sql/Makefile.am@stripped, 2006-10-14 20:00:26+02:00, kent@stripped +8 -8
    Configure flags makes "lex_hash.h" differ, don't distribute
    pregenerated file, build it after configure (bug#18888).

# 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:	kent
# Host:	c-4e4072d5.010-2112-6f72651.cust.bredbandsbolaget.se
# Root:	/Users/kent/mysql/bk/mysql-5.1-release

--- 1.161/sql/Makefile.am	2006-10-14 20:04:39 +02:00
+++ 1.162/sql/Makefile.am	2006-10-14 20:04:39 +02:00
@@ -27,7 +27,7 @@
 WRAPLIBS=		@WRAPLIBS@
 SUBDIRS =		share
 libexec_PROGRAMS =	mysqld
-EXTRA_PROGRAMS =	gen_lex_hash
+noinst_PROGRAMS =	gen_lex_hash
 bin_PROGRAMS =		mysql_tzinfo_to_sql
 gen_lex_hash_LDFLAGS =  @NOINST_LDFLAGS@
 LDADD =			$(top_builddir)/vio/libvio.a \
@@ -120,8 +120,9 @@
 			-DLIBDIR="\"$(MYSQLLIBdir)\"" \
 			@DEFS@
 
-BUILT_SOURCES =		sql_yacc.cc sql_yacc.h lex_hash.h
-EXTRA_DIST =		udf_example.c udf_example.def $(BUILT_SOURCES) \
+BUILT_DIST_SRC =	sql_yacc.cc sql_yacc.h
+BUILT_SOURCES =		$(BUILT_DIST_SRC) lex_hash.h
+EXTRA_DIST =		udf_example.c udf_example.def $(BUILT_DIST_SRC) \
 			nt_servc.cc nt_servc.h message.mc CMakeLists.txt \
 			udf_example.c udf_example.def
 CLEANFILES =        	lex_hash.h sql_yacc.cc sql_yacc.h sql_yacc.output
@@ -157,11 +158,10 @@
 		@echo "If it fails, re-run configure with --with-low-memory"
 		$(CXXCOMPILE) $(LM_CFLAGS) -c $<
 
-# This generates lex_hash.h
-# NOTE Built sources should depend on their sources not the tool
-# this avoid the rebuild of the built files in a source dist
-lex_hash.h:	gen_lex_hash.cc lex.h
-		$(MAKE) $(AM_MAKEFLAGS) gen_lex_hash$(EXEEXT)
+# FIXME seems like now "lex_hash.h" differs depending on configure
+# flags, so can't pregenerate and include in source TAR. Revert to
+# dist pregenerated if this changes, so the file doesn't differ.
+lex_hash.h:	gen_lex_hash$(EXEEXT)
 		./gen_lex_hash$(EXEEXT) > $@
 
 # the following three should eventually be moved out of this directory