Merge work:/home/bk/mysql-4.0

into serg.mysql.com:/usr/home/serg/Abk/mysql-4.0

configure.in

@@ -2239,7 +2239,7 @@ AC_OUTPUT(Makefile extra/Makefile mysys/Makefile isam/Makefile \
  man/Makefile readline/Makefile vio/Makefile \
  libmysql_r/Makefile libmysqld/Makefile libmysqld/examples/Makefile \
  libmysql/Makefile client/Makefile \
- pstack/Makefile sql/Makefile sql/share/Makefile \
+ pstack/Makefile pstack/aout/Makefile sql/Makefile sql/share/Makefile \
  merge/Makefile dbug/Makefile scripts/Makefile \
  include/Makefile sql-bench/Makefile tools/Makefile \
  tests/Makefile Docs/Makefile support-files/Makefile \

libmysqld/examples/Makefile.am

@@ -17,7 +17,7 @@ LDADD =	$(top_builddir)/libmysqld/libmysqld.la \
 	$(top_builddir)/heap/libheap.a \
 	$(top_builddir)/merge/libmerge.a \
 	$(top_builddir)/myisammrg/libmyisammrg.a \
-	@innodb_libs@ @bdb_libs@ \
+	@innodb_libs@ @bdb_libs@ @pstack_libs@ \
 	$(top_builddir)/mysys/libmysys.a \
 	$(top_builddir)/strings/libmystrings.a \
 	$(top_builddir)/dbug/libdbug.a \

pstack/Makefile.am

@@ -19,6 +19,7 @@
 # the USE_PSTACK hack to get all files into distribution
 #
 
+SUBDIRS =		aout
 INCLUDES =		-I$(srcdir)/../include -I../include
 noinst_HEADERS =	bucomm.h debug.h ieee.h budbg.h demangle.h \
 			linuxthreads.h pstack.h pstacktrace.h

pstack/aout/Makefile.am

+noinst_HEADERS = aout64.h stab.def stab_gnu.h