bk commit into 5.1 tree (mtaylor:1.2580) BUG#29791

[Monty Taylor]

Below is the list of changes that have just been committed into a local
5.1 repository of mtaylor.  When mtaylor 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, 2008-04-25 12:26:11-07:00, mtaylor@solace.(none) +2 -0
  Bug #29791 relocation R_X86_64_32 against `a local symbol' 
  
  Fixed an automake dependency issue that shows up during make -j builds.

  mysys/Makefile.am@stripped, 2008-04-25 12:26:09-07:00, mtaylor@solace.(none) +3 -1
    Bug #29791 relocation R_X86_64_32 against `a local symbol' 
    
    Fixed an automake dependency issue that shows up during make -j builds.

  strings/Makefile.am@stripped, 2008-04-25 12:26:09-07:00, mtaylor@solace.(none) +3 -1
    Bug #29791 relocation R_X86_64_32 against `a local symbol' 
    
    Fixed an automake dependency issue that shows up during make -j builds.

diff -Nrup a/mysys/Makefile.am b/mysys/Makefile.am
--- a/mysys/Makefile.am	2008-04-24 23:32:17 -07:00
+++ b/mysys/Makefile.am	2008-04-25 12:26:09 -07:00
@@ -25,7 +25,9 @@ LDADD =			$(top_builddir)/strings/libmys
 pkglib_LTLIBRARIES =	libmysys.la
 libmysys_la_LDFLAGS = 	-static
 libmysys_la_SOURCES = 
-libmysys_la_LIBADD =	$(top_builddir)/mysys/libmysyslt.la
+# This can't be listed here as $(top_builddir)/mysys/libmysyslt.la
+# or it breaks make's dependency track for -j builds
+libmysys_la_LIBADD =	libmysyslt.la
 # Force C++ linking - dummy.cxx doesn't have to exist with EXTRA in the name
 nodist_EXTRA_libmysys_la_SOURCES = dummy.cxx
 
diff -Nrup a/strings/Makefile.am b/strings/Makefile.am
--- a/strings/Makefile.am	2008-04-24 23:32:21 -07:00
+++ b/strings/Makefile.am	2008-04-25 12:26:09 -07:00
@@ -21,7 +21,9 @@ libmystrings_la_LDFLAGS =   -static
 libmystrings_la_SOURCES = 
 # Force C++ linking - dummy.cxx doesn't have to exist with EXTRA in the name
 nodist_EXTRA_libmystrings_la_SOURCES = dummy.cxx
-libmystrings_la_LIBADD = $(top_builddir)/strings/libmystringslt.la
+# This can't be listed here as $(top_builddir)/strings/libmystingslt.la
+# or it breaks make's dependency track for -j builds
+libmystrings_la_LIBADD = libmystringslt.la
 
 
 noinst_LTLIBRARIES =	libmystringslt.la