bk commit into 5.0 tree (msvensson:1.2509) BUG#29414

[msvensson]

Below is the list of changes that have just been committed into a local
5.0 repository of msvensson. When msvensson 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, 2007-06-28 11:13:18+02:00, msvensson@pilot.(none) +1 -0
  Bug#29414 HPUX build fails - 'noinst_HEADERS' does not exist

  sql/Makefile.am@stripped, 2007-06-28 11:13:16+02:00, msvensson@pilot.(none) +1 -2
    Avoid "noinst_HEADERS" being sucked into mysql_LDADD 
    target if @MYSQLD_EXTRA_IBS@ are empty

diff -Nrup a/sql/Makefile.am b/sql/Makefile.am
--- a/sql/Makefile.am	2007-06-13 14:52:25 +02:00
+++ b/sql/Makefile.am	2007-06-28 11:13:16 +02:00
@@ -43,8 +43,7 @@ mysqld_LDADD =		@MYSQLD_EXTRA_LDFLAGS@ \
                         @innodb_system_libs@ \
 			@ndbcluster_libs@ @ndbcluster_system_libs@ \
 			$(LDADD)  $(CXXLDFLAGS) $(WRAPLIBS) @LIBDL@ \
-			$(yassl_libs) $(openssl_libs) \
-			@MYSQLD_EXTRA_LIBS@
+			$(yassl_libs) $(openssl_libs) @MYSQLD_EXTRA_LIBS@
 
 noinst_HEADERS =	item.h item_func.h item_sum.h item_cmpfunc.h \
 			item_strfunc.h item_timefunc.h item_uniq.h \