Update, added USE "tcpd readline berkdb" added DEBUG option

4 files changed, 11267 insertions, 0 deletions

diff --git a/dev-db/mysql/files/digest-mysql-3.23.36 b/dev-db/mysql/files/digest-mysql-3.23.36
new file mode 100644
index 000000000000..fb86d849eb13
--- /dev/null
+++ b/dev-db/mysql/files/digest-mysql-3.23.36
@@ -0,0 +1 @@
+MD5 f1a5e8fb00e56f808880886dbfe5906f mysql-3.23.36.tar.gz
diff --git a/dev-db/mysql/files/mysql-3.23.36-db-3.2.3-gentoo.diff b/dev-db/mysql/files/mysql-3.23.36-db-3.2.3-gentoo.diff
new file mode 100644
index 000000000000..2a1292f26fbe
--- /dev/null
+++ b/dev-db/mysql/files/mysql-3.23.36-db-3.2.3-gentoo.diff
@@ -0,0 +1,11122 @@
+diff -r -u mysql-3.23.36.orig/Docs/Makefile.in mysql-3.23.36/Docs/Makefile.in
+--- mysql-3.23.36.orig/Docs/Makefile.in	Tue Mar 27 10:19:49 2001
++++ mysql-3.23.36/Docs/Makefile.in	Fri Apr 13 16:23:24 2001
+@@ -195,15 +195,15 @@
+ 
+ DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST)
+ 
+-TAR = gtar
++TAR = tar
+ GZIP_ENV = --best
+ all: all-redirect
+ .SUFFIXES:
+ .SUFFIXES: .dvi .info .ps .texi .texinfo .txi
+ $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) 
+-	cd $(top_srcdir) && $(AUTOMAKE) --gnu --include-deps Docs/Makefile
++	cd $(top_srcdir) && $(AUTOMAKE) --gnu Docs/Makefile
+ 
+-Makefile: $(srcdir)/Makefile.in  $(top_builddir)/config.status
++Makefile: $(srcdir)/Makefile.in  $(top_builddir)/config.status $(BUILT_SOURCES)
+ 	cd $(top_builddir) \
+ 	  && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status
+ 
+@@ -331,11 +331,16 @@
+ subdir = Docs
+ 
+ distdir: $(DISTFILES)
++	here=`cd $(top_builddir) && pwd`; \
++	top_distdir=`cd $(top_distdir) && pwd`; \
++	distdir=`cd $(distdir) && pwd`; \
++	cd $(top_srcdir) \
++	  && $(AUTOMAKE) --include-deps --build-dir=$$here --srcdir-name=$(top_srcdir) --output-dir=$$top_distdir --gnu Docs/Makefile
+ 	$(mkinstalldirs) $(distdir)/Support
+ 	@for file in $(DISTFILES); do \
+ 	  d=$(srcdir); \
+ 	  if test -d $$d/$$file; then \
+-	    cp -pr $$d/$$file $(distdir)/$$file; \
++	    cp -pr $$/$$file $(distdir)/$$file; \
+ 	  else \
+ 	    test -f $(distdir)/$$file \
+ 	    || ln $$d/$$file $(distdir)/$$file 2> /dev/null \
+diff -r -u mysql-3.23.36.orig/Makefile.in mysql-3.23.36/Makefile.in
+--- mysql-3.23.36.orig/Makefile.in	Tue Mar 27 10:19:47 2001
++++ mysql-3.23.36/Makefile.in	Fri Apr 13 16:23:19 2001
+@@ -200,9 +200,9 @@
+ all: all-redirect
+ .SUFFIXES:
+ $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) 
+-	cd $(top_srcdir) && $(AUTOMAKE) --foreign --include-deps Makefile
++	cd $(top_srcdir) && $(AUTOMAKE) --foreign Makefile
+ 
+-Makefile: $(srcdir)/Makefile.in  $(top_builddir)/config.status
++Makefile: $(srcdir)/Makefile.in  $(top_builddir)/config.status $(BUILT_SOURCES)
+ 	cd $(top_builddir) \
+ 	  && CONFIG_FILES=$@ CONFIG_HEADERS= $(SHELL) ./config.status
+ 
+@@ -363,10 +363,15 @@
+ 	-rm -rf $(distdir)
+ 	mkdir $(distdir)
+ 	-chmod 777 $(distdir)
++	here=`cd $(top_builddir) && pwd`; \
++	top_distdir=`cd $(distdir) && pwd`; \
++	distdir=`cd $(distdir) && pwd`; \
++	cd $(top_srcdir) \
++	  && $(AUTOMAKE) --include-deps --build-dir=$$here --srcdir-name=$(top_srcdir) --output-dir=$$top_distdir --foreign Makefile
+ 	@for file in $(DISTFILES); do \
+ 	  d=$(srcdir); \
+ 	  if test -d $$d/$$file; then \
+-	    cp -pr $$d/$$file $(distdir)/$$file; \
++	    cp -pr $$/$$file $(distdir)/$$file; \
+ 	  else \
+ 	    test -f $(distdir)/$$file \
+ 	    || ln $$d/$$file $(distdir)/$$file 2> /dev/null \
+diff -r -u mysql-3.23.36.orig/aclocal.m4 mysql-3.23.36/aclocal.m4
+--- mysql-3.23.36.orig/aclocal.m4	Tue Mar 27 10:11:11 2001
++++ mysql-3.23.36/aclocal.m4	Fri Apr 13 16:23:15 2001
+@@ -1286,12 +1286,7 @@
+ esac
+ 
+ # Check for any special flags to pass to ltconfig.
+-#
+-# the following will cause an existing older ltconfig to fail, so
+-# we ignore this at the expense of the cache file... Checking this 
+-# will just take longer ... bummer!
+-#libtool_flags="--cache-file=$cache_file"
+-#
++libtool_flags="--cache-file=$cache_file"
+ test "$enable_shared" = no && libtool_flags="$libtool_flags --disable-shared"
+ test "$enable_static" = no && libtool_flags="$libtool_flags --disable-static"
+ test "$enable_fast_install" = no && libtool_flags="$libtool_flags --disable-fast-install"
+@@ -1590,31 +1585,35 @@
+ ])
+ 
+ # AC_LIBLTDL_CONVENIENCE[(dir)] - sets LIBLTDL to the link flags for
+-# the libltdl convenience library, adds --enable-ltdl-convenience to
+-# the configure arguments.  Note that LIBLTDL is not AC_SUBSTed, nor
+-# is AC_CONFIG_SUBDIRS called.  If DIR is not provided, it is assumed
+-# to be `${top_builddir}/libltdl'.  Make sure you start DIR with
+-# '${top_builddir}/' (note the single quotes!) if your package is not
+-# flat, and, if you're not using automake, define top_builddir as
+-# appropriate in the Makefiles.
++# the libltdl convenience library and INCLTDL to the include flags for
++# the libltdl header and adds --enable-ltdl-convenience to the
++# configure arguments.  Note that LIBLTDL and INCLTDL are not
++# AC_SUBSTed, nor is AC_CONFIG_SUBDIRS called.  If DIR is not
++# provided, it is assumed to be `libltdl'.  LIBLTDL will be prefixed
++# with '${top_builddir}/' and INCLTDL will be prefixed with
++# '${top_srcdir}/' (note the single quotes!).  If your package is not
++# flat and you're not using automake, define top_builddir and
++# top_srcdir appropriately in the Makefiles.
+ AC_DEFUN(AC_LIBLTDL_CONVENIENCE, [AC_BEFORE([$0],[AC_LIBTOOL_SETUP])dnl
+   case "$enable_ltdl_convenience" in
+   no) AC_MSG_ERROR([this package needs a convenience libltdl]) ;;
+   "") enable_ltdl_convenience=yes
+       ac_configure_args="$ac_configure_args --enable-ltdl-convenience" ;;
+   esac
+-  LIBLTDL=ifelse($#,1,$1,['${top_builddir}/libltdl'])/libltdlc.la
+-  INCLTDL=ifelse($#,1,-I$1,['-I${top_builddir}/libltdl'])
++  LIBLTDL='${top_builddir}/'ifelse($#,1,[$1],['libltdl'])/libltdlc.la
++  INCLTDL='-I${top_srcdir}/'ifelse($#,1,[$1],['libltdl'])
+ ])
+ 
+ # AC_LIBLTDL_INSTALLABLE[(dir)] - sets LIBLTDL to the link flags for
+-# the libltdl installable library, and adds --enable-ltdl-install to
+-# the configure arguments.  Note that LIBLTDL is not AC_SUBSTed, nor
+-# is AC_CONFIG_SUBDIRS called.  If DIR is not provided, it is assumed
+-# to be `${top_builddir}/libltdl'.  Make sure you start DIR with
+-# '${top_builddir}/' (note the single quotes!) if your package is not
+-# flat, and, if you're not using automake, define top_builddir as
+-# appropriate in the Makefiles.
++# the libltdl installable library and INCLTDL to the include flags for
++# the libltdl header and adds --enable-ltdl-install to the configure
++# arguments.  Note that LIBLTDL and INCLTDL are not AC_SUBSTed, nor is
++# AC_CONFIG_SUBDIRS called.  If DIR is not provided and an installed
++# libltdl is not found, it is assumed to be `libltdl'.  LIBLTDL will
++# be prefixed with '${top_builddir}/' and INCLTDL will be prefixed
++# with '${top_srcdir}/' (note the single quotes!).  If your package is
++# not flat and you're not using automake, define top_builddir and
++# top_srcdir appropriately in the Makefiles.
+ # In the future, this macro may have to be called after AC_PROG_LIBTOOL.
+ AC_DEFUN(AC_LIBLTDL_INSTALLABLE, [AC_BEFORE([$0],[AC_LIBTOOL_SETUP])dnl
+   AC_CHECK_LIB(ltdl, main,
+@@ -1627,8 +1626,8 @@
+   ])
+   if test x"$enable_ltdl_install" = x"yes"; then
+     ac_configure_args="$ac_configure_args --enable-ltdl-install"
+-    LIBLTDL=ifelse($#,1,$1,['${top_builddir}/libltdl'])/libltdl.la
+-    INCLTDL=ifelse($#,1,-I$1,['-I${top_builddir}/libltdl'])
++    LIBLTDL='${top_builddir}/'ifelse($#,1,[$1],['libltdl'])/libltdl.la
++    INCLTDL='-I${top_srcdir}/'ifelse($#,1,[$1],['libltdl'])
+   else
+     ac_configure_args="$ac_configure_args --enable-ltdl-install=no"
+     LIBLTDL="-lltdl"
+diff -r -u mysql-3.23.36.orig/client/Makefile.in mysql-3.23.36/client/Makefile.in
+--- mysql-3.23.36.orig/client/Makefile.in	Tue Mar 27 10:19:54 2001
++++ mysql-3.23.36/client/Makefile.in	Fri Apr 13 16:23:22 2001
+@@ -251,8 +251,12 @@
+ 
+ DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST)
+ 
+-TAR = gtar
++TAR = tar
+ GZIP_ENV = --best
++DEP_FILES =  .deps/completion_hash.P .deps/insert_test.P .deps/mysql.P \
++.deps/mysqladmin.P .deps/mysqldump.P .deps/mysqlimport.P \
++.deps/mysqlshow.P .deps/mysqltest.P .deps/readline.P \
++.deps/select_test.P .deps/sql_string.P .deps/thread_test.P
+ SOURCES = $(mysql_SOURCES) mysqladmin.c mysqlshow.c mysqldump.c mysqlimport.c $(mysqltest_SOURCES) insert_test.c select_test.c thread_test.c
+ OBJECTS = $(mysql_OBJECTS) mysqladmin.o mysqlshow.o mysqldump.o mysqlimport.o $(mysqltest_OBJECTS) insert_test.o select_test.o thread_test.o
+ 
+@@ -260,9 +264,9 @@
+ .SUFFIXES:
+ .SUFFIXES: .S .c .cc .lo .o .s
+ $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) 
+-	cd $(top_srcdir) && $(AUTOMAKE) --gnu --include-deps client/Makefile
++	cd $(top_srcdir) && $(AUTOMAKE) --gnu client/Makefile
+ 
+-Makefile: $(srcdir)/Makefile.in  $(top_builddir)/config.status
++Makefile: $(srcdir)/Makefile.in  $(top_builddir)/config.status $(BUILT_SOURCES)
+ 	cd $(top_builddir) \
+ 	  && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status
+ 
+@@ -301,9 +305,6 @@
+ 
+ maintainer-clean-noinstPROGRAMS:
+ 
+-.c.o:
+-	$(COMPILE) -c $<
+-
+ .s.o:
+ 	$(COMPILE) -c $<
+ 
+@@ -320,9 +321,6 @@
+ 
+ maintainer-clean-compile:
+ 
+-.c.lo:
+-	$(LIBTOOL) --mode=compile $(COMPILE) -c $<
+-
+ .s.lo:
+ 	$(LIBTOOL) --mode=compile $(COMPILE) -c $<
+ 
+@@ -413,79 +411,72 @@
+ subdir = client
+ 
+ distdir: $(DISTFILES)
++	here=`cd $(top_builddir) && pwd`; \
++	top_distdir=`cd $(top_distdir) && pwd`; \
++	distdir=`cd $(distdir) && pwd`; \
++	cd $(top_srcdir) \
++	  && $(AUTOMAKE) --include-deps --build-dir=$$here --srcdir-name=$(top_srcdir) --output-dir=$$top_distdir --gnu client/Makefile
+ 	@for file in $(DISTFILES); do \
+ 	  d=$(srcdir); \
+ 	  if test -d $$d/$$file; then \
+-	    cp -pr $$d/$$file $(distdir)/$$file; \
++	    cp -pr $$/$$file $(distdir)/$$file; \
+ 	  else \
+ 	    test -f $(distdir)/$$file \
+ 	    || ln $$d/$$file $(distdir)/$$file 2> /dev/null \
+ 	    || cp -p $$d/$$file $(distdir)/$$file || :; \
+ 	  fi; \
+ 	done
+-completion_hash.o: completion_hash.cc ../include/global.h \
+-	../include/my_config.h ../include/getopt.h ../include/dbug.h \
+-	../include/m_string.h ../include/my_sys.h ../include/m_ctype.h \
+-	../include/raid.h completion_hash.h
+-insert_test.o: insert_test.c ../include/mysql.h ../include/mysql_com.h \
+-	../include/mysql_version.h
+-mysql.o: mysql.cc ../include/global.h ../include/my_config.h \
+-	../include/getopt.h ../include/dbug.h ../include/my_sys.h \
+-	../include/m_ctype.h ../include/raid.h ../include/m_string.h \
+-	../include/mysql.h ../include/mysql_com.h \
+-	../include/mysql_version.h ../include/errmsg.h \
+-	../include/my_dir.h my_readline.h sql_string.h \
+-	../readline/readline.h ../readline/rlstdc.h \
+-	../readline/keymaps.h ../readline/chardefs.h \
+-	../readline/tilde.h completion_hash.h ../include/sslopt-vars.h \
+-	../include/sslopt-longopts.h ../include/sslopt-usage.h \
+-	../include/sslopt-case.h
+-mysqladmin.o: mysqladmin.c ../include/global.h ../include/my_config.h \
+-	../include/getopt.h ../include/dbug.h ../include/my_sys.h \
+-	../include/m_ctype.h ../include/raid.h ../include/m_string.h \
+-	../include/mysql.h ../include/mysql_com.h \
+-	../include/mysql_version.h ../include/errmsg.h \
+-	../include/sslopt-vars.h ../include/sslopt-longopts.h \
+-	../include/sslopt-case.h ../include/sslopt-usage.h
+-mysqldump.o: mysqldump.c ../include/global.h ../include/my_config.h \
+-	../include/getopt.h ../include/dbug.h ../include/my_sys.h \
+-	../include/m_ctype.h ../include/raid.h ../include/m_string.h \
+-	../include/mysql.h ../include/mysql_com.h \
+-	../include/mysql_version.h ../include/mysqld_error.h \
+-	../include/sslopt-vars.h ../include/sslopt-longopts.h \
+-	../include/sslopt-usage.h ../include/sslopt-case.h
+-mysqlimport.o: mysqlimport.c ../include/global.h ../include/my_config.h \
+-	../include/getopt.h ../include/dbug.h ../include/my_sys.h \
+-	../include/m_ctype.h ../include/raid.h ../include/m_string.h \
+-	../include/mysql.h ../include/mysql_com.h \
+-	../include/mysql_version.h ../include/sslopt-vars.h \
+-	../include/sslopt-longopts.h ../include/sslopt-usage.h \
+-	../include/sslopt-case.h
+-mysqlshow.o: mysqlshow.c ../include/global.h ../include/my_config.h \
+-	../include/getopt.h ../include/dbug.h ../include/my_sys.h \
+-	../include/m_ctype.h ../include/raid.h ../include/m_string.h \
+-	../include/mysql.h ../include/mysql_com.h \
+-	../include/mysql_version.h ../include/mysqld_error.h \
+-	../include/sslopt-vars.h ../include/sslopt-longopts.h \
+-	../include/sslopt-usage.h ../include/sslopt-case.h
+-mysqltest.o: mysqltest.c ../include/global.h ../include/my_config.h \
+-	../include/getopt.h ../include/dbug.h ../include/my_sys.h \
+-	../include/m_ctype.h ../include/raid.h ../include/m_string.h \
+-	../include/mysql.h ../include/mysql_com.h \
+-	../include/mysql_version.h ../include/my_dir.h \
+-	../include/mysqld_error.h ../include/violite.h \
+-	../include/my_net.h
+-readline.o: readline.cc ../include/global.h ../include/my_config.h \
+-	../include/getopt.h ../include/dbug.h ../include/my_sys.h \
+-	../include/m_ctype.h ../include/raid.h ../include/m_string.h \
+-	my_readline.h
+-select_test.o: select_test.c ../include/mysql.h ../include/mysql_com.h \
+-	../include/mysql_version.h
+-sql_string.o: sql_string.cc ../include/global.h ../include/my_config.h \
+-	../include/getopt.h ../include/dbug.h ../include/my_sys.h \
+-	../include/m_ctype.h ../include/raid.h ../include/m_string.h \
+-	sql_string.h
+ 
++DEPS_MAGIC := $(shell mkdir .deps > /dev/null 2>&1 || :)
++
++-include $(DEP_FILES)
++
++mostlyclean-depend:
++
++clean-depend:
++
++distclean-depend:
++	-rm -rf .deps
++
++maintainer-clean-depend:
++
++%.o: %.c
++	@echo '$(COMPILE) -c $<'; \
++	$(COMPILE) -Wp,-MD,.deps/$(*F).pp -c $<
++	@-cp .deps/$(*F).pp .deps/$(*F).P; \
++	tr ' ' '\012' < .deps/$(*F).pp \
++	  | sed -e 's/^\\$$//' -e '/^$$/ d' -e '/:$$/ d' -e 's/$$/ :/' \
++	    >> .deps/$(*F).P; \
++	rm .deps/$(*F).pp
++
++%.lo: %.c
++	@echo '$(LTCOMPILE) -c $<'; \
++	$(LTCOMPILE) -Wp,-MD,.deps/$(*F).pp -c $<
++	@-sed -e 's/^\([^:]*\)\.o[ 	]*:/\1.lo \1.o :/' \
++	  < .deps/$(*F).pp > .deps/$(*F).P; \
++	tr ' ' '\012' < .deps/$(*F).pp \
++	  | sed -e 's/^\\$$//' -e '/^$$/ d' -e '/:$$/ d' -e 's/$$/ :/' \
++	    >> .deps/$(*F).P; \
++	rm -f .deps/$(*F).pp
++
++%.o: %.cc
++	@echo '$(CXXCOMPILE) -c $<'; \
++	$(CXXCOMPILE) -Wp,-MD,.deps/$(*F).pp -c $<
++	@-cp .deps/$(*F).pp .deps/$(*F).P; \
++	tr ' ' '\012' < .deps/$(*F).pp \
++	  | sed -e 's/^\\$$//' -e '/^$$/ d' -e '/:$$/ d' -e 's/$$/ :/' \
++	    >> .deps/$(*F).P; \
++	rm .deps/$(*F).pp
++
++%.lo: %.cc
++	@echo '$(LTCXXCOMPILE) -c $<'; \
++	$(LTCXXCOMPILE) -Wp,-MD,.deps/$(*F).pp -c $<
++	@-sed -e 's/^\([^:]*\)\.o[ 	]*:/\1.lo \1.o :/' \
++	  < .deps/$(*F).pp > .deps/$(*F).P; \
++	tr ' ' '\012' < .deps/$(*F).pp \
++	  | sed -e 's/^\\$$//' -e '/^$$/ d' -e '/:$$/ d' -e 's/$$/ :/' \
++	    >> .deps/$(*F).P; \
++	rm -f .deps/$(*F).pp
+ info-am:
+ info: info-am
+ dvi-am:
+@@ -524,18 +515,19 @@
+ maintainer-clean-generic:
+ mostlyclean-am:  mostlyclean-binPROGRAMS mostlyclean-noinstPROGRAMS \
+ 		mostlyclean-compile mostlyclean-libtool \
+-		mostlyclean-tags mostlyclean-generic
++		mostlyclean-tags mostlyclean-depend mostlyclean-generic
+ 
+ mostlyclean: mostlyclean-am
+ 
+ clean-am:  clean-binPROGRAMS clean-noinstPROGRAMS clean-compile \
+-		clean-libtool clean-tags clean-generic mostlyclean-am
++		clean-libtool clean-tags clean-depend clean-generic \
++		mostlyclean-am
+ 
+ clean: clean-am
+ 
+ distclean-am:  distclean-binPROGRAMS distclean-noinstPROGRAMS \
+ 		distclean-compile distclean-libtool distclean-tags \
+-		distclean-generic clean-am
++		distclean-depend distclean-generic clean-am
+ 	-rm -f libtool
+ 
+ distclean: distclean-am
+@@ -543,8 +535,8 @@
+ maintainer-clean-am:  maintainer-clean-binPROGRAMS \
+ 		maintainer-clean-noinstPROGRAMS \
+ 		maintainer-clean-compile maintainer-clean-libtool \
+-		maintainer-clean-tags maintainer-clean-generic \
+-		distclean-am
++		maintainer-clean-tags maintainer-clean-depend \
++		maintainer-clean-generic distclean-am
+ 	@echo "This command is intended for maintainers to use;"
+ 	@echo "it deletes files that may require special tools to rebuild."
+ 
+@@ -557,12 +549,14 @@
+ mostlyclean-compile distclean-compile clean-compile \
+ maintainer-clean-compile mostlyclean-libtool distclean-libtool \
+ clean-libtool maintainer-clean-libtool tags mostlyclean-tags \
+-distclean-tags clean-tags maintainer-clean-tags distdir info-am info \
+-dvi-am dvi check check-am installcheck-am installcheck install-exec-am \
+-install-exec install-data-am install-data install-am install \
+-uninstall-am uninstall all-redirect all-am all installdirs \
+-mostlyclean-generic distclean-generic clean-generic \
+-maintainer-clean-generic clean mostlyclean distclean maintainer-clean
++distclean-tags clean-tags maintainer-clean-tags distdir \
++mostlyclean-depend distclean-depend clean-depend \
++maintainer-clean-depend info-am info dvi-am dvi check check-am \
++installcheck-am installcheck install-exec-am install-exec \
++install-data-am install-data install-am install uninstall-am uninstall \
++all-redirect all-am all installdirs mostlyclean-generic \
++distclean-generic clean-generic maintainer-clean-generic clean \
++mostlyclean distclean maintainer-clean
+ 
+ 
+ thread_test.o:		thread_test.c
+diff -r -u mysql-3.23.36.orig/configure mysql-3.23.36/configure
+--- mysql-3.23.36.orig/configure	Tue Mar 27 10:11:17 2001
++++ mysql-3.23.36/configure	Fri Apr 13 16:23:28 2001
+@@ -116,23 +116,27 @@
+ 
+ 
+ # AC_LIBLTDL_CONVENIENCE[(dir)] - sets LIBLTDL to the link flags for
+-# the libltdl convenience library, adds --enable-ltdl-convenience to
+-# the configure arguments.  Note that LIBLTDL is not AC_SUBSTed, nor
+-# is AC_CONFIG_SUBDIRS called.  If DIR is not provided, it is assumed
+-# to be `${top_builddir}/libltdl'.  Make sure you start DIR with
+-# '${top_builddir}/' (note the single quotes!) if your package is not
+-# flat, and, if you're not using automake, define top_builddir as
+-# appropriate in the Makefiles.
++# the libltdl convenience library and INCLTDL to the include flags for
++# the libltdl header and adds --enable-ltdl-convenience to the
++# configure arguments.  Note that LIBLTDL and INCLTDL are not
++# AC_SUBSTed, nor is AC_CONFIG_SUBDIRS called.  If DIR is not
++# provided, it is assumed to be `libltdl'.  LIBLTDL will be prefixed
++# with '${top_builddir}/' and INCLTDL will be prefixed with
++# '${top_srcdir}/' (note the single quotes!).  If your package is not
++# flat and you're not using automake, define top_builddir and
++# top_srcdir appropriately in the Makefiles.
+ 
+ 
+ # AC_LIBLTDL_INSTALLABLE[(dir)] - sets LIBLTDL to the link flags for
+-# the libltdl installable library, and adds --enable-ltdl-install to
+-# the configure arguments.  Note that LIBLTDL is not AC_SUBSTed, nor
+-# is AC_CONFIG_SUBDIRS called.  If DIR is not provided, it is assumed
+-# to be `${top_builddir}/libltdl'.  Make sure you start DIR with
+-# '${top_builddir}/' (note the single quotes!) if your package is not
+-# flat, and, if you're not using automake, define top_builddir as
+-# appropriate in the Makefiles.
++# the libltdl installable library and INCLTDL to the include flags for
++# the libltdl header and adds --enable-ltdl-install to the configure
++# arguments.  Note that LIBLTDL and INCLTDL are not AC_SUBSTed, nor is
++# AC_CONFIG_SUBDIRS called.  If DIR is not provided and an installed
++# libltdl is not found, it is assumed to be `libltdl'.  LIBLTDL will
++# be prefixed with '${top_builddir}/' and INCLTDL will be prefixed
++# with '${top_srcdir}/' (note the single quotes!).  If your package is
++# not flat and you're not using automake, define top_builddir and
++# top_srcdir appropriately in the Makefiles.
+ # In the future, this macro may have to be called after AC_PROG_LIBTOOL.
+ 
+ 
+@@ -806,7 +810,7 @@
+ fi
+ 
+ echo $ac_n "checking host system type""... $ac_c" 1>&6
+-echo "configure:810: checking host system type" >&5
++echo "configure:814: checking host system type" >&5
+ 
+ host_alias=$host
+ case "$host_alias" in
+@@ -827,7 +831,7 @@
+ echo "$ac_t""$host" 1>&6
+ 
+ echo $ac_n "checking target system type""... $ac_c" 1>&6
+-echo "configure:831: checking target system type" >&5
++echo "configure:835: checking target system type" >&5
+ 
+ target_alias=$target
+ case "$target_alias" in
+@@ -845,7 +849,7 @@
+ echo "$ac_t""$target" 1>&6
+ 
+ echo $ac_n "checking build system type""... $ac_c" 1>&6
+-echo "configure:849: checking build system type" >&5
++echo "configure:853: checking build system type" >&5
+ 
+ build_alias=$build
+ case "$build_alias" in
+@@ -880,7 +884,7 @@
+ # SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff"
+ # ./install, which can be erroneously created by make from ./install.sh.
+ echo $ac_n "checking for a BSD compatible install""... $ac_c" 1>&6
+-echo "configure:884: checking for a BSD compatible install" >&5
++echo "configure:888: checking for a BSD compatible install" >&5
+ if test -z "$INSTALL"; then
+ if eval "test \"`echo '$''{'ac_cv_path_install'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+@@ -933,7 +937,7 @@
+ test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644'
+ 
+ echo $ac_n "checking whether build environment is sane""... $ac_c" 1>&6
+-echo "configure:937: checking whether build environment is sane" >&5
++echo "configure:941: checking whether build environment is sane" >&5
+ sleep 1
+ echo timestamp > conftestfile
+ # Do this in a subshell so we don't clobber the current shell's
+@@ -968,7 +972,7 @@
+ test "$program_transform_name" = "" && program_transform_name="s,x,x,"
+ 
+ echo $ac_n "checking whether ${MAKE-make} sets \${MAKE}""... $ac_c" 1>&6
+-echo "configure:972: checking whether ${MAKE-make} sets \${MAKE}" >&5
++echo "configure:976: checking whether ${MAKE-make} sets \${MAKE}" >&5
+ set dummy ${MAKE-make}; ac_make=`echo "$2" | sed 'y%./+-%__p_%'`
+ if eval "test \"`echo '$''{'ac_cv_prog_make_${ac_make}_set'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+@@ -1014,7 +1018,7 @@
+ 
+ missing_dir=`cd $ac_aux_dir && pwd`
+ echo $ac_n "checking for working aclocal""... $ac_c" 1>&6
+-echo "configure:1018: checking for working aclocal" >&5
++echo "configure:1022: checking for working aclocal" >&5
+ # Run test in a subshell; some versions of sh will print an error if
+ # an executable is not found, even if stderr is redirected.
+ # Redirect stdin to placate older versions of autoconf.  Sigh.
+@@ -1027,7 +1031,7 @@
+ fi
+ 
+ echo $ac_n "checking for working autoconf""... $ac_c" 1>&6
+-echo "configure:1031: checking for working autoconf" >&5
++echo "configure:1035: checking for working autoconf" >&5
+ # Run test in a subshell; some versions of sh will print an error if
+ # an executable is not found, even if stderr is redirected.
+ # Redirect stdin to placate older versions of autoconf.  Sigh.
+@@ -1040,7 +1044,7 @@
+ fi
+ 
+ echo $ac_n "checking for working automake""... $ac_c" 1>&6
+-echo "configure:1044: checking for working automake" >&5
++echo "configure:1048: checking for working automake" >&5
+ # Run test in a subshell; some versions of sh will print an error if
+ # an executable is not found, even if stderr is redirected.
+ # Redirect stdin to placate older versions of autoconf.  Sigh.
+@@ -1053,7 +1057,7 @@
+ fi
+ 
+ echo $ac_n "checking for working autoheader""... $ac_c" 1>&6
+-echo "configure:1057: checking for working autoheader" >&5
++echo "configure:1061: checking for working autoheader" >&5
+ # Run test in a subshell; some versions of sh will print an error if
+ # an executable is not found, even if stderr is redirected.
+ # Redirect stdin to placate older versions of autoconf.  Sigh.
+@@ -1066,7 +1070,7 @@
+ fi
+ 
+ echo $ac_n "checking for working makeinfo""... $ac_c" 1>&6
+-echo "configure:1070: checking for working makeinfo" >&5
++echo "configure:1074: checking for working makeinfo" >&5
+ # Run test in a subshell; some versions of sh will print an error if
+ # an executable is not found, even if stderr is redirected.
+ # Redirect stdin to placate older versions of autoconf.  Sigh.
+@@ -1168,7 +1172,7 @@
+ 
+ 
+ echo $ac_n "checking whether to enable maintainer-specific portions of Makefiles""... $ac_c" 1>&6
+-echo "configure:1172: checking whether to enable maintainer-specific portions of Makefiles" >&5
++echo "configure:1176: checking whether to enable maintainer-specific portions of Makefiles" >&5
+     # Check whether --enable-maintainer-mode or --disable-maintainer-mode was given.
+ if test "${enable_maintainer_mode+set}" = set; then
+   enableval="$enable_maintainer_mode"
+@@ -1210,7 +1214,7 @@
+ test "$program_transform_name" = "" && program_transform_name="s,x,x,"
+ 
+ echo $ac_n "checking whether build environment is sane""... $ac_c" 1>&6
+-echo "configure:1214: checking whether build environment is sane" >&5
++echo "configure:1218: checking whether build environment is sane" >&5
+ sleep 1
+ echo timestamp > conftestfile
+ # Do this in a subshell so we don't clobber the current shell's
+@@ -1227,7 +1231,7 @@
+ echo "$ac_t""yes" 1>&6
+ # This is needed is SUBDIRS is set
+ echo $ac_n "checking whether ${MAKE-make} sets \${MAKE}""... $ac_c" 1>&6
+-echo "configure:1231: checking whether ${MAKE-make} sets \${MAKE}" >&5
++echo "configure:1235: checking whether ${MAKE-make} sets \${MAKE}" >&5
+ set dummy ${MAKE-make}; ac_make=`echo "$2" | sed 'y%./+-%__p_%'`
+ if eval "test \"`echo '$''{'ac_cv_prog_make_${ac_make}_set'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+@@ -1290,12 +1294,12 @@
+ CFLAGS="$CFLAGS "
+ CXXFLAGS="$CXXFLAGS "
+ 
+-for ac_prog in gawk mawk nawk awk
++for ac_prog in mawk gawk nawk awk
+ do
+ # Extract the first word of "$ac_prog", so it can be a program name with args.
+ set dummy $ac_prog; ac_word=$2
+ echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
+-echo "configure:1299: checking for $ac_word" >&5
++echo "configure:1303: checking for $ac_word" >&5
+ if eval "test \"`echo '$''{'ac_cv_prog_AWK'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+@@ -1327,7 +1331,7 @@
+ # Extract the first word of "gcc", so it can be a program name with args.
+ set dummy gcc; ac_word=$2
+ echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
+-echo "configure:1331: checking for $ac_word" >&5
++echo "configure:1335: checking for $ac_word" >&5
+ if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+@@ -1357,7 +1361,7 @@
+   # Extract the first word of "cc", so it can be a program name with args.
+ set dummy cc; ac_word=$2
+ echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
+-echo "configure:1361: checking for $ac_word" >&5
++echo "configure:1365: checking for $ac_word" >&5
+ if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+@@ -1408,7 +1412,7 @@
+       # Extract the first word of "cl", so it can be a program name with args.
+ set dummy cl; ac_word=$2
+ echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
+-echo "configure:1412: checking for $ac_word" >&5
++echo "configure:1416: checking for $ac_word" >&5
+ if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+@@ -1440,7 +1444,7 @@
+ fi
+ 
+ echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works""... $ac_c" 1>&6
+-echo "configure:1444: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5
++echo "configure:1448: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5
+ 
+ ac_ext=c
+ # CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options.
+@@ -1451,12 +1455,12 @@
+ 
+ cat > conftest.$ac_ext << EOF
+ 
+-#line 1455 "configure"
++#line 1459 "configure"
+ #include "confdefs.h"
+ 
+ main(){return(0);}
+ EOF
+-if { (eval echo configure:1460: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:1464: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+   ac_cv_prog_cc_works=yes
+   # If we can't run a trivial program, we are probably using a cross compiler.
+   if (./conftest; exit) 2>/dev/null; then
+@@ -1482,12 +1486,12 @@
+   { echo "configure: error: installation or configuration problem: C compiler cannot create executables." 1>&2; exit 1; }
+ fi
+ echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler""... $ac_c" 1>&6
+-echo "configure:1486: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5
++echo "configure:1490: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5
+ echo "$ac_t""$ac_cv_prog_cc_cross" 1>&6
+ cross_compiling=$ac_cv_prog_cc_cross
+ 
+ echo $ac_n "checking whether we are using GNU C""... $ac_c" 1>&6
+-echo "configure:1491: checking whether we are using GNU C" >&5
++echo "configure:1495: checking whether we are using GNU C" >&5
+ if eval "test \"`echo '$''{'ac_cv_prog_gcc'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+@@ -1496,7 +1500,7 @@
+   yes;
+ #endif
+ EOF
+-if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:1500: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then
++if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:1504: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then
+   ac_cv_prog_gcc=yes
+ else
+   ac_cv_prog_gcc=no
+@@ -1515,7 +1519,7 @@
+ ac_save_CFLAGS="$CFLAGS"
+ CFLAGS=
+ echo $ac_n "checking whether ${CC-cc} accepts -g""... $ac_c" 1>&6
+-echo "configure:1519: checking whether ${CC-cc} accepts -g" >&5
++echo "configure:1523: checking whether ${CC-cc} accepts -g" >&5
+ if eval "test \"`echo '$''{'ac_cv_prog_cc_g'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+@@ -1551,7 +1555,7 @@
+ # Extract the first word of "$ac_prog", so it can be a program name with args.
+ set dummy $ac_prog; ac_word=$2
+ echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
+-echo "configure:1555: checking for $ac_word" >&5
++echo "configure:1559: checking for $ac_word" >&5
+ if eval "test \"`echo '$''{'ac_cv_prog_CXX'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+@@ -1583,7 +1587,7 @@
+ 
+ 
+ echo $ac_n "checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) works""... $ac_c" 1>&6
+-echo "configure:1587: checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) works" >&5
++echo "configure:1591: checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) works" >&5
+ 
+ ac_ext=C
+ # CXXFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options.
+@@ -1594,12 +1598,12 @@
+ 
+ cat > conftest.$ac_ext << EOF
+ 
+-#line 1598 "configure"
++#line 1602 "configure"
+ #include "confdefs.h"
+ 
+ int main(){return(0);}
+ EOF
+-if { (eval echo configure:1603: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:1607: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+   ac_cv_prog_cxx_works=yes
+   # If we can't run a trivial program, we are probably using a cross compiler.
+   if (./conftest; exit) 2>/dev/null; then
+@@ -1625,12 +1629,12 @@
+   { echo "configure: error: installation or configuration problem: C++ compiler cannot create executables." 1>&2; exit 1; }
+ fi
+ echo $ac_n "checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) is a cross-compiler""... $ac_c" 1>&6
+-echo "configure:1629: checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) is a cross-compiler" >&5
++echo "configure:1633: checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) is a cross-compiler" >&5
+ echo "$ac_t""$ac_cv_prog_cxx_cross" 1>&6
+ cross_compiling=$ac_cv_prog_cxx_cross
+ 
+ echo $ac_n "checking whether we are using GNU C++""... $ac_c" 1>&6
+-echo "configure:1634: checking whether we are using GNU C++" >&5
++echo "configure:1638: checking whether we are using GNU C++" >&5
+ if eval "test \"`echo '$''{'ac_cv_prog_gxx'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+@@ -1639,7 +1643,7 @@
+   yes;
+ #endif
+ EOF
+-if { ac_try='${CXX-g++} -E conftest.C'; { (eval echo configure:1643: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then
++if { ac_try='${CXX-g++} -E conftest.C'; { (eval echo configure:1647: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then
+   ac_cv_prog_gxx=yes
+ else
+   ac_cv_prog_gxx=no
+@@ -1658,7 +1662,7 @@
+ ac_save_CXXFLAGS="$CXXFLAGS"
+ CXXFLAGS=
+ echo $ac_n "checking whether ${CXX-g++} accepts -g""... $ac_c" 1>&6
+-echo "configure:1662: checking whether ${CXX-g++} accepts -g" >&5
++echo "configure:1666: checking whether ${CXX-g++} accepts -g" >&5
+ if eval "test \"`echo '$''{'ac_cv_prog_cxx_g'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+@@ -1690,7 +1694,7 @@
+ fi
+ 
+ echo $ac_n "checking how to run the C preprocessor""... $ac_c" 1>&6
+-echo "configure:1694: checking how to run the C preprocessor" >&5
++echo "configure:1698: checking how to run the C preprocessor" >&5
+ # On Suns, sometimes $CPP names a directory.
+ if test -n "$CPP" && test -d "$CPP"; then
+   CPP=
+@@ -1705,13 +1709,13 @@
+   # On the NeXT, cc -E runs the code through the compiler's parser,
+   # not just through cpp.
+   cat > conftest.$ac_ext <<EOF
+-#line 1709 "configure"
++#line 1713 "configure"
+ #include "confdefs.h"
+ #include <assert.h>
+ Syntax Error
+ EOF
+ ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
+-{ (eval echo configure:1715: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
++{ (eval echo configure:1719: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+ ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
+ if test -z "$ac_err"; then
+   :
+@@ -1722,13 +1726,13 @@
+   rm -rf conftest*
+   CPP="${CC-cc} -E -traditional-cpp"
+   cat > conftest.$ac_ext <<EOF
+-#line 1726 "configure"
++#line 1730 "configure"
+ #include "confdefs.h"
+ #include <assert.h>
+ Syntax Error
+ EOF
+ ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
+-{ (eval echo configure:1732: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
++{ (eval echo configure:1736: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+ ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
+ if test -z "$ac_err"; then
+   :
+@@ -1739,13 +1743,13 @@
+   rm -rf conftest*
+   CPP="${CC-cc} -nologo -E"
+   cat > conftest.$ac_ext <<EOF
+-#line 1743 "configure"
++#line 1747 "configure"
+ #include "confdefs.h"
+ #include <assert.h>
+ Syntax Error
+ EOF
+ ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
+-{ (eval echo configure:1749: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
++{ (eval echo configure:1753: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+ ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
+ if test -z "$ac_err"; then
+   :
+@@ -1777,7 +1781,7 @@
+   # Extract the first word of "as", so it can be a program name with args.
+ set dummy as; ac_word=$2
+ echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
+-echo "configure:1781: checking for $ac_word" >&5
++echo "configure:1785: checking for $ac_word" >&5
+ if eval "test \"`echo '$''{'ac_cv_path_AS'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+@@ -1815,7 +1819,7 @@
+ # Extract the first word of "ranlib", so it can be a program name with args.
+ set dummy ranlib; ac_word=$2
+ echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
+-echo "configure:1819: checking for $ac_word" >&5
++echo "configure:1823: checking for $ac_word" >&5
+ if eval "test \"`echo '$''{'ac_cv_prog_RANLIB'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+@@ -1925,7 +1929,7 @@
+ if test "$ac_cv_prog_gcc" = yes; then
+   # Check if gcc -print-prog-name=ld gives a path.
+   echo $ac_n "checking for ld used by GCC""... $ac_c" 1>&6
+-echo "configure:1929: checking for ld used by GCC" >&5
++echo "configure:1933: checking for ld used by GCC" >&5
+   ac_prog=`($CC -print-prog-name=ld) 2>&5`
+   case "$ac_prog" in
+     # Accept absolute paths.
+@@ -1949,10 +1953,10 @@
+   esac
+ elif test "$with_gnu_ld" = yes; then
+   echo $ac_n "checking for GNU ld""... $ac_c" 1>&6
+-echo "configure:1953: checking for GNU ld" >&5
++echo "configure:1957: checking for GNU ld" >&5
+ else
+   echo $ac_n "checking for non-GNU ld""... $ac_c" 1>&6
+-echo "configure:1956: checking for non-GNU ld" >&5
++echo "configure:1960: checking for non-GNU ld" >&5
+ fi
+ if eval "test \"`echo '$''{'ac_cv_path_LD'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+@@ -1987,7 +1991,7 @@
+ fi
+ test -z "$LD" && { echo "configure: error: no acceptable ld found in \$PATH" 1>&2; exit 1; }
+ echo $ac_n "checking if the linker ($LD) is GNU ld""... $ac_c" 1>&6
+-echo "configure:1991: checking if the linker ($LD) is GNU ld" >&5
++echo "configure:1995: checking if the linker ($LD) is GNU ld" >&5
+ if eval "test \"`echo '$''{'ac_cv_prog_gnu_ld'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+@@ -2003,7 +2007,7 @@
+ 
+ 
+ echo $ac_n "checking for BSD-compatible nm""... $ac_c" 1>&6
+-echo "configure:2007: checking for BSD-compatible nm" >&5
++echo "configure:2011: checking for BSD-compatible nm" >&5
+ if eval "test \"`echo '$''{'ac_cv_path_NM'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+@@ -2039,7 +2043,7 @@
+ echo "$ac_t""$NM" 1>&6
+ 
+ echo $ac_n "checking whether ln -s works""... $ac_c" 1>&6
+-echo "configure:2043: checking whether ln -s works" >&5
++echo "configure:2047: checking whether ln -s works" >&5
+ if eval "test \"`echo '$''{'ac_cv_prog_LN_S'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+@@ -2066,12 +2070,7 @@
+ esac
+ 
+ # Check for any special flags to pass to ltconfig.
+-#
+-# the following will cause an existing older ltconfig to fail, so
+-# we ignore this at the expense of the cache file... Checking this 
+-# will just take longer ... bummer!
+-#libtool_flags="--cache-file=$cache_file"
+-#
++libtool_flags="--cache-file=$cache_file"
+ test "$enable_shared" = no && libtool_flags="$libtool_flags --disable-shared"
+ test "$enable_static" = no && libtool_flags="$libtool_flags --disable-static"
+ test "$enable_fast_install" = no && libtool_flags="$libtool_flags --disable-fast-install"
+@@ -2093,8 +2092,8 @@
+ case "$lt_target" in
+ *-*-irix6*)
+   # Find out which ABI we are using.
+-  echo '#line 2097 "configure"' > conftest.$ac_ext
+-  if { (eval echo configure:2098: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
++  echo '#line 2096 "configure"' > conftest.$ac_ext
++  if { (eval echo configure:2097: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+     case "`/usr/bin/file conftest.o`" in
+     *32-bit*)
+       LD="${LD-ld} -32"
+@@ -2115,19 +2114,19 @@
+   SAVE_CFLAGS="$CFLAGS"
+   CFLAGS="$CFLAGS -belf"
+   echo $ac_n "checking whether the C compiler needs -belf""... $ac_c" 1>&6
+-echo "configure:2119: checking whether the C compiler needs -belf" >&5
++echo "configure:2118: checking whether the C compiler needs -belf" >&5
+ if eval "test \"`echo '$''{'lt_cv_cc_needs_belf'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+   cat > conftest.$ac_ext <<EOF
+-#line 2124 "configure"
++#line 2123 "configure"
+ #include "confdefs.h"
+ 
+ int main() {
+ 
+ ; return 0; }
+ EOF
+-if { (eval echo configure:2131: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:2130: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+   rm -rf conftest*
+   lt_cv_cc_needs_belf=yes
+ else
+@@ -2244,7 +2243,7 @@
+ # SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff"
+ # ./install, which can be erroneously created by make from ./install.sh.
+ echo $ac_n "checking for a BSD compatible install""... $ac_c" 1>&6
+-echo "configure:2248: checking for a BSD compatible install" >&5
++echo "configure:2247: checking for a BSD compatible install" >&5
+ if test -z "$INSTALL"; then
+ if eval "test \"`echo '$''{'ac_cv_path_install'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+@@ -2302,7 +2301,7 @@
+ # Extract the first word of "$ac_prog", so it can be a program name with args.
+ set dummy $ac_prog; ac_word=$2
+ echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
+-echo "configure:2306: checking for $ac_word" >&5
++echo "configure:2305: checking for $ac_word" >&5
+ if eval "test \"`echo '$''{'ac_cv_prog_YACC'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+@@ -2335,7 +2334,7 @@
+ # Extract the first word of "pdftex", so it can be a program name with args.
+ set dummy pdftex; ac_word=$2
+ echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
+-echo "configure:2339: checking for $ac_word" >&5
++echo "configure:2338: checking for $ac_word" >&5
+ if eval "test \"`echo '$''{'ac_cv_prog_PDFMANUAL'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+@@ -2363,14 +2362,14 @@
+ 
+ 
+ echo $ac_n "checking "return type of sprintf"""... $ac_c" 1>&6
+-echo "configure:2367: checking "return type of sprintf"" >&5
++echo "configure:2366: checking "return type of sprintf"" >&5
+ 
+ #check the return type of sprintf
+ if test "$cross_compiling" = yes; then
+     { echo "configure: error: can not run test program while cross compiling" 1>&2; exit 1; }
+ else
+   cat > conftest.$ac_ext <<EOF
+-#line 2374 "configure"
++#line 2373 "configure"
+ #include "confdefs.h"
+ 
+   int main()
+@@ -2384,7 +2383,7 @@
+      }
+    
+ EOF
+-if { (eval echo configure:2388: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
++if { (eval echo configure:2387: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+ then
+   cat >> confdefs.h <<\EOF
+ #define SPRINTF_RETURNS_INT 1
+@@ -2398,7 +2397,7 @@
+     { echo "configure: error: can not run test program while cross compiling" 1>&2; exit 1; }
+ else
+   cat > conftest.$ac_ext <<EOF
+-#line 2402 "configure"
++#line 2401 "configure"
+ #include "confdefs.h"
+ 
+  int main()
+@@ -2411,7 +2410,7 @@
+    }
+ 
+ EOF
+-if { (eval echo configure:2415: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
++if { (eval echo configure:2414: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+ then
+   cat >> confdefs.h <<\EOF
+ #define SPRINTF_RETURNS_PTR 1
+@@ -2448,7 +2447,7 @@
+ # Extract the first word of "uname", so it can be a program name with args.
+ set dummy uname; ac_word=$2
+ echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
+-echo "configure:2452: checking for $ac_word" >&5
++echo "configure:2451: checking for $ac_word" >&5
+ if eval "test \"`echo '$''{'ac_cv_path_uname_prog'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+@@ -2485,7 +2484,7 @@
+ # We should go through this and put all the explictly system dependent
+ # stuff in one place
+ echo $ac_n "checking operating system""... $ac_c" 1>&6
+-echo "configure:2489: checking operating system" >&5
++echo "configure:2488: checking operating system" >&5
+ if eval "test \"`echo '$''{'mysql_cv_sys_os'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+@@ -2510,7 +2509,7 @@
+        *-belf*) 
+          
+   echo $ac_n "checking -belf""... $ac_c" 1>&6
+-echo "configure:2514: checking -belf" >&5
++echo "configure:2513: checking -belf" >&5
+   OLD_CFLAGS="$CFLAGS"
+   if eval "test \"`echo '$''{'mysql_cv_option_sco_belf_option'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+@@ -2521,11 +2520,11 @@
+   mysql_cv_option_sco_belf_option=no
+ else
+   cat > conftest.$ac_ext <<EOF
+-#line 2525 "configure"
++#line 2524 "configure"
+ #include "confdefs.h"
+ int main(){exit(0);}
+ EOF
+-if { (eval echo configure:2529: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
++if { (eval echo configure:2528: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+ then
+   mysql_cv_option_sco_belf_option=yes
+ else
+@@ -2563,7 +2562,7 @@
+        *)
+          
+   echo $ac_n "checking -belf""... $ac_c" 1>&6
+-echo "configure:2567: checking -belf" >&5
++echo "configure:2566: checking -belf" >&5
+   OLD_CFLAGS="$CFLAGS"
+   if eval "test \"`echo '$''{'mysql_cv_option_sco_belf_option'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+@@ -2574,11 +2573,11 @@
+   mysql_cv_option_sco_belf_option=no
+ else
+   cat > conftest.$ac_ext <<EOF
+-#line 2578 "configure"
++#line 2577 "configure"
+ #include "confdefs.h"
+ int main(){exit(0);}
+ EOF
+-if { (eval echo configure:2582: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
++if { (eval echo configure:2581: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+ then
+   mysql_cv_option_sco_belf_option=yes
+ else
+@@ -2643,7 +2642,7 @@
+ 
+ # Avoid bug in fcntl on some versions of linux
+ echo $ac_n "checking "if we should use 'skip-locking' as default for $target_os"""... $ac_c" 1>&6
+-echo "configure:2647: checking "if we should use 'skip-locking' as default for $target_os"" >&5
++echo "configure:2646: checking "if we should use 'skip-locking' as default for $target_os"" >&5
+ # Any wariation of Linux
+ if expr "$target_os" : "[Ll]inux.*" > /dev/null
+ then
+@@ -2661,7 +2660,7 @@
+ # Extract the first word of "ln", so it can be a program name with args.
+ set dummy ln; ac_word=$2
+ echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
+-echo "configure:2665: checking for $ac_word" >&5
++echo "configure:2664: checking for $ac_word" >&5
+ if eval "test \"`echo '$''{'ac_cv_path_LN'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+@@ -2698,7 +2697,7 @@
+ # Extract the first word of "ln", so it can be a program name with args.
+ set dummy ln; ac_word=$2
+ echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
+-echo "configure:2702: checking for $ac_word" >&5
++echo "configure:2701: checking for $ac_word" >&5
+ if eval "test \"`echo '$''{'ac_cv_path_LN_CP_F'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+@@ -2739,7 +2738,7 @@
+ # Extract the first word of "mv", so it can be a program name with args.
+ set dummy mv; ac_word=$2
+ echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
+-echo "configure:2743: checking for $ac_word" >&5
++echo "configure:2742: checking for $ac_word" >&5
+ if eval "test \"`echo '$''{'ac_cv_path_MV'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+@@ -2775,7 +2774,7 @@
+ # Extract the first word of "rm", so it can be a program name with args.
+ set dummy rm; ac_word=$2
+ echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
+-echo "configure:2779: checking for $ac_word" >&5
++echo "configure:2778: checking for $ac_word" >&5
+ if eval "test \"`echo '$''{'ac_cv_path_RM'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+@@ -2811,7 +2810,7 @@
+ # Extract the first word of "cp", so it can be a program name with args.
+ set dummy cp; ac_word=$2
+ echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
+-echo "configure:2815: checking for $ac_word" >&5
++echo "configure:2814: checking for $ac_word" >&5
+ if eval "test \"`echo '$''{'ac_cv_path_CP'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+@@ -2847,7 +2846,7 @@
+ # Extract the first word of "sed", so it can be a program name with args.
+ set dummy sed; ac_word=$2
+ echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
+-echo "configure:2851: checking for $ac_word" >&5
++echo "configure:2850: checking for $ac_word" >&5
+ if eval "test \"`echo '$''{'ac_cv_path_SED'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+@@ -2883,7 +2882,7 @@
+ # Extract the first word of "cmp", so it can be a program name with args.
+ set dummy cmp; ac_word=$2
+ echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
+-echo "configure:2887: checking for $ac_word" >&5
++echo "configure:2886: checking for $ac_word" >&5
+ if eval "test \"`echo '$''{'ac_cv_path_CMP'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+@@ -2919,7 +2918,7 @@
+ # Extract the first word of "chmod", so it can be a program name with args.
+ set dummy chmod; ac_word=$2
+ echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
+-echo "configure:2923: checking for $ac_word" >&5
++echo "configure:2922: checking for $ac_word" >&5
+ if eval "test \"`echo '$''{'ac_cv_path_CHMOD'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+@@ -2955,7 +2954,7 @@
+ # Extract the first word of "hostname", so it can be a program name with args.
+ set dummy hostname; ac_word=$2
+ echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
+-echo "configure:2959: checking for $ac_word" >&5
++echo "configure:2958: checking for $ac_word" >&5
+ if eval "test \"`echo '$''{'ac_cv_path_HOSTNAME'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+@@ -2991,7 +2990,7 @@
+ # Extract the first word of "perl", so it can be a program name with args.
+ set dummy perl; ac_word=$2
+ echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
+-echo "configure:2995: checking for $ac_word" >&5
++echo "configure:2994: checking for $ac_word" >&5
+ if eval "test \"`echo '$''{'ac_cv_path_PERL'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+@@ -3031,7 +3030,7 @@
+   # Extract the first word of "perl5", so it can be a program name with args.
+ set dummy perl5; ac_word=$2
+ echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
+-echo "configure:3035: checking for $ac_word" >&5
++echo "configure:3034: checking for $ac_word" >&5
+ if eval "test \"`echo '$''{'ac_cv_path_PERL5'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+@@ -3079,7 +3078,7 @@
+ # Extract the first word of "ps", so it can be a program name with args.
+ set dummy ps; ac_word=$2
+ echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
+-echo "configure:3083: checking for $ac_word" >&5
++echo "configure:3082: checking for $ac_word" >&5
+ if eval "test \"`echo '$''{'ac_cv_path_PS'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+@@ -3113,7 +3112,7 @@
+ fi
+ 
+ echo $ac_n "checking "how to check if pid exists"""... $ac_c" 1>&6
+-echo "configure:3117: checking "how to check if pid exists"" >&5
++echo "configure:3116: checking "how to check if pid exists"" >&5
+ PS=$ac_cv_path_PS
+ # Linux style
+ if $PS p $$ 2> /dev/null | grep $0 > /dev/null
+@@ -3151,7 +3150,7 @@
+ # Extract the first word of "kill", so it can be a program name with args.
+ set dummy kill; ac_word=$2
+ echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
+-echo "configure:3155: checking for $ac_word" >&5
++echo "configure:3154: checking for $ac_word" >&5
+ if eval "test \"`echo '$''{'ac_cv_path_KILL'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+@@ -3185,7 +3184,7 @@
+ fi
+ 
+ echo $ac_n "checking "for kill switches"""... $ac_c" 1>&6
+-echo "configure:3189: checking "for kill switches"" >&5
++echo "configure:3188: checking "for kill switches"" >&5
+ if $ac_cv_path_KILL -0 $$
+ then
+   CHECK_PID="$ac_cv_path_KILL -0 \$\$PID > /dev/null 2> /dev/null"
+@@ -3202,7 +3201,7 @@
+ # We need a ANSI C compiler
+ 
+ echo $ac_n "checking for ${CC-cc} option to accept ANSI C""... $ac_c" 1>&6
+-echo "configure:3206: checking for ${CC-cc} option to accept ANSI C" >&5
++echo "configure:3205: checking for ${CC-cc} option to accept ANSI C" >&5
+ if eval "test \"`echo '$''{'am_cv_prog_cc_stdc'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+@@ -3219,7 +3218,7 @@
+ do
+   CC="$ac_save_CC $ac_arg"
+   cat > conftest.$ac_ext <<EOF
+-#line 3223 "configure"
++#line 3222 "configure"
+ #include "confdefs.h"
+ #if !defined(__STDC__)
+ choke me
+@@ -3237,7 +3236,7 @@
+ struct s2 {int (*f) (double a);};
+ ; return 0; }
+ EOF
+-if { (eval echo configure:3241: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
++if { (eval echo configure:3240: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+   rm -rf conftest*
+   am_cv_prog_cc_stdc="$ac_arg"; break
+ else
+@@ -3385,7 +3384,7 @@
+ fi
+ 
+ echo $ac_n "checking whether to use RAID""... $ac_c" 1>&6
+-echo "configure:3389: checking whether to use RAID" >&5
++echo "configure:3388: checking whether to use RAID" >&5
+ # Check whether --with-raid or --without-raid was given.
+ if test "${with_raid+set}" = set; then
+   withval="$with_raid"
+@@ -3462,7 +3461,7 @@
+      # Extract the first word of "${ac_tool_prefix}getconf", so it can be a program name with args.
+ set dummy ${ac_tool_prefix}getconf; ac_word=$2
+ echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
+-echo "configure:3466: checking for $ac_word" >&5
++echo "configure:3465: checking for $ac_word" >&5
+ if eval "test \"`echo '$''{'ac_cv_prog_GETCONF'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+@@ -3492,7 +3491,7 @@
+ 
+ 
+      echo $ac_n "checking for CFLAGS value to request large file support""... $ac_c" 1>&6
+-echo "configure:3496: checking for CFLAGS value to request large file support" >&5
++echo "configure:3495: checking for CFLAGS value to request large file support" >&5
+ if eval "test \"`echo '$''{'ac_cv_sys_largefile_CFLAGS'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+@@ -3518,14 +3517,14 @@
+ 	     ac_save_CC="$CC"
+ 	     CC="$CC $ac_cv_sys_largefile_CFLAGS"
+ 	     cat > conftest.$ac_ext <<EOF
+-#line 3522 "configure"
++#line 3521 "configure"
+ #include "confdefs.h"
+ 
+ int main() {
+ 
+ ; return 0; }
+ EOF
+-if { (eval echo configure:3529: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:3528: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+   :
+ else
+   echo "configure: failed program was:" >&5
+@@ -3542,7 +3541,7 @@
+ 
+ echo "$ac_t""$ac_cv_sys_largefile_CFLAGS" 1>&6
+      echo $ac_n "checking for LDFLAGS value to request large file support""... $ac_c" 1>&6
+-echo "configure:3546: checking for LDFLAGS value to request large file support" >&5
++echo "configure:3545: checking for LDFLAGS value to request large file support" >&5
+ if eval "test \"`echo '$''{'ac_cv_sys_largefile_LDFLAGS'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+@@ -3558,7 +3557,7 @@
+ 
+ echo "$ac_t""$ac_cv_sys_largefile_LDFLAGS" 1>&6
+      echo $ac_n "checking for LIBS value to request large file support""... $ac_c" 1>&6
+-echo "configure:3562: checking for LIBS value to request large file support" >&5
++echo "configure:3561: checking for LIBS value to request large file support" >&5
+ if eval "test \"`echo '$''{'ac_cv_sys_largefile_LIBS'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+@@ -3617,7 +3616,7 @@
+      esac ;;
+    esac
+      echo $ac_n "checking for _FILE_OFFSET_BITS""... $ac_c" 1>&6
+-echo "configure:3621: checking for _FILE_OFFSET_BITS" >&5
++echo "configure:3620: checking for _FILE_OFFSET_BITS" >&5
+ if eval "test \"`echo '$''{'ac_cv_sys_file_offset_bits'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+@@ -3646,7 +3645,7 @@
+ 
+    fi
+      echo $ac_n "checking for _LARGEFILE_SOURCE""... $ac_c" 1>&6
+-echo "configure:3650: checking for _LARGEFILE_SOURCE" >&5
++echo "configure:3649: checking for _LARGEFILE_SOURCE" >&5
+ if eval "test \"`echo '$''{'ac_cv_sys_largefile_source'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+@@ -3675,7 +3674,7 @@
+ 
+    fi
+      echo $ac_n "checking for _LARGE_FILES""... $ac_c" 1>&6
+-echo "configure:3679: checking for _LARGE_FILES" >&5
++echo "configure:3678: checking for _LARGE_FILES" >&5
+ if eval "test \"`echo '$''{'ac_cv_sys_large_files'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+@@ -3708,12 +3707,12 @@
+ 
+ # Types that must be checked AFTER large file support is checked
+ echo $ac_n "checking for ANSI C header files""... $ac_c" 1>&6
+-echo "configure:3712: checking for ANSI C header files" >&5
++echo "configure:3711: checking for ANSI C header files" >&5
+ if eval "test \"`echo '$''{'ac_cv_header_stdc'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+   cat > conftest.$ac_ext <<EOF
+-#line 3717 "configure"
++#line 3716 "configure"
+ #include "confdefs.h"
+ #include <stdlib.h>
+ #include <stdarg.h>
+@@ -3721,7 +3720,7 @@
+ #include <float.h>
+ EOF
+ ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
+-{ (eval echo configure:3725: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
++{ (eval echo configure:3724: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+ ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
+ if test -z "$ac_err"; then
+   rm -rf conftest*
+@@ -3738,7 +3737,7 @@
+ if test $ac_cv_header_stdc = yes; then
+   # SunOS 4.x string.h does not declare mem*, contrary to ANSI.
+ cat > conftest.$ac_ext <<EOF
+-#line 3742 "configure"
++#line 3741 "configure"
+ #include "confdefs.h"
+ #include <string.h>
+ EOF
+@@ -3756,7 +3755,7 @@
+ if test $ac_cv_header_stdc = yes; then
+   # ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI.
+ cat > conftest.$ac_ext <<EOF
+-#line 3760 "configure"
++#line 3759 "configure"
+ #include "confdefs.h"
+ #include <stdlib.h>
+ EOF
+@@ -3777,7 +3776,7 @@
+   :
+ else
+   cat > conftest.$ac_ext <<EOF
+-#line 3781 "configure"
++#line 3780 "configure"
+ #include "confdefs.h"
+ #include <ctype.h>
+ #define ISLOWER(c) ('a' <= (c) && (c) <= 'z')
+@@ -3788,7 +3787,7 @@
+ exit (0); }
+ 
+ EOF
+-if { (eval echo configure:3792: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
++if { (eval echo configure:3791: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+ then
+   :
+ else
+@@ -3812,12 +3811,12 @@
+ fi
+ 
+ echo $ac_n "checking for size_t""... $ac_c" 1>&6
+-echo "configure:3816: checking for size_t" >&5
++echo "configure:3815: checking for size_t" >&5
+ if eval "test \"`echo '$''{'ac_cv_type_size_t'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+   cat > conftest.$ac_ext <<EOF
+-#line 3821 "configure"
++#line 3820 "configure"
+ #include "confdefs.h"
+ #include <sys/types.h>
+ #if STDC_HEADERS
+@@ -3854,12 +3853,12 @@
+ do
+ ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
+ echo $ac_n "checking for $ac_hdr that defines DIR""... $ac_c" 1>&6
+-echo "configure:3858: checking for $ac_hdr that defines DIR" >&5
++echo "configure:3857: checking for $ac_hdr that defines DIR" >&5
+ if eval "test \"`echo '$''{'ac_cv_header_dirent_$ac_safe'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+   cat > conftest.$ac_ext <<EOF
+-#line 3863 "configure"
++#line 3862 "configure"
+ #include "confdefs.h"
+ #include <sys/types.h>
+ #include <$ac_hdr>
+@@ -3867,7 +3866,7 @@
+ DIR *dirp = 0;
+ ; return 0; }
+ EOF
+-if { (eval echo configure:3871: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
++if { (eval echo configure:3870: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+   rm -rf conftest*
+   eval "ac_cv_header_dirent_$ac_safe=yes"
+ else
+@@ -3892,7 +3891,7 @@
+ # Two versions of opendir et al. are in -ldir and -lx on SCO Xenix.
+ if test $ac_header_dirent = dirent.h; then
+ echo $ac_n "checking for opendir in -ldir""... $ac_c" 1>&6
+-echo "configure:3896: checking for opendir in -ldir" >&5
++echo "configure:3895: checking for opendir in -ldir" >&5
+ ac_lib_var=`echo dir'_'opendir | sed 'y%./+-%__p_%'`
+ if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+@@ -3900,7 +3899,7 @@
+   ac_save_LIBS="$LIBS"
+ LIBS="-ldir  $LIBS"
+ cat > conftest.$ac_ext <<EOF
+-#line 3904 "configure"
++#line 3903 "configure"
+ #include "confdefs.h"
+ /* Override any gcc2 internal prototype to avoid an error.  */
+ /* We use char because int might match the return type of a gcc2
+@@ -3911,7 +3910,7 @@
+ opendir()
+ ; return 0; }
+ EOF
+-if { (eval echo configure:3915: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:3914: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+   rm -rf conftest*
+   eval "ac_cv_lib_$ac_lib_var=yes"
+ else
+@@ -3933,7 +3932,7 @@
+ 
+ else
+ echo $ac_n "checking for opendir in -lx""... $ac_c" 1>&6
+-echo "configure:3937: checking for opendir in -lx" >&5
++echo "configure:3936: checking for opendir in -lx" >&5
+ ac_lib_var=`echo x'_'opendir | sed 'y%./+-%__p_%'`
+ if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+@@ -3941,7 +3940,7 @@
+   ac_save_LIBS="$LIBS"
+ LIBS="-lx  $LIBS"
+ cat > conftest.$ac_ext <<EOF
+-#line 3945 "configure"
++#line 3944 "configure"
+ #include "confdefs.h"
+ /* Override any gcc2 internal prototype to avoid an error.  */
+ /* We use char because int might match the return type of a gcc2
+@@ -3952,7 +3951,7 @@
+ opendir()
+ ; return 0; }
+ EOF
+-if { (eval echo configure:3956: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:3955: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+   rm -rf conftest*
+   eval "ac_cv_lib_$ac_lib_var=yes"
+ else
+@@ -3975,12 +3974,12 @@
+ fi
+ 
+ echo $ac_n "checking for ANSI C header files""... $ac_c" 1>&6
+-echo "configure:3979: checking for ANSI C header files" >&5
++echo "configure:3978: checking for ANSI C header files" >&5
+ if eval "test \"`echo '$''{'ac_cv_header_stdc'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+   cat > conftest.$ac_ext <<EOF
+-#line 3984 "configure"
++#line 3983 "configure"
+ #include "confdefs.h"
+ #include <stdlib.h>
+ #include <stdarg.h>
+@@ -3988,7 +3987,7 @@
+ #include <float.h>
+ EOF
+ ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
+-{ (eval echo configure:3992: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
++{ (eval echo configure:3991: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+ ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
+ if test -z "$ac_err"; then
+   rm -rf conftest*
+@@ -4005,7 +4004,7 @@
+ if test $ac_cv_header_stdc = yes; then
+   # SunOS 4.x string.h does not declare mem*, contrary to ANSI.
+ cat > conftest.$ac_ext <<EOF
+-#line 4009 "configure"
++#line 4008 "configure"
+ #include "confdefs.h"
+ #include <string.h>
+ EOF
+@@ -4023,7 +4022,7 @@
+ if test $ac_cv_header_stdc = yes; then
+   # ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI.
+ cat > conftest.$ac_ext <<EOF
+-#line 4027 "configure"
++#line 4026 "configure"
+ #include "confdefs.h"
+ #include <stdlib.h>
+ EOF
+@@ -4044,7 +4043,7 @@
+   :
+ else
+   cat > conftest.$ac_ext <<EOF
+-#line 4048 "configure"
++#line 4047 "configure"
+ #include "confdefs.h"
+ #include <ctype.h>
+ #define ISLOWER(c) ('a' <= (c) && (c) <= 'z')
+@@ -4055,7 +4054,7 @@
+ exit (0); }
+ 
+ EOF
+-if { (eval echo configure:4059: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
++if { (eval echo configure:4058: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+ then
+   :
+ else
+@@ -4079,12 +4078,12 @@
+ fi
+ 
+ echo $ac_n "checking for sys/wait.h that is POSIX.1 compatible""... $ac_c" 1>&6
+-echo "configure:4083: checking for sys/wait.h that is POSIX.1 compatible" >&5
++echo "configure:4082: checking for sys/wait.h that is POSIX.1 compatible" >&5
+ if eval "test \"`echo '$''{'ac_cv_header_sys_wait_h'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+   cat > conftest.$ac_ext <<EOF
+-#line 4088 "configure"
++#line 4087 "configure"
+ #include "confdefs.h"
+ #include <sys/types.h>
+ #include <sys/wait.h>
+@@ -4100,7 +4099,7 @@
+ s = WIFEXITED (s) ? WEXITSTATUS (s) : 1;
+ ; return 0; }
+ EOF
+-if { (eval echo configure:4104: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
++if { (eval echo configure:4103: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+   rm -rf conftest*
+   ac_cv_header_sys_wait_h=yes
+ else
+@@ -4130,17 +4129,17 @@
+ do
+ ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
+ echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
+-echo "configure:4134: checking for $ac_hdr" >&5
++echo "configure:4133: checking for $ac_hdr" >&5
+ if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+   cat > conftest.$ac_ext <<EOF
+-#line 4139 "configure"
++#line 4138 "configure"
+ #include "confdefs.h"
+ #include <$ac_hdr>
+ EOF
+ ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
+-{ (eval echo configure:4144: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
++{ (eval echo configure:4143: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+ ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
+ if test -z "$ac_err"; then
+   rm -rf conftest*
+@@ -4173,7 +4172,7 @@
+ #--------------------------------------------------------------------
+ 
+ echo $ac_n "checking for floor in -lm""... $ac_c" 1>&6
+-echo "configure:4177: checking for floor in -lm" >&5
++echo "configure:4176: checking for floor in -lm" >&5
+ ac_lib_var=`echo m'_'floor | sed 'y%./+-%__p_%'`
+ if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+@@ -4181,7 +4180,7 @@
+   ac_save_LIBS="$LIBS"
+ LIBS="-lm  $LIBS"
+ cat > conftest.$ac_ext <<EOF
+-#line 4185 "configure"
++#line 4184 "configure"
+ #include "confdefs.h"
+ /* Override any gcc2 internal prototype to avoid an error.  */
+ /* We use char because int might match the return type of a gcc2
+@@ -4192,7 +4191,7 @@
+ floor()
+ ; return 0; }
+ EOF
+-if { (eval echo configure:4196: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:4195: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+   rm -rf conftest*
+   eval "ac_cv_lib_$ac_lib_var=yes"
+ else
+@@ -4218,7 +4217,7 @@
+ else
+   echo "$ac_t""no" 1>&6
+ echo $ac_n "checking for __infinity in -lm""... $ac_c" 1>&6
+-echo "configure:4222: checking for __infinity in -lm" >&5
++echo "configure:4221: checking for __infinity in -lm" >&5
+ ac_lib_var=`echo m'_'__infinity | sed 'y%./+-%__p_%'`
+ if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+@@ -4226,7 +4225,7 @@
+   ac_save_LIBS="$LIBS"
+ LIBS="-lm  $LIBS"
+ cat > conftest.$ac_ext <<EOF
+-#line 4230 "configure"
++#line 4229 "configure"
+ #include "confdefs.h"
+ /* Override any gcc2 internal prototype to avoid an error.  */
+ /* We use char because int might match the return type of a gcc2
+@@ -4237,7 +4236,7 @@
+ __infinity()
+ ; return 0; }
+ EOF
+-if { (eval echo configure:4241: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:4240: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+   rm -rf conftest*
+   eval "ac_cv_lib_$ac_lib_var=yes"
+ else
+@@ -4267,12 +4266,12 @@
+ fi
+ 
+ echo $ac_n "checking for gethostbyname_r""... $ac_c" 1>&6
+-echo "configure:4271: checking for gethostbyname_r" >&5
++echo "configure:4270: checking for gethostbyname_r" >&5
+ if eval "test \"`echo '$''{'ac_cv_func_gethostbyname_r'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+   cat > conftest.$ac_ext <<EOF
+-#line 4276 "configure"
++#line 4275 "configure"
+ #include "confdefs.h"
+ /* System header to define __stub macros and hopefully few prototypes,
+     which can conflict with char gethostbyname_r(); below.  */
+@@ -4295,7 +4294,7 @@
+ 
+ ; return 0; }
+ EOF
+-if { (eval echo configure:4299: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:4298: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+   rm -rf conftest*
+   eval "ac_cv_func_gethostbyname_r=yes"
+ else
+@@ -4314,7 +4313,7 @@
+   echo "$ac_t""no" 1>&6
+ 
+   echo $ac_n "checking for gethostbyname_r in -lnsl_r""... $ac_c" 1>&6
+-echo "configure:4318: checking for gethostbyname_r in -lnsl_r" >&5
++echo "configure:4317: checking for gethostbyname_r in -lnsl_r" >&5
+ ac_lib_var=`echo nsl_r'_'gethostbyname_r | sed 'y%./+-%__p_%'`
+ if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+@@ -4322,7 +4321,7 @@
+   ac_save_LIBS="$LIBS"
+ LIBS="-lnsl_r  $LIBS"
+ cat > conftest.$ac_ext <<EOF
+-#line 4326 "configure"
++#line 4325 "configure"
+ #include "confdefs.h"
+ /* Override any gcc2 internal prototype to avoid an error.  */
+ /* We use char because int might match the return type of a gcc2
+@@ -4333,7 +4332,7 @@
+ gethostbyname_r()
+ ; return 0; }
+ EOF
+-if { (eval echo configure:4337: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:4336: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+   rm -rf conftest*
+   eval "ac_cv_lib_$ac_lib_var=yes"
+ else
+@@ -4359,7 +4358,7 @@
+ else
+   echo "$ac_t""no" 1>&6
+ echo $ac_n "checking for gethostbyname_r in -lnsl""... $ac_c" 1>&6
+-echo "configure:4363: checking for gethostbyname_r in -lnsl" >&5
++echo "configure:4362: checking for gethostbyname_r in -lnsl" >&5
+ ac_lib_var=`echo nsl'_'gethostbyname_r | sed 'y%./+-%__p_%'`
+ if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+@@ -4367,7 +4366,7 @@
+   ac_save_LIBS="$LIBS"
+ LIBS="-lnsl  $LIBS"
+ cat > conftest.$ac_ext <<EOF
+-#line 4371 "configure"
++#line 4370 "configure"
+ #include "confdefs.h"
+ /* Override any gcc2 internal prototype to avoid an error.  */
+ /* We use char because int might match the return type of a gcc2
+@@ -4378,7 +4377,7 @@
+ gethostbyname_r()
+ ; return 0; }
+ EOF
+-if { (eval echo configure:4382: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:4381: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+   rm -rf conftest*
+   eval "ac_cv_lib_$ac_lib_var=yes"
+ else
+@@ -4410,12 +4409,12 @@
+ fi
+ 
+ echo $ac_n "checking for setsockopt""... $ac_c" 1>&6
+-echo "configure:4414: checking for setsockopt" >&5
++echo "configure:4413: checking for setsockopt" >&5
+ if eval "test \"`echo '$''{'ac_cv_func_setsockopt'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+   cat > conftest.$ac_ext <<EOF
+-#line 4419 "configure"
++#line 4418 "configure"
+ #include "confdefs.h"
+ /* System header to define __stub macros and hopefully few prototypes,
+     which can conflict with char setsockopt(); below.  */
+@@ -4438,7 +4437,7 @@
+ 
+ ; return 0; }
+ EOF
+-if { (eval echo configure:4442: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:4441: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+   rm -rf conftest*
+   eval "ac_cv_func_setsockopt=yes"
+ else
+@@ -4456,7 +4455,7 @@
+ else
+   echo "$ac_t""no" 1>&6
+ echo $ac_n "checking for setsockopt in -lsocket""... $ac_c" 1>&6
+-echo "configure:4460: checking for setsockopt in -lsocket" >&5
++echo "configure:4459: checking for setsockopt in -lsocket" >&5
+ ac_lib_var=`echo socket'_'setsockopt | sed 'y%./+-%__p_%'`
+ if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+@@ -4464,7 +4463,7 @@
+   ac_save_LIBS="$LIBS"
+ LIBS="-lsocket  $LIBS"
+ cat > conftest.$ac_ext <<EOF
+-#line 4468 "configure"
++#line 4467 "configure"
+ #include "confdefs.h"
+ /* Override any gcc2 internal prototype to avoid an error.  */
+ /* We use char because int might match the return type of a gcc2
+@@ -4475,7 +4474,7 @@
+ setsockopt()
+ ; return 0; }
+ EOF
+-if { (eval echo configure:4479: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:4478: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+   rm -rf conftest*
+   eval "ac_cv_lib_$ac_lib_var=yes"
+ else
+@@ -4505,12 +4504,12 @@
+ fi
+ 
+ echo $ac_n "checking for yp_get_default_domain""... $ac_c" 1>&6
+-echo "configure:4509: checking for yp_get_default_domain" >&5
++echo "configure:4508: checking for yp_get_default_domain" >&5
+ if eval "test \"`echo '$''{'ac_cv_func_yp_get_default_domain'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+   cat > conftest.$ac_ext <<EOF
+-#line 4514 "configure"
++#line 4513 "configure"
+ #include "confdefs.h"
+ /* System header to define __stub macros and hopefully few prototypes,
+     which can conflict with char yp_get_default_domain(); below.  */
+@@ -4533,7 +4532,7 @@
+ 
+ ; return 0; }
+ EOF
+-if { (eval echo configure:4537: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:4536: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+   rm -rf conftest*
+   eval "ac_cv_func_yp_get_default_domain=yes"
+ else
+@@ -4551,7 +4550,7 @@
+ else
+   echo "$ac_t""no" 1>&6
+ echo $ac_n "checking for yp_get_default_domain in -lnsl""... $ac_c" 1>&6
+-echo "configure:4555: checking for yp_get_default_domain in -lnsl" >&5
++echo "configure:4554: checking for yp_get_default_domain in -lnsl" >&5
+ ac_lib_var=`echo nsl'_'yp_get_default_domain | sed 'y%./+-%__p_%'`
+ if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+@@ -4559,7 +4558,7 @@
+   ac_save_LIBS="$LIBS"
+ LIBS="-lnsl  $LIBS"
+ cat > conftest.$ac_ext <<EOF
+-#line 4563 "configure"
++#line 4562 "configure"
+ #include "confdefs.h"
+ /* Override any gcc2 internal prototype to avoid an error.  */
+ /* We use char because int might match the return type of a gcc2
+@@ -4570,7 +4569,7 @@
+ yp_get_default_domain()
+ ; return 0; }
+ EOF
+-if { (eval echo configure:4574: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:4573: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+   rm -rf conftest*
+   eval "ac_cv_lib_$ac_lib_var=yes"
+ else
+@@ -4600,12 +4599,12 @@
+ fi
+ 
+ echo $ac_n "checking for p2open""... $ac_c" 1>&6
+-echo "configure:4604: checking for p2open" >&5
++echo "configure:4603: checking for p2open" >&5
+ if eval "test \"`echo '$''{'ac_cv_func_p2open'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+   cat > conftest.$ac_ext <<EOF
+-#line 4609 "configure"
++#line 4608 "configure"
+ #include "confdefs.h"
+ /* System header to define __stub macros and hopefully few prototypes,
+     which can conflict with char p2open(); below.  */
+@@ -4628,7 +4627,7 @@
+ 
+ ; return 0; }
+ EOF
+-if { (eval echo configure:4632: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:4631: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+   rm -rf conftest*
+   eval "ac_cv_func_p2open=yes"
+ else
+@@ -4646,7 +4645,7 @@
+ else
+   echo "$ac_t""no" 1>&6
+ echo $ac_n "checking for p2open in -lgen""... $ac_c" 1>&6
+-echo "configure:4650: checking for p2open in -lgen" >&5
++echo "configure:4649: checking for p2open in -lgen" >&5
+ ac_lib_var=`echo gen'_'p2open | sed 'y%./+-%__p_%'`
+ if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+@@ -4654,7 +4653,7 @@
+   ac_save_LIBS="$LIBS"
+ LIBS="-lgen  $LIBS"
+ cat > conftest.$ac_ext <<EOF
+-#line 4658 "configure"
++#line 4657 "configure"
+ #include "confdefs.h"
+ /* Override any gcc2 internal prototype to avoid an error.  */
+ /* We use char because int might match the return type of a gcc2
+@@ -4665,7 +4664,7 @@
+ p2open()
+ ; return 0; }
+ EOF
+-if { (eval echo configure:4669: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:4668: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+   rm -rf conftest*
+   eval "ac_cv_lib_$ac_lib_var=yes"
+ else
+@@ -4696,12 +4695,12 @@
+ 
+ # This may get things to compile even if bind-8 is installed
+ echo $ac_n "checking for bind""... $ac_c" 1>&6
+-echo "configure:4700: checking for bind" >&5
++echo "configure:4699: checking for bind" >&5
+ if eval "test \"`echo '$''{'ac_cv_func_bind'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+   cat > conftest.$ac_ext <<EOF
+-#line 4705 "configure"
++#line 4704 "configure"
+ #include "confdefs.h"
+ /* System header to define __stub macros and hopefully few prototypes,
+     which can conflict with char bind(); below.  */
+@@ -4724,7 +4723,7 @@
+ 
+ ; return 0; }
+ EOF
+-if { (eval echo configure:4728: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:4727: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+   rm -rf conftest*
+   eval "ac_cv_func_bind=yes"
+ else
+@@ -4742,7 +4741,7 @@
+ else
+   echo "$ac_t""no" 1>&6
+ echo $ac_n "checking for bind in -lbind""... $ac_c" 1>&6
+-echo "configure:4746: checking for bind in -lbind" >&5
++echo "configure:4745: checking for bind in -lbind" >&5
+ ac_lib_var=`echo bind'_'bind | sed 'y%./+-%__p_%'`
+ if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+@@ -4750,7 +4749,7 @@
+   ac_save_LIBS="$LIBS"
+ LIBS="-lbind  $LIBS"
+ cat > conftest.$ac_ext <<EOF
+-#line 4754 "configure"
++#line 4753 "configure"
+ #include "confdefs.h"
+ /* Override any gcc2 internal prototype to avoid an error.  */
+ /* We use char because int might match the return type of a gcc2
+@@ -4761,7 +4760,7 @@
+ bind()
+ ; return 0; }
+ EOF
+-if { (eval echo configure:4765: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:4764: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+   rm -rf conftest*
+   eval "ac_cv_lib_$ac_lib_var=yes"
+ else
+@@ -4792,7 +4791,7 @@
+ 
+ # For crypt() on Linux
+ echo $ac_n "checking for crypt in -lcrypt""... $ac_c" 1>&6
+-echo "configure:4796: checking for crypt in -lcrypt" >&5
++echo "configure:4795: checking for crypt in -lcrypt" >&5
+ ac_lib_var=`echo crypt'_'crypt | sed 'y%./+-%__p_%'`
+ if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+@@ -4800,7 +4799,7 @@
+   ac_save_LIBS="$LIBS"
+ LIBS="-lcrypt  $LIBS"
+ cat > conftest.$ac_ext <<EOF
+-#line 4804 "configure"
++#line 4803 "configure"
+ #include "confdefs.h"
+ /* Override any gcc2 internal prototype to avoid an error.  */
+ /* We use char because int might match the return type of a gcc2
+@@ -4811,7 +4810,7 @@
+ crypt()
+ ; return 0; }
+ EOF
+-if { (eval echo configure:4815: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:4814: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+   rm -rf conftest*
+   eval "ac_cv_lib_$ac_lib_var=yes"
+ else
+@@ -4839,12 +4838,12 @@
+ fi
+ 
+ echo $ac_n "checking for crypt""... $ac_c" 1>&6
+-echo "configure:4843: checking for crypt" >&5
++echo "configure:4842: checking for crypt" >&5
+ if eval "test \"`echo '$''{'ac_cv_func_crypt'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+   cat > conftest.$ac_ext <<EOF
+-#line 4848 "configure"
++#line 4847 "configure"
+ #include "confdefs.h"
+ /* System header to define __stub macros and hopefully few prototypes,
+     which can conflict with char crypt(); below.  */
+@@ -4867,7 +4866,7 @@
+ 
+ ; return 0; }
+ EOF
+-if { (eval echo configure:4871: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:4870: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+   rm -rf conftest*
+   eval "ac_cv_func_crypt=yes"
+ else
+@@ -4895,12 +4894,12 @@
+ save_LIBS="$LIBS"
+ LIBS="-l$with_named_zlib $LIBS"
+ echo $ac_n "checking if libz with compress""... $ac_c" 1>&6
+-echo "configure:4899: checking if libz with compress" >&5
++echo "configure:4898: checking if libz with compress" >&5
+ if eval "test \"`echo '$''{'mysql_cv_compress'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+   cat > conftest.$ac_ext <<EOF
+-#line 4904 "configure"
++#line 4903 "configure"
+ #include "confdefs.h"
+ #include <zlib.h>
+ #ifdef __cplusplus
+@@ -4912,7 +4911,7 @@
+ 
+ ; return 0; }
+ EOF
+-if { (eval echo configure:4916: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:4915: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+   rm -rf conftest*
+   mysql_cv_compress=yes
+ else
+@@ -4958,17 +4957,17 @@
+     _libs=${LIBS}
+     ac_safe=`echo "tcpd.h" | sed 'y%./+-%__p_%'`
+ echo $ac_n "checking for tcpd.h""... $ac_c" 1>&6
+-echo "configure:4962: checking for tcpd.h" >&5
++echo "configure:4961: checking for tcpd.h" >&5
+ if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+   cat > conftest.$ac_ext <<EOF
+-#line 4967 "configure"
++#line 4966 "configure"
+ #include "confdefs.h"
+ #include <tcpd.h>
+ EOF
+ ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
+-{ (eval echo configure:4972: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
++{ (eval echo configure:4971: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+ ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
+ if test -z "$ac_err"; then
+   rm -rf conftest*
+@@ -4986,9 +4985,9 @@
+   echo "$ac_t""yes" 1>&6
+   LIBS="$LIBS -lwrap"
+       echo $ac_n "checking for TCP wrappers library -lwrap""... $ac_c" 1>&6
+-echo "configure:4990: checking for TCP wrappers library -lwrap" >&5
++echo "configure:4989: checking for TCP wrappers library -lwrap" >&5
+       cat > conftest.$ac_ext <<EOF
+-#line 4992 "configure"
++#line 4991 "configure"
+ #include "confdefs.h"
+ #include <tcpd.h>
+ int allow_severity = 0;
+@@ -5000,7 +4999,7 @@
+ hosts_access (req)
+ ; return 0; }
+ EOF
+-if { (eval echo configure:5004: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:5003: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+   rm -rf conftest*
+   echo "$ac_t""yes" 1>&6
+         cat >> confdefs.h <<\EOF
+@@ -5035,14 +5034,14 @@
+ 
+ if test "$IS_LINUX" = "true"; then
+   echo $ac_n "checking for atomic operations""... $ac_c" 1>&6
+-echo "configure:5039: checking for atomic operations" >&5
++echo "configure:5038: checking for atomic operations" >&5
+ 
+   atom_ops=
+   if test "$cross_compiling" = yes; then
+     { echo "configure: error: can not run test program while cross compiling" 1>&2; exit 1; }
+ else
+   cat > conftest.$ac_ext <<EOF
+-#line 5046 "configure"
++#line 5045 "configure"
+ #include "confdefs.h"
+ 
+ #include <asm/atomic.h>
+@@ -5056,7 +5055,7 @@
+ }
+   
+ EOF
+-if { (eval echo configure:5060: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
++if { (eval echo configure:5059: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+ then
+   cat >> confdefs.h <<\EOF
+ #define HAVE_ATOMIC_ADD 1
+@@ -5073,7 +5072,7 @@
+     { echo "configure: error: can not run test program while cross compiling" 1>&2; exit 1; }
+ else
+   cat > conftest.$ac_ext <<EOF
+-#line 5077 "configure"
++#line 5076 "configure"
+ #include "confdefs.h"
+ 
+ #include <asm/atomic.h>
+@@ -5087,7 +5086,7 @@
+ }
+   
+ EOF
+-if { (eval echo configure:5091: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
++if { (eval echo configure:5090: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+ then
+   cat >> confdefs.h <<\EOF
+ #define HAVE_ATOMIC_SUB 1
+@@ -5109,12 +5108,12 @@
+ if test "$ac_cv_header_termio_h" = "no" -a "$ac_cv_header_termios_h" = "no"
+ then
+   echo $ac_n "checking for gtty""... $ac_c" 1>&6
+-echo "configure:5113: checking for gtty" >&5
++echo "configure:5112: checking for gtty" >&5
+ if eval "test \"`echo '$''{'ac_cv_func_gtty'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+   cat > conftest.$ac_ext <<EOF
+-#line 5118 "configure"
++#line 5117 "configure"
+ #include "confdefs.h"
+ /* System header to define __stub macros and hopefully few prototypes,
+     which can conflict with char gtty(); below.  */
+@@ -5137,7 +5136,7 @@
+ 
+ ; return 0; }
+ EOF
+-if { (eval echo configure:5141: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:5140: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+   rm -rf conftest*
+   eval "ac_cv_func_gtty=yes"
+ else
+@@ -5155,7 +5154,7 @@
+ else
+   echo "$ac_t""no" 1>&6
+ echo $ac_n "checking for gtty in -lcompat""... $ac_c" 1>&6
+-echo "configure:5159: checking for gtty in -lcompat" >&5
++echo "configure:5158: checking for gtty in -lcompat" >&5
+ ac_lib_var=`echo compat'_'gtty | sed 'y%./+-%__p_%'`
+ if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+@@ -5163,7 +5162,7 @@
+   ac_save_LIBS="$LIBS"
+ LIBS="-lcompat  $LIBS"
+ cat > conftest.$ac_ext <<EOF
+-#line 5167 "configure"
++#line 5166 "configure"
+ #include "confdefs.h"
+ /* Override any gcc2 internal prototype to avoid an error.  */
+ /* We use char because int might match the return type of a gcc2
+@@ -5174,7 +5173,7 @@
+ gtty()
+ ; return 0; }
+ EOF
+-if { (eval echo configure:5178: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:5177: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+   rm -rf conftest*
+   eval "ac_cv_lib_$ac_lib_var=yes"
+ else
+@@ -5209,12 +5208,12 @@
+ NON_THREADED_CLIENT_LIBS="$LIBS"
+ 
+ echo $ac_n "checking for int8""... $ac_c" 1>&6
+-echo "configure:5213: checking for int8" >&5
++echo "configure:5212: checking for int8" >&5
+ if test "$cross_compiling" = yes; then
+     { echo "configure: error: can not run test program while cross compiling" 1>&2; exit 1; }
+ else
+   cat > conftest.$ac_ext <<EOF
+-#line 5218 "configure"
++#line 5217 "configure"
+ #include "confdefs.h"
+ 
+ #ifdef HAVE_STDLIB_H
+@@ -5236,7 +5235,7 @@
+ }
+ 
+ EOF
+-if { (eval echo configure:5240: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
++if { (eval echo configure:5239: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+ then
+   cat >> confdefs.h <<\EOF
+ #define HAVE_INT_8_16_32 1
+@@ -5377,7 +5376,7 @@
+ then
+   # Look for LinuxThreads.
+   echo $ac_n "checking "LinuxThreads"""... $ac_c" 1>&6
+-echo "configure:5381: checking "LinuxThreads"" >&5
++echo "configure:5380: checking "LinuxThreads"" >&5
+     res=`grep Linuxthreads /usr/include/pthread.h 2>/dev/null | wc -l`
+     if test "$res" -gt 0
+     then
+@@ -5388,14 +5387,14 @@
+ 
+       # Linux 2.0 sanity check
+       cat > conftest.$ac_ext <<EOF
+-#line 5392 "configure"
++#line 5391 "configure"
+ #include "confdefs.h"
+ #include <sched.h>
+ int main() {
+ int a = sched_get_priority_min(1);
+ ; return 0; }
+ EOF
+-if { (eval echo configure:5399: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
++if { (eval echo configure:5398: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+   :
+ else
+   echo "configure: failed program was:" >&5
+@@ -5418,7 +5417,7 @@
+ Reference Manual." 1>&2; exit 1; }
+       else
+ 	echo $ac_n "checking "DEC threads"""... $ac_c" 1>&6
+-echo "configure:5422: checking "DEC threads"" >&5
++echo "configure:5421: checking "DEC threads"" >&5
+         if test -f /usr/shlib/libpthread.so -a -f /usr/lib/libmach.a -a -f /usr/ccs/lib/cmplrs/cc/libexc.a
+ 	then
+ 	  with_named_thread="-lpthread -lmach -lexc"
+@@ -5431,7 +5430,7 @@
+ 	else
+ 	  echo "$ac_t"""no"" 1>&6
+ 	  echo $ac_n "checking "DEC 3.2 threads"""... $ac_c" 1>&6
+-echo "configure:5435: checking "DEC 3.2 threads"" >&5
++echo "configure:5434: checking "DEC 3.2 threads"" >&5
+           if test -f /usr/shlib/libpthreads.so -a -f /usr/lib/libmach.a -a -f /usr/ccs/lib/cmplrs/cc/libexc.a
+ 	  then
+ 	    with_named_thread="-lpthreads -lmach -lc_r"
+@@ -5460,7 +5459,7 @@
+ if test "$with_named_thread" = "no"
+ then
+   echo $ac_n "checking "SCO threads"""... $ac_c" 1>&6
+-echo "configure:5464: checking "SCO threads"" >&5
++echo "configure:5463: checking "SCO threads"" >&5
+   if expr "$SYSTEM_TYPE" : ".*sco.*" > /dev/null
+   then
+     if test -f /usr/lib/libgthreads.a -o -f /usr/lib/libgthreads.so
+@@ -5490,7 +5489,7 @@
+       # touch ./include/sched.h
+ 
+       echo $ac_n "checking "for gcc"""... $ac_c" 1>&6
+-echo "configure:5494: checking "for gcc"" >&5
++echo "configure:5493: checking "for gcc"" >&5
+       # We must have gcc
+       if expr "$CC" : ".*gcc.*"
+       then
+@@ -5505,7 +5504,7 @@
+     then
+       echo "$ac_t"""no"" 1>&6
+       echo $ac_n "checking "SCO UnixWare 7.1 native threads"""... $ac_c" 1>&6
+-echo "configure:5509: checking "SCO UnixWare 7.1 native threads"" >&5
++echo "configure:5508: checking "SCO UnixWare 7.1 native threads"" >&5
+       if expr "$SYSTEM_TYPE" : ".*sco.*" > /dev/null
+       then
+         if test -f /usr/lib/libthread.so -o -f /usr/lib/libthreadT.so
+@@ -5534,7 +5533,7 @@
+           echo "$ac_t"""yes"" 1>&6
+           # We must have cc
+           echo $ac_n "checking "for gcc"""... $ac_c" 1>&6
+-echo "configure:5538: checking "for gcc"" >&5
++echo "configure:5537: checking "for gcc"" >&5
+           if expr "$CC" : ".*gcc.*"
+           then
+ 	    CC="$CC -pthread -DUNIXWARE_7";
+@@ -5561,7 +5560,7 @@
+ if test "$with_named_thread" = "no"
+ then
+   echo $ac_n "checking "SCO UnixWare7 native threads"""... $ac_c" 1>&6
+-echo "configure:5565: checking "SCO UnixWare7 native threads"" >&5
++echo "configure:5564: checking "SCO UnixWare7 native threads"" >&5
+   if expr "$SYSTEM_TYPE" : ".*unixware7*" > /dev/null
+   then
+     if test -f /usr/lib/libthread.so -o -f /usr/lib/libthreadT.so
+@@ -5584,7 +5583,7 @@
+       fi
+       # We must have cc
+       echo $ac_n "checking "for gcc"""... $ac_c" 1>&6
+-echo "configure:5588: checking "for gcc"" >&5
++echo "configure:5587: checking "for gcc"" >&5
+       if expr "$CC" : ".*gcc.*"
+       then
+ 	{ echo "configure: error: On SCO UnixWare7 MySQL must be compiled with cc. See the Installation chapter in the Reference Manual." 1>&2; exit 1; };
+@@ -5605,7 +5604,7 @@
+ if test "$with_named_thread" = "no" -a "$with_mit_threads" = "no"
+ then
+   echo $ac_n "checking "Siemens threads"""... $ac_c" 1>&6
+-echo "configure:5609: checking "Siemens threads"" >&5
++echo "configure:5608: checking "Siemens threads"" >&5
+   if test -f /usr/lib/libxnet.so -a "$SYSTEM_TYPE" = "sni-sysv4"
+   then
+     LIBS="-lxnet $LIBS"
+@@ -5634,7 +5633,7 @@
+ if test "$with_named_thread" = "no" -a "$with_mit_threads" = "no"
+ then
+   echo $ac_n "checking "Solaris threads"""... $ac_c" 1>&6
+-echo "configure:5638: checking "Solaris threads"" >&5
++echo "configure:5637: checking "Solaris threads"" >&5
+   if test -f /usr/lib/libpthread.so -a -f /usr/lib/libthread.so
+   then
+     with_named_thread="-lpthread -lthread"
+@@ -5646,7 +5645,7 @@
+ 
+ # Should we use named pthread library ?
+ echo $ac_n "checking "named thread libs:"""... $ac_c" 1>&6
+-echo "configure:5650: checking "named thread libs:"" >&5
++echo "configure:5649: checking "named thread libs:"" >&5
+ if test "$with_named_thread" != "no"
+ then
+   LIBS="$LIBS $with_named_thread"
+@@ -5659,16 +5658,16 @@
+   then
+     # pthread_create is in standard libraries (As in BSDI 3.0)
+     echo $ac_n "checking "for pthread_create in -libc"""... $ac_c" 1>&6
+-echo "configure:5663: checking "for pthread_create in -libc"" >&5;
++echo "configure:5662: checking "for pthread_create in -libc"" >&5;
+     cat > conftest.$ac_ext <<EOF
+-#line 5665 "configure"
++#line 5664 "configure"
+ #include "confdefs.h"
+ #include <pthread.h>
+ int main() {
+  (void) pthread_create((pthread_t*) 0,(pthread_attr_t*) 0, 0, 0); 
+ ; return 0; }
+ EOF
+-if { (eval echo configure:5672: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:5671: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+   rm -rf conftest*
+   with_posix_threads=yes
+ else
+@@ -5682,18 +5681,18 @@
+     if test "$with_posix_threads" = "no"
+     then
+       echo $ac_n "checking "for pthread_create in -lpthread"""... $ac_c" 1>&6
+-echo "configure:5686: checking "for pthread_create in -lpthread"" >&5;
++echo "configure:5685: checking "for pthread_create in -lpthread"" >&5;
+       ac_save_LIBS="$LIBS"
+       LIBS="$LIBS -lpthread"
+       cat > conftest.$ac_ext <<EOF
+-#line 5690 "configure"
++#line 5689 "configure"
+ #include "confdefs.h"
+ #include <pthread.h>
+ int main() {
+  (void) pthread_create((pthread_t*) 0,(pthread_attr_t*) 0, 0, 0); 
+ ; return 0; }
+ EOF
+-if { (eval echo configure:5697: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:5696: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+   rm -rf conftest*
+   with_posix_threads=yes
+ else
+@@ -5708,16 +5707,16 @@
+       then
+         LIBS=" $ac_save_LIBS -lpthreads"
+         echo $ac_n "checking "for pthread_create in -lpthreads"""... $ac_c" 1>&6
+-echo "configure:5712: checking "for pthread_create in -lpthreads"" >&5;
++echo "configure:5711: checking "for pthread_create in -lpthreads"" >&5;
+         cat > conftest.$ac_ext <<EOF
+-#line 5714 "configure"
++#line 5713 "configure"
+ #include "confdefs.h"
+ #include <pthread.h>
+ int main() {
+  pthread_create((pthread_t*) 0,(pthread_attr_t*) 0, 0, 0); 
+ ; return 0; }
+ EOF
+-if { (eval echo configure:5721: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:5720: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+   rm -rf conftest*
+   with_posix_threads=yes
+ else
+@@ -5733,16 +5732,16 @@
+ 	  # This is for FreeBSD
+ 	  LIBS="$ac_save_LIBS -pthread"
+ 	  echo $ac_n "checking "for pthread_create in -pthread"""... $ac_c" 1>&6
+-echo "configure:5737: checking "for pthread_create in -pthread"" >&5;
++echo "configure:5736: checking "for pthread_create in -pthread"" >&5;
+ 	  cat > conftest.$ac_ext <<EOF
+-#line 5739 "configure"
++#line 5738 "configure"
+ #include "confdefs.h"
+ #include <pthread.h>
+ int main() {
+  pthread_create((pthread_t*) 0,(pthread_attr_t*) 0, 0, 0); 
+ ; return 0; }
+ EOF
+-if { (eval echo configure:5746: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:5745: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+   rm -rf conftest*
+   with_posix_threads=yes
+ else
+@@ -5770,7 +5769,7 @@
+ 
+ my_save_LIBS="$LIBS"
+ echo $ac_n "checking for strtok_r in -lpthread""... $ac_c" 1>&6
+-echo "configure:5774: checking for strtok_r in -lpthread" >&5
++echo "configure:5773: checking for strtok_r in -lpthread" >&5
+ ac_lib_var=`echo pthread'_'strtok_r | sed 'y%./+-%__p_%'`
+ if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+@@ -5778,7 +5777,7 @@
+   ac_save_LIBS="$LIBS"
+ LIBS="-lpthread  $LIBS"
+ cat > conftest.$ac_ext <<EOF
+-#line 5782 "configure"
++#line 5781 "configure"
+ #include "confdefs.h"
+ /* Override any gcc2 internal prototype to avoid an error.  */
+ /* We use char because int might match the return type of a gcc2
+@@ -5789,7 +5788,7 @@
+ strtok_r()
+ ; return 0; }
+ EOF
+-if { (eval echo configure:5793: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:5792: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+   rm -rf conftest*
+   eval "ac_cv_lib_$ac_lib_var=yes"
+ else
+@@ -5821,7 +5820,7 @@
+ then
+   my_save_LIBS="$LIBS"
+   echo $ac_n "checking for strtok_r in -lc_r""... $ac_c" 1>&6
+-echo "configure:5825: checking for strtok_r in -lc_r" >&5
++echo "configure:5824: checking for strtok_r in -lc_r" >&5
+ ac_lib_var=`echo c_r'_'strtok_r | sed 'y%./+-%__p_%'`
+ if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+@@ -5829,7 +5828,7 @@
+   ac_save_LIBS="$LIBS"
+ LIBS="-lc_r  $LIBS"
+ cat > conftest.$ac_ext <<EOF
+-#line 5833 "configure"
++#line 5832 "configure"
+ #include "confdefs.h"
+ /* Override any gcc2 internal prototype to avoid an error.  */
+ /* We use char because int might match the return type of a gcc2
+@@ -5840,7 +5839,7 @@
+ strtok_r()
+ ; return 0; }
+ EOF
+-if { (eval echo configure:5844: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:5843: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+   rm -rf conftest*
+   eval "ac_cv_lib_$ac_lib_var=yes"
+ else
+@@ -5874,12 +5873,12 @@
+   for ac_func in strtok_r pthread_init
+ do
+ echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
+-echo "configure:5878: checking for $ac_func" >&5
++echo "configure:5877: checking for $ac_func" >&5
+ if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+   cat > conftest.$ac_ext <<EOF
+-#line 5883 "configure"
++#line 5882 "configure"
+ #include "confdefs.h"
+ /* System header to define __stub macros and hopefully few prototypes,
+     which can conflict with char $ac_func(); below.  */
+@@ -5902,7 +5901,7 @@
+ 
+ ; return 0; }
+ EOF
+-if { (eval echo configure:5906: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:5905: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+   rm -rf conftest*
+   eval "ac_cv_func_$ac_func=yes"
+ else
+@@ -5930,12 +5929,12 @@
+   for ac_func in strtok_r
+ do
+ echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
+-echo "configure:5934: checking for $ac_func" >&5
++echo "configure:5933: checking for $ac_func" >&5
+ if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+   cat > conftest.$ac_ext <<EOF
+-#line 5939 "configure"
++#line 5938 "configure"
+ #include "confdefs.h"
+ /* System header to define __stub macros and hopefully few prototypes,
+     which can conflict with char $ac_func(); below.  */
+@@ -5958,7 +5957,7 @@
+ 
+ ; return 0; }
+ EOF
+-if { (eval echo configure:5962: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:5961: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+   rm -rf conftest*
+   eval "ac_cv_func_$ac_func=yes"
+ else
+@@ -5987,7 +5986,7 @@
+ 
+ # for user definable functions (must be checked after threads on AIX)
+ echo $ac_n "checking for dlopen in -ldl""... $ac_c" 1>&6
+-echo "configure:5991: checking for dlopen in -ldl" >&5
++echo "configure:5990: checking for dlopen in -ldl" >&5
+ ac_lib_var=`echo dl'_'dlopen | sed 'y%./+-%__p_%'`
+ if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+@@ -5995,7 +5994,7 @@
+   ac_save_LIBS="$LIBS"
+ LIBS="-ldl  $LIBS"
+ cat > conftest.$ac_ext <<EOF
+-#line 5999 "configure"
++#line 5998 "configure"
+ #include "confdefs.h"
+ /* Override any gcc2 internal prototype to avoid an error.  */
+ /* We use char because int might match the return type of a gcc2
+@@ -6006,7 +6005,7 @@
+ dlopen()
+ ; return 0; }
+ EOF
+-if { (eval echo configure:6010: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:6009: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+   rm -rf conftest*
+   eval "ac_cv_lib_$ac_lib_var=yes"
+ else
+@@ -6036,7 +6035,7 @@
+ 
+ # System characteristics
+ echo $ac_n "checking for restartable system calls""... $ac_c" 1>&6
+-echo "configure:6040: checking for restartable system calls" >&5
++echo "configure:6039: checking for restartable system calls" >&5
+ if eval "test \"`echo '$''{'ac_cv_sys_restartable_syscalls'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+@@ -6044,7 +6043,7 @@
+     { echo "configure: error: can not run test program while cross compiling" 1>&2; exit 1; }
+ else
+   cat > conftest.$ac_ext <<EOF
+-#line 6048 "configure"
++#line 6047 "configure"
+ #include "confdefs.h"
+ /* Exit 0 (true) if wait returns something other than -1,
+    i.e. the pid of the child, which means that wait was restarted
+@@ -6062,7 +6061,7 @@
+ }
+ 
+ EOF
+-if { (eval echo configure:6066: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
++if { (eval echo configure:6065: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+ then
+   ac_cv_sys_restartable_syscalls=yes
+ else
+@@ -6191,7 +6190,7 @@
+ 
+ 
+ echo $ac_n "checking "need of special linking flags"""... $ac_c" 1>&6
+-echo "configure:6195: checking "need of special linking flags"" >&5
++echo "configure:6194: checking "need of special linking flags"" >&5
+ if test "$IS_LINUX" = "true"
+ then
+   LDFLAGS="$LDFLAGS -rdynamic"
+@@ -6201,12 +6200,12 @@
+ fi
+ 
+ echo $ac_n "checking for working const""... $ac_c" 1>&6
+-echo "configure:6205: checking for working const" >&5
++echo "configure:6204: checking for working const" >&5
+ if eval "test \"`echo '$''{'ac_cv_c_const'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+   cat > conftest.$ac_ext <<EOF
+-#line 6210 "configure"
++#line 6209 "configure"
+ #include "confdefs.h"
+ 
+ int main() {
+@@ -6255,7 +6254,7 @@
+ 
+ ; return 0; }
+ EOF
+-if { (eval echo configure:6259: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
++if { (eval echo configure:6258: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+   rm -rf conftest*
+   ac_cv_c_const=yes
+ else
+@@ -6276,21 +6275,21 @@
+ fi
+ 
+ echo $ac_n "checking for inline""... $ac_c" 1>&6
+-echo "configure:6280: checking for inline" >&5
++echo "configure:6279: checking for inline" >&5
+ if eval "test \"`echo '$''{'ac_cv_c_inline'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+   ac_cv_c_inline=no
+ for ac_kw in inline __inline__ __inline; do
+   cat > conftest.$ac_ext <<EOF
+-#line 6287 "configure"
++#line 6286 "configure"
+ #include "confdefs.h"
+ 
+ int main() {
+ } $ac_kw foo() {
+ ; return 0; }
+ EOF
+-if { (eval echo configure:6294: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
++if { (eval echo configure:6293: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+   rm -rf conftest*
+   ac_cv_c_inline=$ac_kw; break
+ else
+@@ -6316,12 +6315,12 @@
+ esac
+ 
+ echo $ac_n "checking for off_t""... $ac_c" 1>&6
+-echo "configure:6320: checking for off_t" >&5
++echo "configure:6319: checking for off_t" >&5
+ if eval "test \"`echo '$''{'ac_cv_type_off_t'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+   cat > conftest.$ac_ext <<EOF
+-#line 6325 "configure"
++#line 6324 "configure"
+ #include "confdefs.h"
+ #include <sys/types.h>
+ #if STDC_HEADERS
+@@ -6349,12 +6348,12 @@
+ fi
+ 
+ echo $ac_n "checking for st_rdev in struct stat""... $ac_c" 1>&6
+-echo "configure:6353: checking for st_rdev in struct stat" >&5
++echo "configure:6352: checking for st_rdev in struct stat" >&5
+ if eval "test \"`echo '$''{'ac_cv_struct_st_rdev'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+   cat > conftest.$ac_ext <<EOF
+-#line 6358 "configure"
++#line 6357 "configure"
+ #include "confdefs.h"
+ #include <sys/types.h>
+ #include <sys/stat.h>
+@@ -6362,7 +6361,7 @@
+ struct stat s; s.st_rdev;
+ ; return 0; }
+ EOF
+-if { (eval echo configure:6366: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
++if { (eval echo configure:6365: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+   rm -rf conftest*
+   ac_cv_struct_st_rdev=yes
+ else
+@@ -6383,12 +6382,12 @@
+ fi
+ 
+ echo $ac_n "checking whether time.h and sys/time.h may both be included""... $ac_c" 1>&6
+-echo "configure:6387: checking whether time.h and sys/time.h may both be included" >&5
++echo "configure:6386: checking whether time.h and sys/time.h may both be included" >&5
+ if eval "test \"`echo '$''{'ac_cv_header_time'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+   cat > conftest.$ac_ext <<EOF
+-#line 6392 "configure"
++#line 6391 "configure"
+ #include "confdefs.h"
+ #include <sys/types.h>
+ #include <sys/time.h>
+@@ -6397,7 +6396,7 @@
+ struct tm *tp;
+ ; return 0; }
+ EOF
+-if { (eval echo configure:6401: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
++if { (eval echo configure:6400: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+   rm -rf conftest*
+   ac_cv_header_time=yes
+ else
+@@ -6418,12 +6417,12 @@
+ fi
+ 
+ echo $ac_n "checking whether struct tm is in sys/time.h or time.h""... $ac_c" 1>&6
+-echo "configure:6422: checking whether struct tm is in sys/time.h or time.h" >&5
++echo "configure:6421: checking whether struct tm is in sys/time.h or time.h" >&5
+ if eval "test \"`echo '$''{'ac_cv_struct_tm'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+   cat > conftest.$ac_ext <<EOF
+-#line 6427 "configure"
++#line 6426 "configure"
+ #include "confdefs.h"
+ #include <sys/types.h>
+ #include <time.h>
+@@ -6431,7 +6430,7 @@
+ struct tm *tp; tp->tm_sec;
+ ; return 0; }
+ EOF
+-if { (eval echo configure:6435: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
++if { (eval echo configure:6434: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+   rm -rf conftest*
+   ac_cv_struct_tm=time.h
+ else
+@@ -6454,7 +6453,7 @@
+ # AC_CHECK_SIZEOF return 0 when it does not find the size of a
+ # type. We want a error instead.
+ echo $ac_n "checking size of char""... $ac_c" 1>&6
+-echo "configure:6458: checking size of char" >&5
++echo "configure:6457: checking size of char" >&5
+ if eval "test \"`echo '$''{'ac_cv_sizeof_char'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+@@ -6462,7 +6461,7 @@
+   ac_cv_sizeof_char=1
+ else
+   cat > conftest.$ac_ext <<EOF
+-#line 6466 "configure"
++#line 6465 "configure"
+ #include "confdefs.h"
+ #include <stdio.h>
+ main()
+@@ -6473,7 +6472,7 @@
+   exit(0);
+ }
+ EOF
+-if { (eval echo configure:6477: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
++if { (eval echo configure:6476: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+ then
+   ac_cv_sizeof_char=`cat conftestval`
+ else
+@@ -6503,7 +6502,7 @@
+ 'scripts/mysqlbug' and include at least the last 20 rows from config.log!" 1>&2; exit 1; }
+ fi
+ echo $ac_n "checking size of int""... $ac_c" 1>&6
+-echo "configure:6507: checking size of int" >&5
++echo "configure:6506: checking size of int" >&5
+ if eval "test \"`echo '$''{'ac_cv_sizeof_int'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+@@ -6511,7 +6510,7 @@
+   ac_cv_sizeof_int=4
+ else
+   cat > conftest.$ac_ext <<EOF
+-#line 6515 "configure"
++#line 6514 "configure"
+ #include "confdefs.h"
+ #include <stdio.h>
+ main()
+@@ -6522,7 +6521,7 @@
+   exit(0);
+ }
+ EOF
+-if { (eval echo configure:6526: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
++if { (eval echo configure:6525: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+ then
+   ac_cv_sizeof_int=`cat conftestval`
+ else
+@@ -6546,7 +6545,7 @@
+   { echo "configure: error: "No size for int type."" 1>&2; exit 1; }
+ fi
+ echo $ac_n "checking size of long""... $ac_c" 1>&6
+-echo "configure:6550: checking size of long" >&5
++echo "configure:6549: checking size of long" >&5
+ if eval "test \"`echo '$''{'ac_cv_sizeof_long'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+@@ -6554,7 +6553,7 @@
+   ac_cv_sizeof_long=4
+ else
+   cat > conftest.$ac_ext <<EOF
+-#line 6558 "configure"
++#line 6557 "configure"
+ #include "confdefs.h"
+ #include <stdio.h>
+ main()
+@@ -6565,7 +6564,7 @@
+   exit(0);
+ }
+ EOF
+-if { (eval echo configure:6569: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
++if { (eval echo configure:6568: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+ then
+   ac_cv_sizeof_long=`cat conftestval`
+ else
+@@ -6589,7 +6588,7 @@
+   { echo "configure: error: "No size for long type."" 1>&2; exit 1; }
+ fi
+ echo $ac_n "checking size of long long""... $ac_c" 1>&6
+-echo "configure:6593: checking size of long long" >&5
++echo "configure:6592: checking size of long long" >&5
+ if eval "test \"`echo '$''{'ac_cv_sizeof_long_long'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+@@ -6597,7 +6596,7 @@
+   ac_cv_sizeof_long_long=8
+ else
+   cat > conftest.$ac_ext <<EOF
+-#line 6601 "configure"
++#line 6600 "configure"
+ #include "confdefs.h"
+ #include <stdio.h>
+ main()
+@@ -6608,7 +6607,7 @@
+   exit(0);
+ }
+ EOF
+-if { (eval echo configure:6612: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
++if { (eval echo configure:6611: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+ then
+   ac_cv_sizeof_long_long=`cat conftestval`
+ else
+@@ -6633,7 +6632,7 @@
+ fi
+ # off_t is not a builtin type
+ echo $ac_n "checking size of off_t""... $ac_c" 1>&6
+-echo "configure:6637: checking size of off_t" >&5
++echo "configure:6636: checking size of off_t" >&5
+ if eval "test \"`echo '$''{'ac_cv_sizeof_off_t'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+@@ -6641,7 +6640,7 @@
+   ac_cv_sizeof_off_t=4
+ else
+   cat > conftest.$ac_ext <<EOF
+-#line 6645 "configure"
++#line 6644 "configure"
+ #include "confdefs.h"
+ #include <stdio.h>
+ #include <sys/types.h>
+@@ -6657,7 +6656,7 @@
+   exit(0);
+ }
+ EOF
+-if { (eval echo configure:6661: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
++if { (eval echo configure:6660: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+ then
+   ac_cv_sizeof_off_t=`cat conftestval`
+ else
+@@ -6682,14 +6681,14 @@
+ fi
+ # This always gives a warning. Ignore it unless you are cross compiling
+ echo $ac_n "checking whether byte ordering is bigendian""... $ac_c" 1>&6
+-echo "configure:6686: checking whether byte ordering is bigendian" >&5
++echo "configure:6685: checking whether byte ordering is bigendian" >&5
+ if eval "test \"`echo '$''{'ac_cv_c_bigendian'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+   ac_cv_c_bigendian=unknown
+ # See if sys/param.h defines the BYTE_ORDER macro.
+ cat > conftest.$ac_ext <<EOF
+-#line 6693 "configure"
++#line 6692 "configure"
+ #include "confdefs.h"
+ #include <sys/types.h>
+ #include <sys/param.h>
+@@ -6700,11 +6699,11 @@
+ #endif
+ ; return 0; }
+ EOF
+-if { (eval echo configure:6704: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
++if { (eval echo configure:6703: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+   rm -rf conftest*
+   # It does; now see whether it defined to BIG_ENDIAN or not.
+ cat > conftest.$ac_ext <<EOF
+-#line 6708 "configure"
++#line 6707 "configure"
+ #include "confdefs.h"
+ #include <sys/types.h>
+ #include <sys/param.h>
+@@ -6715,7 +6714,7 @@
+ #endif
+ ; return 0; }
+ EOF
+-if { (eval echo configure:6719: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
++if { (eval echo configure:6718: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+   rm -rf conftest*
+   ac_cv_c_bigendian=yes
+ else
+@@ -6735,7 +6734,7 @@
+     { echo "configure: error: can not run test program while cross compiling" 1>&2; exit 1; }
+ else
+   cat > conftest.$ac_ext <<EOF
+-#line 6739 "configure"
++#line 6738 "configure"
+ #include "confdefs.h"
+ main () {
+   /* Are we little or big endian?  From Harbison&Steele.  */
+@@ -6748,7 +6747,7 @@
+   exit (u.c[sizeof (long) - 1] == 1);
+ }
+ EOF
+-if { (eval echo configure:6752: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
++if { (eval echo configure:6751: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+ then
+   ac_cv_c_bigendian=no
+ else
+@@ -6775,7 +6774,7 @@
+ # Check base type of last arg to accept
+ ac_save_CXXFLAGS="$CXXFLAGS"
+ echo $ac_n "checking base type of last arg to accept""... $ac_c" 1>&6
+-echo "configure:6779: checking base type of last arg to accept" >&5
++echo "configure:6778: checking base type of last arg to accept" >&5
+ if eval "test \"`echo '$''{'mysql_cv_btype_last_arg_accept'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+@@ -6793,7 +6792,7 @@
+ fi
+ mysql_cv_btype_last_arg_accept=none
+ cat > conftest.$ac_ext <<EOF
+-#line 6797 "configure"
++#line 6796 "configure"
+ #include "confdefs.h"
+ #if defined(inline)
+ #undef inline
+@@ -6806,7 +6805,7 @@
+ int a = accept(1, (struct sockaddr *) 0, (socklen_t *) 0); return (a != 0);
+ ; return 0; }
+ EOF
+-if { (eval echo configure:6810: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
++if { (eval echo configure:6809: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+   rm -rf conftest*
+   mysql_cv_btype_last_arg_accept=socklen_t
+ else
+@@ -6816,7 +6815,7 @@
+ rm -f conftest*
+ if test $mysql_cv_btype_last_arg_accept = none; then
+ cat > conftest.$ac_ext <<EOF
+-#line 6820 "configure"
++#line 6819 "configure"
+ #include "confdefs.h"
+ #if defined(inline)
+ #undef inline
+@@ -6829,7 +6828,7 @@
+ int a = accept(1, (struct sockaddr *) 0, (size_t *) 0); return (a != 0);
+ ; return 0; }
+ EOF
+-if { (eval echo configure:6833: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
++if { (eval echo configure:6832: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+   rm -rf conftest*
+   mysql_cv_btype_last_arg_accept=size_t
+ else
+@@ -6861,7 +6860,7 @@
+ #---END:
+ # Find where the stack goes
+ echo $ac_n "checking stack direction for C alloca""... $ac_c" 1>&6
+-echo "configure:6865: checking stack direction for C alloca" >&5
++echo "configure:6864: checking stack direction for C alloca" >&5
+ if eval "test \"`echo '$''{'ac_cv_c_stack_direction'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+@@ -6869,7 +6868,7 @@
+   ac_cv_c_stack_direction=0
+ else
+   cat > conftest.$ac_ext <<EOF
+-#line 6873 "configure"
++#line 6872 "configure"
+ #include "confdefs.h"
+ find_stack_direction ()
+  {
+@@ -6888,7 +6887,7 @@
+    exit (find_stack_direction() < 0);
+  }
+ EOF
+-if { (eval echo configure:6892: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
++if { (eval echo configure:6891: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+ then
+   ac_cv_c_stack_direction=1
+ else
+@@ -6916,19 +6915,19 @@
+   # The Ultrix 4.2 mips builtin alloca declared by alloca.h only works
+  # for constant arguments.  Useless!
+  echo $ac_n "checking for working alloca.h""... $ac_c" 1>&6
+-echo "configure:6920: checking for working alloca.h" >&5
++echo "configure:6919: checking for working alloca.h" >&5
+ if eval "test \"`echo '$''{'ac_cv_header_alloca_h'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+   cat > conftest.$ac_ext <<EOF
+-#line 6925 "configure"
++#line 6924 "configure"
+ #include "confdefs.h"
+ #include <alloca.h>
+ int main() {
+ char *p = alloca(2 * sizeof(int));
+ ; return 0; }
+ EOF
+-if { (eval echo configure:6932: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:6931: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+   rm -rf conftest*
+   ac_cv_header_alloca_h=yes
+ else
+@@ -6950,12 +6949,12 @@
+  fi
+  
+  echo $ac_n "checking for alloca""... $ac_c" 1>&6
+-echo "configure:6954: checking for alloca" >&5
++echo "configure:6953: checking for alloca" >&5
+ if eval "test \"`echo '$''{'ac_cv_func_alloca_works'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+   cat > conftest.$ac_ext <<EOF
+-#line 6959 "configure"
++#line 6958 "configure"
+ #include "confdefs.h"
+ 
+  #ifdef __GNUC__
+@@ -6978,7 +6977,7 @@
+ char *p = (char *) alloca(1);
+ ; return 0; }
+ EOF
+-if { (eval echo configure:6982: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:6981: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+   rm -rf conftest*
+   ac_cv_func_alloca_works=yes
+ else
+@@ -7010,12 +7009,12 @@
+ 
+  
+  echo $ac_n "checking whether alloca needs Cray hooks""... $ac_c" 1>&6
+-echo "configure:7014: checking whether alloca needs Cray hooks" >&5
++echo "configure:7013: checking whether alloca needs Cray hooks" >&5
+ if eval "test \"`echo '$''{'ac_cv_os_cray'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+   cat > conftest.$ac_ext <<EOF
+-#line 7019 "configure"
++#line 7018 "configure"
+ #include "confdefs.h"
+ #if defined(CRAY) && ! defined(CRAY2)
+  webecray
+@@ -7040,12 +7039,12 @@
+  if test $ac_cv_os_cray = yes; then
+  for ac_func in _getb67 GETB67 getb67; do
+    echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
+-echo "configure:7044: checking for $ac_func" >&5
++echo "configure:7043: checking for $ac_func" >&5
+ if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+   cat > conftest.$ac_ext <<EOF
+-#line 7049 "configure"
++#line 7048 "configure"
+ #include "confdefs.h"
+ /* System header to define __stub macros and hopefully few prototypes,
+     which can conflict with char $ac_func(); below.  */
+@@ -7068,7 +7067,7 @@
+ 
+ ; return 0; }
+ EOF
+-if { (eval echo configure:7072: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:7071: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+   rm -rf conftest*
+   eval "ac_cv_func_$ac_func=yes"
+ else
+@@ -7100,12 +7099,12 @@
+ 
+ # Do struct timespec have members tv_sec or ts_sec
+ echo $ac_n "checking if struct timespec has a ts_sec member""... $ac_c" 1>&6
+-echo "configure:7104: checking if struct timespec has a ts_sec member" >&5
++echo "configure:7103: checking if struct timespec has a ts_sec member" >&5
+ if eval "test \"`echo '$''{'mysql_cv_timespec_ts'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+   cat > conftest.$ac_ext <<EOF
+-#line 7109 "configure"
++#line 7108 "configure"
+ #include "confdefs.h"
+ #include <pthread.h>
+ #ifdef __cplusplus
+@@ -7120,7 +7119,7 @@
+ 
+ ; return 0; }
+ EOF
+-if { (eval echo configure:7124: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
++if { (eval echo configure:7123: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+   rm -rf conftest*
+   mysql_cv_timespec_ts=yes
+ else
+@@ -7143,12 +7142,12 @@
+ 
+ # Do we have the tzname variable
+ echo $ac_n "checking if we have tzname variable""... $ac_c" 1>&6
+-echo "configure:7147: checking if we have tzname variable" >&5
++echo "configure:7146: checking if we have tzname variable" >&5
+ if eval "test \"`echo '$''{'mysql_cv_tzname'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+   cat > conftest.$ac_ext <<EOF
+-#line 7152 "configure"
++#line 7151 "configure"
+ #include "confdefs.h"
+ #include <time.h>
+ #ifdef __cplusplus
+@@ -7161,7 +7160,7 @@
+ 
+ ; return 0; }
+ EOF
+-if { (eval echo configure:7165: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
++if { (eval echo configure:7164: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+   rm -rf conftest*
+   mysql_cv_tzname=yes
+ else
+@@ -7184,7 +7183,7 @@
+ 
+ # Do the system files define ulong
+ echo $ac_n "checking for type ulong""... $ac_c" 1>&6
+-echo "configure:7188: checking for type ulong" >&5
++echo "configure:7187: checking for type ulong" >&5
+ if eval "test \"`echo '$''{'ac_cv_ulong'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+@@ -7192,7 +7191,7 @@
+   ac_cv_ulong=no
+ else
+   cat > conftest.$ac_ext <<EOF
+-#line 7196 "configure"
++#line 7195 "configure"
+ #include "confdefs.h"
+ #include <stdio.h>
+ #include <sys/types.h>
+@@ -7203,7 +7202,7 @@
+   exit(0);
+ }
+ EOF
+-if { (eval echo configure:7207: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
++if { (eval echo configure:7206: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+ then
+   ac_cv_ulong=yes
+ else
+@@ -7228,7 +7227,7 @@
+ 
+ # Do the system files define uchar
+ echo $ac_n "checking for type uchar""... $ac_c" 1>&6
+-echo "configure:7232: checking for type uchar" >&5
++echo "configure:7231: checking for type uchar" >&5
+ if eval "test \"`echo '$''{'ac_cv_uchar'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+@@ -7236,7 +7235,7 @@
+   ac_cv_uchar=no
+ else
+   cat > conftest.$ac_ext <<EOF
+-#line 7240 "configure"
++#line 7239 "configure"
+ #include "confdefs.h"
+ #include <stdio.h>
+ #include <sys/types.h>
+@@ -7247,7 +7246,7 @@
+   exit(0);
+ }
+ EOF
+-if { (eval echo configure:7251: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
++if { (eval echo configure:7250: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+ then
+   ac_cv_uchar=yes
+ else
+@@ -7272,7 +7271,7 @@
+ 
+ # Do the system files define uint
+ echo $ac_n "checking for type uint""... $ac_c" 1>&6
+-echo "configure:7276: checking for type uint" >&5
++echo "configure:7275: checking for type uint" >&5
+ if eval "test \"`echo '$''{'ac_cv_uint'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+@@ -7280,7 +7279,7 @@
+   ac_cv_uint=no
+ else
+   cat > conftest.$ac_ext <<EOF
+-#line 7284 "configure"
++#line 7283 "configure"
+ #include "confdefs.h"
+ #include <stdio.h>
+ #include <sys/types.h>
+@@ -7291,7 +7290,7 @@
+   exit(0);
+ }
+ EOF
+-if { (eval echo configure:7295: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
++if { (eval echo configure:7294: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+ then
+   ac_cv_uint=yes
+ else
+@@ -7316,7 +7315,7 @@
+ 
+ #Check for fp_except in ieeefp.h
+ echo $ac_n "checking for type fp_except""... $ac_c" 1>&6
+-echo "configure:7320: checking for type fp_except" >&5
++echo "configure:7319: checking for type fp_except" >&5
+ if eval "test \"`echo '$''{'ac_cv_fp_except'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+@@ -7324,7 +7323,7 @@
+   ac_cv_fp_except=no
+ else
+   cat > conftest.$ac_ext <<EOF
+-#line 7328 "configure"
++#line 7327 "configure"
+ #include "confdefs.h"
+ #include <stdio.h>
+ #include <sys/types.h>
+@@ -7336,7 +7335,7 @@
+   exit(0);
+ }
+ EOF
+-if { (eval echo configure:7340: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
++if { (eval echo configure:7339: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+ then
+   ac_cv_fp_except=yes
+ else
+@@ -7363,7 +7362,7 @@
+ 
+ 
+ echo $ac_n "checking if ${CXX} supports bool types""... $ac_c" 1>&6
+-echo "configure:7367: checking if ${CXX} supports bool types" >&5
++echo "configure:7366: checking if ${CXX} supports bool types" >&5
+ if eval "test \"`echo '$''{'mysql_cv_have_bool'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+@@ -7377,14 +7376,14 @@
+ cross_compiling=$ac_cv_prog_cxx_cross
+ 
+ cat > conftest.$ac_ext <<EOF
+-#line 7381 "configure"
++#line 7380 "configure"
+ #include "confdefs.h"
+ 
+ int main() {
+ bool b = true;
+ ; return 0; }
+ EOF
+-if { (eval echo configure:7388: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
++if { (eval echo configure:7387: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+   rm -rf conftest*
+   mysql_cv_have_bool=yes
+ else
+@@ -7415,7 +7414,7 @@
+ # Check some common bugs with gcc 2.8.# on sparc
+ 
+ echo $ac_n "checking if conversion of longlong to float works""... $ac_c" 1>&6
+-echo "configure:7419: checking if conversion of longlong to float works" >&5
++echo "configure:7418: checking if conversion of longlong to float works" >&5
+ if eval "test \"`echo '$''{'ac_cv_conv_longlong_to_float'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+@@ -7423,7 +7422,7 @@
+     { echo "configure: error: can not run test program while cross compiling" 1>&2; exit 1; }
+ else
+   cat > conftest.$ac_ext <<EOF
+-#line 7427 "configure"
++#line 7426 "configure"
+ #include "confdefs.h"
+ #include <stdio.h>
+ typedef long long longlong;
+@@ -7438,7 +7437,7 @@
+   exit (0);
+ }
+ EOF
+-if { (eval echo configure:7442: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
++if { (eval echo configure:7441: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+ then
+   ac_cv_conv_longlong_to_float=`cat conftestval`
+ else
+@@ -7481,17 +7480,17 @@
+ do
+ ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
+ echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
+-echo "configure:7485: checking for $ac_hdr" >&5
++echo "configure:7484: checking for $ac_hdr" >&5
+ if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+   cat > conftest.$ac_ext <<EOF
+-#line 7490 "configure"
++#line 7489 "configure"
+ #include "confdefs.h"
+ #include <$ac_hdr>
+ EOF
+ ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
+-{ (eval echo configure:7495: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
++{ (eval echo configure:7494: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+ ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
+ if test -z "$ac_err"; then
+   rm -rf conftest*
+@@ -7522,12 +7521,12 @@
+ for ac_func in lstat putenv select setenv setlocale strcoll tcgetattr
+ do
+ echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
+-echo "configure:7526: checking for $ac_func" >&5
++echo "configure:7525: checking for $ac_func" >&5
+ if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+   cat > conftest.$ac_ext <<EOF
+-#line 7531 "configure"
++#line 7530 "configure"
+ #include "confdefs.h"
+ /* System header to define __stub macros and hopefully few prototypes,
+     which can conflict with char $ac_func(); below.  */
+@@ -7550,7 +7549,7 @@
+ 
+ ; return 0; }
+ EOF
+-if { (eval echo configure:7554: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:7553: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+   rm -rf conftest*
+   eval "ac_cv_func_$ac_func=yes"
+ else
+@@ -7576,12 +7575,12 @@
+ 
+ 
+ echo $ac_n "checking whether stat file-mode macros are broken""... $ac_c" 1>&6
+-echo "configure:7580: checking whether stat file-mode macros are broken" >&5
++echo "configure:7579: checking whether stat file-mode macros are broken" >&5
+ if eval "test \"`echo '$''{'ac_cv_header_stat_broken'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+   cat > conftest.$ac_ext <<EOF
+-#line 7585 "configure"
++#line 7584 "configure"
+ #include "confdefs.h"
+ #include <sys/types.h>
+ #include <sys/stat.h>
+@@ -7632,12 +7631,12 @@
+ fi
+ 
+ echo $ac_n "checking return type of signal handlers""... $ac_c" 1>&6
+-echo "configure:7636: checking return type of signal handlers" >&5
++echo "configure:7635: checking return type of signal handlers" >&5
+ if eval "test \"`echo '$''{'ac_cv_type_signal'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+   cat > conftest.$ac_ext <<EOF
+-#line 7641 "configure"
++#line 7640 "configure"
+ #include "confdefs.h"
+ #include <sys/types.h>
+ #include <signal.h>
+@@ -7654,7 +7653,7 @@
+ int i;
+ ; return 0; }
+ EOF
+-if { (eval echo configure:7658: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
++if { (eval echo configure:7657: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+   rm -rf conftest*
+   ac_cv_type_signal=void
+ else
+@@ -7674,13 +7673,13 @@
+ 
+ 
+ echo $ac_n "checking for type of signal functions""... $ac_c" 1>&6
+-echo "configure:7678: checking for type of signal functions" >&5
++echo "configure:7677: checking for type of signal functions" >&5
+ if eval "test \"`echo '$''{'mysql_cv_signal_vintage'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+   
+   cat > conftest.$ac_ext <<EOF
+-#line 7684 "configure"
++#line 7683 "configure"
+ #include "confdefs.h"
+ #include <signal.h>
+ int main() {
+@@ -7693,7 +7692,7 @@
+   
+ ; return 0; }
+ EOF
+-if { (eval echo configure:7697: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:7696: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+   rm -rf conftest*
+   mysql_cv_signal_vintage=posix
+ else
+@@ -7702,7 +7701,7 @@
+   rm -rf conftest*
+   
+     cat > conftest.$ac_ext <<EOF
+-#line 7706 "configure"
++#line 7705 "configure"
+ #include "confdefs.h"
+ #include <signal.h>
+ int main() {
+@@ -7712,7 +7711,7 @@
+     
+ ; return 0; }
+ EOF
+-if { (eval echo configure:7716: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:7715: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+   rm -rf conftest*
+   mysql_cv_signal_vintage=4.2bsd
+ else
+@@ -7721,7 +7720,7 @@
+   rm -rf conftest*
+   
+       cat > conftest.$ac_ext <<EOF
+-#line 7725 "configure"
++#line 7724 "configure"
+ #include "confdefs.h"
+ 
+ 	#include <signal.h>
+@@ -7734,7 +7733,7 @@
+         
+ ; return 0; }
+ EOF
+-if { (eval echo configure:7738: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:7737: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+   rm -rf conftest*
+   mysql_cv_signal_vintage=svr3
+ else
+@@ -7773,12 +7772,12 @@
+ fi
+ 
+ echo $ac_n "checking whether programs are able to redeclare getpw functions""... $ac_c" 1>&6
+-echo "configure:7777: checking whether programs are able to redeclare getpw functions" >&5
++echo "configure:7776: checking whether programs are able to redeclare getpw functions" >&5
+ if eval "test \"`echo '$''{'mysql_cv_can_redecl_getpw'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+   cat > conftest.$ac_ext <<EOF
+-#line 7782 "configure"
++#line 7781 "configure"
+ #include "confdefs.h"
+ #include <sys/types.h>
+ #include <pwd.h>
+@@ -7787,7 +7786,7 @@
+ struct passwd *z; z = getpwent();
+ ; return 0; }
+ EOF
+-if { (eval echo configure:7791: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
++if { (eval echo configure:7790: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+   rm -rf conftest*
+   mysql_cv_can_redecl_getpw=yes
+ else
+@@ -7808,12 +7807,12 @@
+ fi
+ 
+ echo $ac_n "checking for TIOCGWINSZ in sys/ioctl.h""... $ac_c" 1>&6
+-echo "configure:7812: checking for TIOCGWINSZ in sys/ioctl.h" >&5
++echo "configure:7811: checking for TIOCGWINSZ in sys/ioctl.h" >&5
+ if eval "test \"`echo '$''{'mysql_cv_tiocgwinsz_in_ioctl'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+   cat > conftest.$ac_ext <<EOF
+-#line 7817 "configure"
++#line 7816 "configure"
+ #include "confdefs.h"
+ #include <sys/types.h>
+ #include <sys/ioctl.h>
+@@ -7821,7 +7820,7 @@
+ int x = TIOCGWINSZ;
+ ; return 0; }
+ EOF
+-if { (eval echo configure:7825: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
++if { (eval echo configure:7824: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+   rm -rf conftest*
+   mysql_cv_tiocgwinsz_in_ioctl=yes
+ else
+@@ -7842,12 +7841,12 @@
+ fi
+ 
+ echo $ac_n "checking for FIONREAD in sys/ioctl.h""... $ac_c" 1>&6
+-echo "configure:7846: checking for FIONREAD in sys/ioctl.h" >&5
++echo "configure:7845: checking for FIONREAD in sys/ioctl.h" >&5
+ if eval "test \"`echo '$''{'mysql_cv_fionread_in_ioctl'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+   cat > conftest.$ac_ext <<EOF
+-#line 7851 "configure"
++#line 7850 "configure"
+ #include "confdefs.h"
+ #include <sys/types.h>
+ #include <sys/ioctl.h>
+@@ -7855,7 +7854,7 @@
+ int x = FIONREAD;
+ ; return 0; }
+ EOF
+-if { (eval echo configure:7859: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
++if { (eval echo configure:7858: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+   rm -rf conftest*
+   mysql_cv_fionread_in_ioctl=yes
+ else
+@@ -7876,12 +7875,12 @@
+ fi
+ 
+ echo $ac_n "checking for TIOCSTAT in sys/ioctl.h""... $ac_c" 1>&6
+-echo "configure:7880: checking for TIOCSTAT in sys/ioctl.h" >&5
++echo "configure:7879: checking for TIOCSTAT in sys/ioctl.h" >&5
+ if eval "test \"`echo '$''{'mysql_cv_tiocstat_in_ioctl'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+   cat > conftest.$ac_ext <<EOF
+-#line 7885 "configure"
++#line 7884 "configure"
+ #include "confdefs.h"
+ #include <sys/types.h>
+ #include <sys/ioctl.h>
+@@ -7889,7 +7888,7 @@
+ int x = TIOCSTAT;
+ ; return 0; }
+ EOF
+-if { (eval echo configure:7893: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
++if { (eval echo configure:7892: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+   rm -rf conftest*
+   mysql_cv_tiocstat_in_ioctl=yes
+ else
+@@ -7911,12 +7910,12 @@
+ 
+ 
+ echo $ac_n "checking if struct dirent has a d_ino member""... $ac_c" 1>&6
+-echo "configure:7915: checking if struct dirent has a d_ino member" >&5
++echo "configure:7914: checking if struct dirent has a d_ino member" >&5
+ if eval "test \"`echo '$''{'mysql_cv_dirent_has_dino'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+   cat > conftest.$ac_ext <<EOF
+-#line 7920 "configure"
++#line 7919 "configure"
+ #include "confdefs.h"
+ 
+ #include <stdio.h>
+@@ -7945,7 +7944,7 @@
+ 
+ ; return 0; }
+ EOF
+-if { (eval echo configure:7949: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
++if { (eval echo configure:7948: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+   rm -rf conftest*
+   mysql_cv_dirent_has_dino=yes
+ else
+@@ -7966,12 +7965,12 @@
+ fi
+ 
+ echo $ac_n "checking whether signal handlers are of type void""... $ac_c" 1>&6
+-echo "configure:7970: checking whether signal handlers are of type void" >&5
++echo "configure:7969: checking whether signal handlers are of type void" >&5
+ if eval "test \"`echo '$''{'mysql_cv_void_sighandler'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+   cat > conftest.$ac_ext <<EOF
+-#line 7975 "configure"
++#line 7974 "configure"
+ #include "confdefs.h"
+ #include <sys/types.h>
+ #include <signal.h>
+@@ -7986,7 +7985,7 @@
+ int i;
+ ; return 0; }
+ EOF
+-if { (eval echo configure:7990: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
++if { (eval echo configure:7989: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+   rm -rf conftest*
+   mysql_cv_void_sighandler=yes
+ else
+@@ -8012,7 +8011,7 @@
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+   echo $ac_n "checking for tgetent in -lncurses""... $ac_c" 1>&6
+-echo "configure:8016: checking for tgetent in -lncurses" >&5
++echo "configure:8015: checking for tgetent in -lncurses" >&5
+ ac_lib_var=`echo ncurses'_'tgetent | sed 'y%./+-%__p_%'`
+ if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+@@ -8020,7 +8019,7 @@
+   ac_save_LIBS="$LIBS"
+ LIBS="-lncurses  $LIBS"
+ cat > conftest.$ac_ext <<EOF
+-#line 8024 "configure"
++#line 8023 "configure"
+ #include "confdefs.h"
+ /* Override any gcc2 internal prototype to avoid an error.  */
+ /* We use char because int might match the return type of a gcc2
+@@ -8031,7 +8030,7 @@
+ tgetent()
+ ; return 0; }
+ EOF
+-if { (eval echo configure:8035: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:8034: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+   rm -rf conftest*
+   eval "ac_cv_lib_$ac_lib_var=yes"
+ else
+@@ -8050,7 +8049,7 @@
+ else
+   echo "$ac_t""no" 1>&6
+ echo $ac_n "checking for tgetent in -lcurses""... $ac_c" 1>&6
+-echo "configure:8054: checking for tgetent in -lcurses" >&5
++echo "configure:8053: checking for tgetent in -lcurses" >&5
+ ac_lib_var=`echo curses'_'tgetent | sed 'y%./+-%__p_%'`
+ if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+@@ -8058,7 +8057,7 @@
+   ac_save_LIBS="$LIBS"
+ LIBS="-lcurses  $LIBS"
+ cat > conftest.$ac_ext <<EOF
+-#line 8062 "configure"
++#line 8061 "configure"
+ #include "confdefs.h"
+ /* Override any gcc2 internal prototype to avoid an error.  */
+ /* We use char because int might match the return type of a gcc2
+@@ -8069,7 +8068,7 @@
+ tgetent()
+ ; return 0; }
+ EOF
+-if { (eval echo configure:8073: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:8072: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+   rm -rf conftest*
+   eval "ac_cv_lib_$ac_lib_var=yes"
+ else
+@@ -8088,7 +8087,7 @@
+ else
+   echo "$ac_t""no" 1>&6
+ echo $ac_n "checking for tgetent in -ltermcap""... $ac_c" 1>&6
+-echo "configure:8092: checking for tgetent in -ltermcap" >&5
++echo "configure:8091: checking for tgetent in -ltermcap" >&5
+ ac_lib_var=`echo termcap'_'tgetent | sed 'y%./+-%__p_%'`
+ if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+@@ -8096,7 +8095,7 @@
+   ac_save_LIBS="$LIBS"
+ LIBS="-ltermcap  $LIBS"
+ cat > conftest.$ac_ext <<EOF
+-#line 8100 "configure"
++#line 8099 "configure"
+ #include "confdefs.h"
+ /* Override any gcc2 internal prototype to avoid an error.  */
+ /* We use char because int might match the return type of a gcc2
+@@ -8107,7 +8106,7 @@
+ tgetent()
+ ; return 0; }
+ EOF
+-if { (eval echo configure:8111: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:8110: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+   rm -rf conftest*
+   eval "ac_cv_lib_$ac_lib_var=yes"
+ else
+@@ -8135,7 +8134,7 @@
+ fi
+ 
+ echo $ac_n "checking for termcap functions library""... $ac_c" 1>&6
+-echo "configure:8139: checking for termcap functions library" >&5
++echo "configure:8138: checking for termcap functions library" >&5
+ if test $mysql_cv_termcap_lib = NOT_FOUND; then
+ { echo "configure: error: No curses/termcap library found" 1>&2; exit 1; }
+ elif test $mysql_cv_termcap_lib = libtermcap; then
+@@ -8159,17 +8158,17 @@
+ do
+ ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
+ echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
+-echo "configure:8163: checking for $ac_hdr" >&5
++echo "configure:8162: checking for $ac_hdr" >&5
+ if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+   cat > conftest.$ac_ext <<EOF
+-#line 8168 "configure"
++#line 8167 "configure"
+ #include "confdefs.h"
+ #include <$ac_hdr>
+ EOF
+ ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
+-{ (eval echo configure:8173: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
++{ (eval echo configure:8172: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+ ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
+ if test -z "$ac_err"; then
+   rm -rf conftest*
+@@ -8198,12 +8197,12 @@
+ for ac_func in getpagesize
+ do
+ echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
+-echo "configure:8202: checking for $ac_func" >&5
++echo "configure:8201: checking for $ac_func" >&5
+ if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+   cat > conftest.$ac_ext <<EOF
+-#line 8207 "configure"
++#line 8206 "configure"
+ #include "confdefs.h"
+ /* System header to define __stub macros and hopefully few prototypes,
+     which can conflict with char $ac_func(); below.  */
+@@ -8226,7 +8225,7 @@
+ 
+ ; return 0; }
+ EOF
+-if { (eval echo configure:8230: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:8229: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+   rm -rf conftest*
+   eval "ac_cv_func_$ac_func=yes"
+ else
+@@ -8251,7 +8250,7 @@
+ done
+ 
+ echo $ac_n "checking for working mmap""... $ac_c" 1>&6
+-echo "configure:8255: checking for working mmap" >&5
++echo "configure:8254: checking for working mmap" >&5
+ if eval "test \"`echo '$''{'ac_cv_func_mmap_fixed_mapped'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+@@ -8259,7 +8258,7 @@
+   ac_cv_func_mmap_fixed_mapped=no
+ else
+   cat > conftest.$ac_ext <<EOF
+-#line 8263 "configure"
++#line 8262 "configure"
+ #include "confdefs.h"
+ 
+ /* Thanks to Mike Haertel and Jim Avera for this test.
+@@ -8399,7 +8398,7 @@
+ }
+ 
+ EOF
+-if { (eval echo configure:8403: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
++if { (eval echo configure:8402: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+ then
+   ac_cv_func_mmap_fixed_mapped=yes
+ else
+@@ -8422,12 +8421,12 @@
+ fi
+ 
+ echo $ac_n "checking return type of signal handlers""... $ac_c" 1>&6
+-echo "configure:8426: checking return type of signal handlers" >&5
++echo "configure:8425: checking return type of signal handlers" >&5
+ if eval "test \"`echo '$''{'ac_cv_type_signal'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+   cat > conftest.$ac_ext <<EOF
+-#line 8431 "configure"
++#line 8430 "configure"
+ #include "confdefs.h"
+ #include <sys/types.h>
+ #include <signal.h>
+@@ -8444,7 +8443,7 @@
+ int i;
+ ; return 0; }
+ EOF
+-if { (eval echo configure:8448: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
++if { (eval echo configure:8447: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+   rm -rf conftest*
+   ac_cv_type_signal=void
+ else
+@@ -8463,12 +8462,12 @@
+ 
+ 
+ echo $ac_n "checking return type of qsort""... $ac_c" 1>&6
+-echo "configure:8467: checking return type of qsort" >&5
++echo "configure:8466: checking return type of qsort" >&5
+ if eval "test \"`echo '$''{'mysql_cv_type_qsort'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+   cat > conftest.$ac_ext <<EOF
+-#line 8472 "configure"
++#line 8471 "configure"
+ #include "confdefs.h"
+ #include <stdlib.h>
+ #ifdef __cplusplus
+@@ -8481,7 +8480,7 @@
+ int i;
+ ; return 0; }
+ EOF
+-if { (eval echo configure:8485: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
++if { (eval echo configure:8484: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+   rm -rf conftest*
+   mysql_cv_type_qsort=void
+ else
+@@ -8507,7 +8506,7 @@
+ fi
+ 
+ echo $ac_n "checking whether utime accepts a null argument""... $ac_c" 1>&6
+-echo "configure:8511: checking whether utime accepts a null argument" >&5
++echo "configure:8510: checking whether utime accepts a null argument" >&5
+ if eval "test \"`echo '$''{'ac_cv_func_utime_null'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+@@ -8517,7 +8516,7 @@
+   ac_cv_func_utime_null=no
+ else
+   cat > conftest.$ac_ext <<EOF
+-#line 8521 "configure"
++#line 8520 "configure"
+ #include "confdefs.h"
+ #include <sys/types.h>
+ #include <sys/stat.h>
+@@ -8528,7 +8527,7 @@
+ && t.st_mtime - s.st_mtime < 120));
+ }
+ EOF
+-if { (eval echo configure:8532: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
++if { (eval echo configure:8531: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+ then
+   ac_cv_func_utime_null=yes
+ else
+@@ -8552,12 +8551,12 @@
+ fi
+ 
+ echo $ac_n "checking for vprintf""... $ac_c" 1>&6
+-echo "configure:8556: checking for vprintf" >&5
++echo "configure:8555: checking for vprintf" >&5
+ if eval "test \"`echo '$''{'ac_cv_func_vprintf'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+   cat > conftest.$ac_ext <<EOF
+-#line 8561 "configure"
++#line 8560 "configure"
+ #include "confdefs.h"
+ /* System header to define __stub macros and hopefully few prototypes,
+     which can conflict with char vprintf(); below.  */
+@@ -8580,7 +8579,7 @@
+ 
+ ; return 0; }
+ EOF
+-if { (eval echo configure:8584: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:8583: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+   rm -rf conftest*
+   eval "ac_cv_func_vprintf=yes"
+ else
+@@ -8604,12 +8603,12 @@
+ 
+ if test "$ac_cv_func_vprintf" != yes; then
+ echo $ac_n "checking for _doprnt""... $ac_c" 1>&6
+-echo "configure:8608: checking for _doprnt" >&5
++echo "configure:8607: checking for _doprnt" >&5
+ if eval "test \"`echo '$''{'ac_cv_func__doprnt'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+   cat > conftest.$ac_ext <<EOF
+-#line 8613 "configure"
++#line 8612 "configure"
+ #include "confdefs.h"
+ /* System header to define __stub macros and hopefully few prototypes,
+     which can conflict with char _doprnt(); below.  */
+@@ -8632,7 +8631,7 @@
+ 
+ ; return 0; }
+ EOF
+-if { (eval echo configure:8636: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:8635: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+   rm -rf conftest*
+   eval "ac_cv_func__doprnt=yes"
+ else
+@@ -8674,12 +8673,12 @@
+  dlopen dlerror fchmod getpass getpassphrase initgroups mlockall
+ do
+ echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
+-echo "configure:8678: checking for $ac_func" >&5
++echo "configure:8677: checking for $ac_func" >&5
+ if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+   cat > conftest.$ac_ext <<EOF
+-#line 8683 "configure"
++#line 8682 "configure"
+ #include "confdefs.h"
+ /* System header to define __stub macros and hopefully few prototypes,
+     which can conflict with char $ac_func(); below.  */
+@@ -8702,7 +8701,7 @@
+ 
+ ; return 0; }
+ EOF
+-if { (eval echo configure:8706: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:8705: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+   rm -rf conftest*
+   eval "ac_cv_func_$ac_func=yes"
+ else
+@@ -8732,12 +8731,12 @@
+ for ac_func in fseeko
+ do
+ echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
+-echo "configure:8736: checking for $ac_func" >&5
++echo "configure:8735: checking for $ac_func" >&5
+ if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+   cat > conftest.$ac_ext <<EOF
+-#line 8741 "configure"
++#line 8740 "configure"
+ #include "confdefs.h"
+ /* System header to define __stub macros and hopefully few prototypes,
+     which can conflict with char $ac_func(); below.  */
+@@ -8760,7 +8759,7 @@
+ 
+ ; return 0; }
+ EOF
+-if { (eval echo configure:8764: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:8763: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+   rm -rf conftest*
+   eval "ac_cv_func_$ac_func=yes"
+ else
+@@ -8792,7 +8791,7 @@
+ # Check definition of gethostbyaddr_r (glibc2 defines this with 8 arguments)
+ ac_save_CXXFLAGS="$CXXFLAGS"
+ echo $ac_n "checking style of gethost* routines""... $ac_c" 1>&6
+-echo "configure:8796: checking style of gethost* routines" >&5
++echo "configure:8795: checking style of gethost* routines" >&5
+ if eval "test \"`echo '$''{'mysql_cv_gethost_style'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+@@ -8809,7 +8808,7 @@
+   CXXFLAGS="$CXXFLAGS -Werror"
+ fi
+ cat > conftest.$ac_ext <<EOF
+-#line 8813 "configure"
++#line 8812 "configure"
+ #include "confdefs.h"
+ #if !defined(SCO) && !defined(__osf__)
+ #define _REENTRANT
+@@ -8826,7 +8825,7 @@
+   0, 0, (struct hostent *) 0, (char *) NULL,  0, &skr); return (foo == 0);
+ ; return 0; }
+ EOF
+-if { (eval echo configure:8830: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
++if { (eval echo configure:8829: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+   rm -rf conftest*
+   mysql_cv_gethost_style=solaris
+ else
+@@ -8860,7 +8859,7 @@
+ # Check definition of gethostbyname_r (glibc2.0.100 is different from Solaris)
+ ac_save_CXXFLAGS="$CXXFLAGS"
+ echo $ac_n "checking style of gethostname_r routines""... $ac_c" 1>&6
+-echo "configure:8864: checking style of gethostname_r routines" >&5
++echo "configure:8863: checking style of gethostname_r routines" >&5
+ if eval "test \"`echo '$''{'mysql_cv_gethostname_style'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+@@ -8877,7 +8876,7 @@
+   CXXFLAGS="$CXXFLAGS -Werror"
+ fi
+ cat > conftest.$ac_ext <<EOF
+-#line 8881 "configure"
++#line 8880 "configure"
+ #include "confdefs.h"
+ #if !defined(SCO) && !defined(__osf__)
+ #define _REENTRANT
+@@ -8895,7 +8894,7 @@
+   (struct hostent*) 0, (char*) 0, 0, (struct hostent **) 0, &skr);
+ ; return 0; }
+ EOF
+-if { (eval echo configure:8899: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
++if { (eval echo configure:8898: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+   rm -rf conftest*
+   mysql_cv_gethostname_style=glibc2
+ else
+@@ -8927,7 +8926,7 @@
+ # Check 3rd argument of getthostbyname_r
+ ac_save_CXXFLAGS="$CXXFLAGS"
+ echo $ac_n "checking 3 argument to gethostname_r routines""... $ac_c" 1>&6
+-echo "configure:8931: checking 3 argument to gethostname_r routines" >&5
++echo "configure:8930: checking 3 argument to gethostname_r routines" >&5
+ if eval "test \"`echo '$''{'mysql_cv_gethostname_arg'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+@@ -8944,7 +8943,7 @@
+   CXXFLAGS="$CXXFLAGS -Werror"
+ fi
+ cat > conftest.$ac_ext <<EOF
+-#line 8948 "configure"
++#line 8947 "configure"
+ #include "confdefs.h"
+ #if !defined(SCO) && !defined(__osf__)
+ #define _REENTRANT
+@@ -8961,7 +8960,7 @@
+  skr = gethostbyname_r((const char *) 0, (struct hostent*) 0, (hostent_data*) 0);
+ ; return 0; }
+ EOF
+-if { (eval echo configure:8965: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
++if { (eval echo configure:8964: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+   rm -rf conftest*
+   mysql_cv_gethostname_arg=hostent_data
+ else
+@@ -8995,12 +8994,12 @@
+ then
+   # Check definition of pthread_getspecific
+   echo $ac_n "checking "args to pthread_getspecific"""... $ac_c" 1>&6
+-echo "configure:8999: checking "args to pthread_getspecific"" >&5
++echo "configure:8998: checking "args to pthread_getspecific"" >&5
+ if eval "test \"`echo '$''{'mysql_cv_getspecific_args'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+   cat > conftest.$ac_ext <<EOF
+-#line 9004 "configure"
++#line 9003 "configure"
+ #include "confdefs.h"
+ #if !defined(SCO) && !defined(__osf__)
+ #define _REENTRANT
+@@ -9012,7 +9011,7 @@
+ pthread_getspecific((pthread_key_t) NULL); 
+ ; return 0; }
+ EOF
+-if { (eval echo configure:9016: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
++if { (eval echo configure:9015: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+   rm -rf conftest*
+   mysql_cv_getspecific_args=POSIX
+ else
+@@ -9035,12 +9034,12 @@
+ 
+   # Check definition of pthread_mutex_init
+   echo $ac_n "checking "args to pthread_mutex_init"""... $ac_c" 1>&6
+-echo "configure:9039: checking "args to pthread_mutex_init"" >&5
++echo "configure:9038: checking "args to pthread_mutex_init"" >&5
+ if eval "test \"`echo '$''{'mysql_cv_mutex_init_args'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+   cat > conftest.$ac_ext <<EOF
+-#line 9044 "configure"
++#line 9043 "configure"
+ #include "confdefs.h"
+ #if !defined(SCO) && !defined(__osf__)
+ #define _REENTRANT
+@@ -9054,7 +9053,7 @@
+   pthread_mutex_init(&mp,&attr); 
+ ; return 0; }
+ EOF
+-if { (eval echo configure:9058: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
++if { (eval echo configure:9057: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+   rm -rf conftest*
+   mysql_cv_mutex_init_args=POSIX
+ else
+@@ -9080,12 +9079,12 @@
+ #---START: Used in for client configure
+ # Check definition of readdir_r
+ echo $ac_n "checking "args to readdir_r"""... $ac_c" 1>&6
+-echo "configure:9084: checking "args to readdir_r"" >&5
++echo "configure:9083: checking "args to readdir_r"" >&5
+ if eval "test \"`echo '$''{'mysql_cv_readdir_r'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+   cat > conftest.$ac_ext <<EOF
+-#line 9089 "configure"
++#line 9088 "configure"
+ #include "confdefs.h"
+ #if !defined(SCO) && !defined(__osf__)
+ #define _REENTRANT
+@@ -9098,7 +9097,7 @@
+ readdir_r((DIR *) NULL, (struct dirent *) NULL, (struct dirent **) NULL); 
+ ; return 0; }
+ EOF
+-if { (eval echo configure:9102: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:9101: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+   rm -rf conftest*
+   mysql_cv_readdir_r=POSIX
+ else
+@@ -9121,12 +9120,12 @@
+ 
+ # Check definition av posix sigwait()
+ echo $ac_n "checking "style of sigwait"""... $ac_c" 1>&6
+-echo "configure:9125: checking "style of sigwait"" >&5
++echo "configure:9124: checking "style of sigwait"" >&5
+ if eval "test \"`echo '$''{'mysql_cv_sigwait'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+   cat > conftest.$ac_ext <<EOF
+-#line 9130 "configure"
++#line 9129 "configure"
+ #include "confdefs.h"
+ #if !defined(SCO) && !defined(__osf__)
+ #define _REENTRANT
+@@ -9142,7 +9141,7 @@
+ #endif
+ ; return 0; }
+ EOF
+-if { (eval echo configure:9146: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:9145: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+   rm -rf conftest*
+   mysql_cv_sigwait=POSIX
+ else
+@@ -9168,12 +9167,12 @@
+ unset mysql_cv_sigwait
+ # Check definition av posix sigwait()
+ echo $ac_n "checking "style of sigwait"""... $ac_c" 1>&6
+-echo "configure:9172: checking "style of sigwait"" >&5
++echo "configure:9171: checking "style of sigwait"" >&5
+ if eval "test \"`echo '$''{'mysql_cv_sigwait'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+   cat > conftest.$ac_ext <<EOF
+-#line 9177 "configure"
++#line 9176 "configure"
+ #include "confdefs.h"
+ #if !defined(SCO) && !defined(__osf__)
+ #define _REENTRANT
+@@ -9187,7 +9186,7 @@
+ sigwait(&set);
+ ; return 0; }
+ EOF
+-if { (eval echo configure:9191: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:9190: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+   rm -rf conftest*
+   mysql_cv_sigwait=NONPOSIX
+ else
+@@ -9212,12 +9211,12 @@
+ 
+ # Check if pthread_attr_setscope() exists
+ echo $ac_n "checking "for pthread_attr_setscope"""... $ac_c" 1>&6
+-echo "configure:9216: checking "for pthread_attr_setscope"" >&5
++echo "configure:9215: checking "for pthread_attr_setscope"" >&5
+ if eval "test \"`echo '$''{'mysql_cv_pthread_attr_setscope'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+   cat > conftest.$ac_ext <<EOF
+-#line 9221 "configure"
++#line 9220 "configure"
+ #include "confdefs.h"
+ #if !defined(SCO) && !defined(__osf__)
+ #define _REENTRANT
+@@ -9229,7 +9228,7 @@
+ pthread_attr_setscope(&thr_attr,0);
+ ; return 0; }
+ EOF
+-if { (eval echo configure:9233: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:9232: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+   rm -rf conftest*
+   mysql_cv_pthread_attr_setscope=yes
+ else
+@@ -9252,9 +9251,9 @@
+ 
+ # Check for bad includes
+ echo $ac_n "checking "can netinet files be included"""... $ac_c" 1>&6
+-echo "configure:9256: checking "can netinet files be included"" >&5
++echo "configure:9255: checking "can netinet files be included"" >&5
+ cat > conftest.$ac_ext <<EOF
+-#line 9258 "configure"
++#line 9257 "configure"
+ #include "confdefs.h"
+ #include <sys/types.h>
+ #include <sys/socket.h>
+@@ -9266,7 +9265,7 @@
+  printf("1\n"); 
+ ; return 0; }
+ EOF
+-if { (eval echo configure:9270: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
++if { (eval echo configure:9269: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+   rm -rf conftest*
+   netinet_inc=yes
+ else
+@@ -9381,7 +9380,7 @@
+ 
+ 
+ echo $ac_n "checking "character sets"""... $ac_c" 1>&6
+-echo "configure:9385: checking "character sets"" >&5
++echo "configure:9384: checking "character sets"" >&5
+ 
+ if test "$extra_charsets" = none; then
+   CHARSETS=""
+@@ -9619,7 +9618,7 @@
+ 
+ 
+   echo $ac_n "checking for BerkeleyDB""... $ac_c" 1>&6
+-echo "configure:9623: checking for BerkeleyDB" >&5
++echo "configure:9622: checking for BerkeleyDB" >&5
+ 
+   have_berkeley_db=no
+   case "$bdb" in
+@@ -9693,7 +9692,7 @@
+       save_LDFLAGS="$LDFLAGS"
+       LDFLAGS="-L$lib $LDFLAGS"
+       echo $ac_n "checking for db_env_create in -ldb""... $ac_c" 1>&6
+-echo "configure:9697: checking for db_env_create in -ldb" >&5
++echo "configure:9696: checking for db_env_create in -ldb" >&5
+ ac_lib_var=`echo db'_'db_env_create | sed 'y%./+-%__p_%'`
+ if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+@@ -9701,7 +9700,7 @@
+   ac_save_LIBS="$LIBS"
+ LIBS="-ldb  $LIBS"
+ cat > conftest.$ac_ext <<EOF
+-#line 9705 "configure"
++#line 9704 "configure"
+ #include "confdefs.h"
+ /* Override any gcc2 internal prototype to avoid an error.  */
+ /* We use char because int might match the return type of a gcc2
+@@ -9712,7 +9711,7 @@
+ db_env_create()
+ ; return 0; }
+ EOF
+-if { (eval echo configure:9716: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:9715: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+   rm -rf conftest*
+   eval "ac_cv_lib_$ac_lib_var=yes"
+ else
+@@ -9829,7 +9828,7 @@
+       save_LDFLAGS="$LDFLAGS"
+       LDFLAGS="-L$lib $LDFLAGS"
+       echo $ac_n "checking for db_env_create in -ldb""... $ac_c" 1>&6
+-echo "configure:9833: checking for db_env_create in -ldb" >&5
++echo "configure:9832: checking for db_env_create in -ldb" >&5
+ ac_lib_var=`echo db'_'db_env_create | sed 'y%./+-%__p_%'`
+ if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+@@ -9837,7 +9836,7 @@
+   ac_save_LIBS="$LIBS"
+ LIBS="-ldb  $LIBS"
+ cat > conftest.$ac_ext <<EOF
+-#line 9841 "configure"
++#line 9840 "configure"
+ #include "confdefs.h"
+ /* Override any gcc2 internal prototype to avoid an error.  */
+ /* We use char because int might match the return type of a gcc2
+@@ -9848,7 +9847,7 @@
+ db_env_create()
+ ; return 0; }
+ EOF
+-if { (eval echo configure:9852: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:9851: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+   rm -rf conftest*
+   eval "ac_cv_lib_$ac_lib_var=yes"
+ else
+@@ -10035,7 +10034,7 @@
+       save_LDFLAGS="$LDFLAGS"
+       LDFLAGS="-L$lib $LDFLAGS"
+       echo $ac_n "checking for db_env_create in -ldb""... $ac_c" 1>&6
+-echo "configure:10039: checking for db_env_create in -ldb" >&5
++echo "configure:10038: checking for db_env_create in -ldb" >&5
+ ac_lib_var=`echo db'_'db_env_create | sed 'y%./+-%__p_%'`
+ if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+@@ -10043,7 +10042,7 @@
+   ac_save_LIBS="$LIBS"
+ LIBS="-ldb  $LIBS"
+ cat > conftest.$ac_ext <<EOF
+-#line 10047 "configure"
++#line 10046 "configure"
+ #include "confdefs.h"
+ /* Override any gcc2 internal prototype to avoid an error.  */
+ /* We use char because int might match the return type of a gcc2
+@@ -10054,7 +10053,7 @@
+ db_env_create()
+ ; return 0; }
+ EOF
+-if { (eval echo configure:10058: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:10057: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+   rm -rf conftest*
+   eval "ac_cv_lib_$ac_lib_var=yes"
+ else
+@@ -10247,7 +10246,7 @@
+ 
+ 
+   echo $ac_n "checking for Innobase""... $ac_c" 1>&6
+-echo "configure:10251: checking for Innobase" >&5
++echo "configure:10250: checking for Innobase" >&5
+ 
+   have_innobase_db=no
+   innobase_includes=
+@@ -10299,7 +10298,7 @@
+  ../innobase/ut/libut.a"
+ 
+       echo $ac_n "checking for aio_read in -lrt""... $ac_c" 1>&6
+-echo "configure:10303: checking for aio_read in -lrt" >&5
++echo "configure:10302: checking for aio_read in -lrt" >&5
+ ac_lib_var=`echo rt'_'aio_read | sed 'y%./+-%__p_%'`
+ if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+@@ -10307,7 +10306,7 @@
+   ac_save_LIBS="$LIBS"
+ LIBS="-lrt  $LIBS"
+ cat > conftest.$ac_ext <<EOF
+-#line 10311 "configure"
++#line 10310 "configure"
+ #include "confdefs.h"
+ /* Override any gcc2 internal prototype to avoid an error.  */
+ /* We use char because int might match the return type of a gcc2
+@@ -10318,7 +10317,7 @@
+ aio_read()
+ ; return 0; }
+ EOF
+-if { (eval echo configure:10322: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:10321: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+   rm -rf conftest*
+   eval "ac_cv_lib_$ac_lib_var=yes"
+ else
+@@ -10358,7 +10357,7 @@
+ 
+ 
+   echo $ac_n "checking for Gemini DB""... $ac_c" 1>&6
+-echo "configure:10362: checking for Gemini DB" >&5
++echo "configure:10361: checking for Gemini DB" >&5
+ 
+   have_gemini_db=no
+   gemini_includes=
+diff -r -u mysql-3.23.36.orig/dbug/Makefile.in mysql-3.23.36/dbug/Makefile.in
+--- mysql-3.23.36.orig/dbug/Makefile.in	Tue Mar 27 10:20:14 2001
++++ mysql-3.23.36/dbug/Makefile.in	Fri Apr 13 16:23:23 2001
+@@ -207,8 +207,9 @@
+ 
+ DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST)
+ 
+-TAR = gtar
++TAR = tar
+ GZIP_ENV = --best
++DEP_FILES =  .deps/dbug.P .deps/sanity.P
+ SOURCES = $(libdbug_a_SOURCES)
+ OBJECTS = $(libdbug_a_OBJECTS)
+ 
+@@ -216,9 +217,9 @@
+ .SUFFIXES:
+ .SUFFIXES: .S .c .lo .o .s
+ $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) 
+-	cd $(top_srcdir) && $(AUTOMAKE) --gnu --include-deps dbug/Makefile
++	cd $(top_srcdir) && $(AUTOMAKE) --gnu dbug/Makefile
+ 
+-Makefile: $(srcdir)/Makefile.in  $(top_builddir)/config.status
++Makefile: $(srcdir)/Makefile.in  $(top_builddir)/config.status $(BUILT_SOURCES)
+ 	cd $(top_builddir) \
+ 	  && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status
+ 
+@@ -255,9 +256,6 @@
+ 	  rm -f $(DESTDIR)$(pkglibdir)/$$p; \
+ 	done
+ 
+-.c.o:
+-	$(COMPILE) -c $<
+-
+ .s.o:
+ 	$(COMPILE) -c $<
+ 
+@@ -274,9 +272,6 @@
+ 
+ maintainer-clean-compile:
+ 
+-.c.lo:
+-	$(LIBTOOL) --mode=compile $(COMPILE) -c $<
+-
+ .s.lo:
+ 	$(LIBTOOL) --mode=compile $(COMPILE) -c $<
+ 
+@@ -332,26 +327,53 @@
+ subdir = dbug
+ 
+ distdir: $(DISTFILES)
++	here=`cd $(top_builddir) && pwd`; \
++	top_distdir=`cd $(top_distdir) && pwd`; \
++	distdir=`cd $(distdir) && pwd`; \
++	cd $(top_srcdir) \
++	  && $(AUTOMAKE) --include-deps --build-dir=$$here --srcdir-name=$(top_srcdir) --output-dir=$$top_distdir --gnu dbug/Makefile
+ 	@for file in $(DISTFILES); do \
+ 	  d=$(srcdir); \
+ 	  if test -d $$d/$$file; then \
+-	    cp -pr $$d/$$file $(distdir)/$$file; \
++	    cp -pr $$/$$file $(distdir)/$$file; \
+ 	  else \
+ 	    test -f $(distdir)/$$file \
+ 	    || ln $$d/$$file $(distdir)/$$file 2> /dev/null \
+ 	    || cp -p $$d/$$file $(distdir)/$$file || :; \
+ 	  fi; \
+ 	done
+-dbug.o: dbug.c ../include/global.h ../include/my_config.h \
+-	../mit-pthreads/include/bits/local_lim.h \
+-	../mit-pthreads/include/endian.h ../include/dbug.h \
+-	../include/m_string.h ../include/my_pthread.h \
+-	../mit-pthreads/include/pthread/config.h \
+-	../mit-pthreads/include/sched.h
+-sanity.o: sanity.c ../include/global.h ../include/my_config.h \
+-	../mit-pthreads/include/bits/local_lim.h \
+-	../mit-pthreads/include/endian.h ../include/dbug.h
+ 
++DEPS_MAGIC := $(shell mkdir .deps > /dev/null 2>&1 || :)
++
++-include $(DEP_FILES)
++
++mostlyclean-depend:
++
++clean-depend:
++
++distclean-depend:
++	-rm -rf .deps
++
++maintainer-clean-depend:
++
++%.o: %.c
++	@echo '$(COMPILE) -c $<'; \
++	$(COMPILE) -Wp,-MD,.deps/$(*F).pp -c $<
++	@-cp .deps/$(*F).pp .deps/$(*F).P; \
++	tr ' ' '\012' < .deps/$(*F).pp \
++	  | sed -e 's/^\\$$//' -e '/^$$/ d' -e '/:$$/ d' -e 's/$$/ :/' \
++	    >> .deps/$(*F).P; \
++	rm .deps/$(*F).pp
++
++%.lo: %.c
++	@echo '$(LTCOMPILE) -c $<'; \
++	$(LTCOMPILE) -Wp,-MD,.deps/$(*F).pp -c $<
++	@-sed -e 's/^\([^:]*\)\.o[ 	]*:/\1.lo \1.o :/' \
++	  < .deps/$(*F).pp > .deps/$(*F).P; \
++	tr ' ' '\012' < .deps/$(*F).pp \
++	  | sed -e 's/^\\$$//' -e '/^$$/ d' -e '/:$$/ d' -e 's/$$/ :/' \
++	    >> .deps/$(*F).P; \
++	rm -f .deps/$(*F).pp
+ info-am:
+ info: info-am
+ dvi-am:
+@@ -389,27 +411,27 @@
+ 
+ maintainer-clean-generic:
+ mostlyclean-am:  mostlyclean-pkglibLIBRARIES mostlyclean-compile \
+-		mostlyclean-libtool mostlyclean-tags \
++		mostlyclean-libtool mostlyclean-tags mostlyclean-depend \
+ 		mostlyclean-generic
+ 
+ mostlyclean: mostlyclean-am
+ 
+ clean-am:  clean-pkglibLIBRARIES clean-compile clean-libtool clean-tags \
+-		clean-generic mostlyclean-am
++		clean-depend clean-generic mostlyclean-am
+ 
+ clean: clean-am
+ 
+ distclean-am:  distclean-pkglibLIBRARIES distclean-compile \
+-		distclean-libtool distclean-tags distclean-generic \
+-		clean-am
++		distclean-libtool distclean-tags distclean-depend \
++		distclean-generic clean-am
+ 	-rm -f libtool
+ 
+ distclean: distclean-am
+ 
+ maintainer-clean-am:  maintainer-clean-pkglibLIBRARIES \
+ 		maintainer-clean-compile maintainer-clean-libtool \
+-		maintainer-clean-tags maintainer-clean-generic \
+-		distclean-am
++		maintainer-clean-tags maintainer-clean-depend \
++		maintainer-clean-generic distclean-am
+ 	@echo "This command is intended for maintainers to use;"
+ 	@echo "it deletes files that may require special tools to rebuild."
+ 
+@@ -421,12 +443,13 @@
+ distclean-compile clean-compile maintainer-clean-compile \
+ mostlyclean-libtool distclean-libtool clean-libtool \
+ maintainer-clean-libtool tags mostlyclean-tags distclean-tags \
+-clean-tags maintainer-clean-tags distdir info-am info dvi-am dvi check \
+-check-am installcheck-am installcheck install-exec-am install-exec \
+-install-data-am install-data install-am install uninstall-am uninstall \
+-all-redirect all-am all installdirs mostlyclean-generic \
+-distclean-generic clean-generic maintainer-clean-generic clean \
+-mostlyclean distclean maintainer-clean
++clean-tags maintainer-clean-tags distdir mostlyclean-depend \
++distclean-depend clean-depend maintainer-clean-depend info-am info \
++dvi-am dvi check check-am installcheck-am installcheck install-exec-am \
++install-exec install-data-am install-data install-am install \
++uninstall-am uninstall all-redirect all-am all installdirs \
++mostlyclean-generic distclean-generic clean-generic \
++maintainer-clean-generic clean mostlyclean distclean maintainer-clean
+ 
+ 
+ # Must be linked with libs thta are not compiled yet
+diff -r -u mysql-3.23.36.orig/extra/Makefile.in mysql-3.23.36/extra/Makefile.in
+--- mysql-3.23.36.orig/extra/Makefile.in	Tue Mar 27 10:20:17 2001
++++ mysql-3.23.36/extra/Makefile.in	Fri Apr 13 16:23:19 2001
+@@ -235,8 +235,10 @@
+ 
+ DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST)
+ 
+-TAR = gtar
++TAR = tar
+ GZIP_ENV = --best
++DEP_FILES =  .deps/comp_err.P .deps/my_print_defaults.P .deps/perror.P \
++.deps/replace.P .deps/resolve_stack_dump.P .deps/resolveip.P
+ SOURCES = replace.c comp_err.c perror.c resolveip.c my_print_defaults.c resolve_stack_dump.c
+ OBJECTS = replace.o comp_err.o perror.o resolveip.o my_print_defaults.o resolve_stack_dump.o
+ 
+@@ -244,9 +246,9 @@
+ .SUFFIXES:
+ .SUFFIXES: .S .c .lo .o .s
+ $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) 
+-	cd $(top_srcdir) && $(AUTOMAKE) --gnu --include-deps extra/Makefile
++	cd $(top_srcdir) && $(AUTOMAKE) --gnu extra/Makefile
+ 
+-Makefile: $(srcdir)/Makefile.in  $(top_builddir)/config.status
++Makefile: $(srcdir)/Makefile.in  $(top_builddir)/config.status $(BUILT_SOURCES)
+ 	cd $(top_builddir) \
+ 	  && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status
+ 
+@@ -276,9 +278,6 @@
+ 	  rm -f $(DESTDIR)$(bindir)/`echo $$p|sed 's/$(EXEEXT)$$//'|sed '$(transform)'|sed 's/$$/$(EXEEXT)/'`; \
+ 	done
+ 
+-.c.o:
+-	$(COMPILE) -c $<
+-
+ .s.o:
+ 	$(COMPILE) -c $<
+ 
+@@ -295,9 +294,6 @@
+ 
+ maintainer-clean-compile:
+ 
+-.c.lo:
+-	$(LIBTOOL) --mode=compile $(COMPILE) -c $<
+-
+ .s.lo:
+ 	$(LIBTOOL) --mode=compile $(COMPILE) -c $<
+ 
+@@ -372,70 +368,53 @@
+ subdir = extra
+ 
+ distdir: $(DISTFILES)
++	here=`cd $(top_builddir) && pwd`; \
++	top_distdir=`cd $(top_distdir) && pwd`; \
++	distdir=`cd $(distdir) && pwd`; \
++	cd $(top_srcdir) \
++	  && $(AUTOMAKE) --include-deps --build-dir=$$here --srcdir-name=$(top_srcdir) --output-dir=$$top_distdir --gnu extra/Makefile
+ 	@for file in $(DISTFILES); do \
+ 	  d=$(srcdir); \
+ 	  if test -d $$d/$$file; then \
+-	    cp -pr $$d/$$file $(distdir)/$$file; \
++	    cp -pr $$/$$file $(distdir)/$$file; \
+ 	  else \
+ 	    test -f $(distdir)/$$file \
+ 	    || ln $$d/$$file $(distdir)/$$file 2> /dev/null \
+ 	    || cp -p $$d/$$file $(distdir)/$$file || :; \
+ 	  fi; \
+ 	done
+-comp_err.o: comp_err.c ../include/global.h ../include/my_config.h \
+-	../mit-pthreads/include/bits/local_lim.h \
+-	../mit-pthreads/include/endian.h ../include/dbug.h \
+-	../include/m_ctype.h ../include/my_sys.h \
+-	../include/my_pthread.h \
+-	../mit-pthreads/include/pthread/config.h \
+-	../mit-pthreads/include/pthread/util.h \
+-	../mit-pthreads/include/sched.h ../include/raid.h \
+-	../include/m_string.h
+-my_print_defaults.o: my_print_defaults.c ../include/global.h \
+-	../include/my_config.h ../mit-pthreads/include/bits/local_lim.h \
+-	../mit-pthreads/include/endian.h ../include/dbug.h \
+-	../include/my_sys.h ../include/my_pthread.h \
+-	../mit-pthreads/include/pthread/config.h \
+-	../mit-pthreads/include/pthread/util.h \
+-	../mit-pthreads/include/sched.h ../include/m_ctype.h \
+-	../include/raid.h ../include/getopt.h
+-perror.o: perror.c ../include/global.h ../include/my_config.h \
+-	../mit-pthreads/include/bits/local_lim.h \
+-	../mit-pthreads/include/endian.h ../include/dbug.h \
+-	../include/my_sys.h ../include/my_pthread.h \
+-	../mit-pthreads/include/pthread/config.h \
+-	../mit-pthreads/include/pthread/util.h \
+-	../mit-pthreads/include/sched.h ../include/m_ctype.h \
+-	../include/raid.h ../include/m_string.h ../include/getopt.h
+-replace.o: replace.c ../include/global.h ../include/my_config.h \
+-	../mit-pthreads/include/bits/local_lim.h \
+-	../mit-pthreads/include/endian.h ../include/dbug.h \
+-	../include/m_ctype.h ../include/my_sys.h \
+-	../include/my_pthread.h \
+-	../mit-pthreads/include/pthread/config.h \
+-	../mit-pthreads/include/pthread/util.h \
+-	../mit-pthreads/include/sched.h ../include/raid.h \
+-	../include/m_string.h
+-resolve_stack_dump.o: resolve_stack_dump.c ../include/global.h \
+-	../include/my_config.h ../mit-pthreads/include/bits/local_lim.h \
+-	../mit-pthreads/include/endian.h ../include/dbug.h \
+-	../include/m_ctype.h ../include/my_sys.h \
+-	../include/my_pthread.h \
+-	../mit-pthreads/include/pthread/config.h \
+-	../mit-pthreads/include/pthread/util.h \
+-	../mit-pthreads/include/sched.h ../include/raid.h \
+-	../include/m_string.h ../include/mysql_version.h \
+-	../include/getopt.h
+-resolveip.o: resolveip.c ../include/global.h ../include/my_config.h \
+-	../mit-pthreads/include/bits/local_lim.h \
+-	../mit-pthreads/include/endian.h ../include/dbug.h \
+-	../include/m_ctype.h ../include/my_sys.h \
+-	../include/my_pthread.h \
+-	../mit-pthreads/include/pthread/config.h \
+-	../mit-pthreads/include/pthread/util.h \
+-	../mit-pthreads/include/sched.h ../include/raid.h \
+-	../include/getopt.h
+ 
++DEPS_MAGIC := $(shell mkdir .deps > /dev/null 2>&1 || :)
++
++-include $(DEP_FILES)
++
++mostlyclean-depend:
++
++clean-depend:
++
++distclean-depend:
++	-rm -rf .deps
++
++maintainer-clean-depend:
++
++%.o: %.c
++	@echo '$(COMPILE) -c $<'; \
++	$(COMPILE) -Wp,-MD,.deps/$(*F).pp -c $<
++	@-cp .deps/$(*F).pp .deps/$(*F).P; \
++	tr ' ' '\012' < .deps/$(*F).pp \
++	  | sed -e 's/^\\$$//' -e '/^$$/ d' -e '/:$$/ d' -e 's/$$/ :/' \
++	    >> .deps/$(*F).P; \
++	rm .deps/$(*F).pp
++
++%.lo: %.c
++	@echo '$(LTCOMPILE) -c $<'; \
++	$(LTCOMPILE) -Wp,-MD,.deps/$(*F).pp -c $<
++	@-sed -e 's/^\([^:]*\)\.o[ 	]*:/\1.lo \1.o :/' \
++	  < .deps/$(*F).pp > .deps/$(*F).P; \
++	tr ' ' '\012' < .deps/$(*F).pp \
++	  | sed -e 's/^\\$$//' -e '/^$$/ d' -e '/:$$/ d' -e 's/$$/ :/' \
++	    >> .deps/$(*F).P; \
++	rm -f .deps/$(*F).pp
+ info-am:
+ info: info-am
+ dvi-am:
+@@ -473,26 +452,27 @@
+ 
+ maintainer-clean-generic:
+ mostlyclean-am:  mostlyclean-binPROGRAMS mostlyclean-compile \
+-		mostlyclean-libtool mostlyclean-tags \
++		mostlyclean-libtool mostlyclean-tags mostlyclean-depend \
+ 		mostlyclean-generic
+ 
+ mostlyclean: mostlyclean-am
+ 
+ clean-am:  clean-binPROGRAMS clean-compile clean-libtool clean-tags \
+-		clean-generic mostlyclean-am
++		clean-depend clean-generic mostlyclean-am
+ 
+ clean: clean-am
+ 
+ distclean-am:  distclean-binPROGRAMS distclean-compile distclean-libtool \
+-		distclean-tags distclean-generic clean-am
++		distclean-tags distclean-depend distclean-generic \
++		clean-am
+ 	-rm -f libtool
+ 
+ distclean: distclean-am
+ 
+ maintainer-clean-am:  maintainer-clean-binPROGRAMS \
+ 		maintainer-clean-compile maintainer-clean-libtool \
+-		maintainer-clean-tags maintainer-clean-generic \
+-		distclean-am
++		maintainer-clean-tags maintainer-clean-depend \
++		maintainer-clean-generic distclean-am
+ 	@echo "This command is intended for maintainers to use;"
+ 	@echo "it deletes files that may require special tools to rebuild."
+ 
+@@ -503,12 +483,14 @@
+ mostlyclean-compile distclean-compile clean-compile \
+ maintainer-clean-compile mostlyclean-libtool distclean-libtool \
+ clean-libtool maintainer-clean-libtool tags mostlyclean-tags \
+-distclean-tags clean-tags maintainer-clean-tags distdir info-am info \
+-dvi-am dvi check check-am installcheck-am installcheck install-exec-am \
+-install-exec install-data-am install-data install-am install \
+-uninstall-am uninstall all-redirect all-am all installdirs \
+-mostlyclean-generic distclean-generic clean-generic \
+-maintainer-clean-generic clean mostlyclean distclean maintainer-clean
++distclean-tags clean-tags maintainer-clean-tags distdir \
++mostlyclean-depend distclean-depend clean-depend \
++maintainer-clean-depend info-am info dvi-am dvi check check-am \
++installcheck-am installcheck install-exec-am install-exec \
++install-data-am install-data install-am install uninstall-am uninstall \
++all-redirect all-am all installdirs mostlyclean-generic \
++distclean-generic clean-generic maintainer-clean-generic clean \
++mostlyclean distclean maintainer-clean
+ 
+ 
+ # Don't update the files from bitkeeper
+diff -r -u mysql-3.23.36.orig/heap/Makefile.in mysql-3.23.36/heap/Makefile.in
+--- mysql-3.23.36.orig/heap/Makefile.in	Tue Mar 27 10:20:25 2001
++++ mysql-3.23.36/heap/Makefile.in	Fri Apr 13 16:23:20 2001
+@@ -225,8 +225,15 @@
+ 
+ DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST)
+ 
+-TAR = gtar
++TAR = tar
+ GZIP_ENV = --best
++DEP_FILES =  .deps/_check.P .deps/_rectest.P .deps/hp_block.P \
++.deps/hp_clear.P .deps/hp_close.P .deps/hp_create.P .deps/hp_delete.P \
++.deps/hp_extra.P .deps/hp_hash.P .deps/hp_info.P .deps/hp_open.P \
++.deps/hp_panic.P .deps/hp_rename.P .deps/hp_rfirst.P .deps/hp_rkey.P \
++.deps/hp_rlast.P .deps/hp_rnext.P .deps/hp_rprev.P .deps/hp_rrnd.P \
++.deps/hp_rsame.P .deps/hp_scan.P .deps/hp_static.P .deps/hp_test1.P \
++.deps/hp_test2.P .deps/hp_update.P .deps/hp_write.P
+ SOURCES = $(libheap_a_SOURCES) hp_test1.c hp_test2.c
+ OBJECTS = $(libheap_a_OBJECTS) hp_test1.o hp_test2.o
+ 
+@@ -234,9 +241,9 @@
+ .SUFFIXES:
+ .SUFFIXES: .S .c .lo .o .s
+ $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) 
+-	cd $(top_srcdir) && $(AUTOMAKE) --gnu --include-deps heap/Makefile
++	cd $(top_srcdir) && $(AUTOMAKE) --gnu heap/Makefile
+ 
+-Makefile: $(srcdir)/Makefile.in  $(top_builddir)/config.status
++Makefile: $(srcdir)/Makefile.in  $(top_builddir)/config.status $(BUILT_SOURCES)
+ 	cd $(top_builddir) \
+ 	  && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status
+ 
+@@ -273,9 +280,6 @@
+ 	  rm -f $(DESTDIR)$(pkglibdir)/$$p; \
+ 	done
+ 
+-.c.o:
+-	$(COMPILE) -c $<
+-
+ .s.o:
+ 	$(COMPILE) -c $<
+ 
+@@ -292,9 +296,6 @@
+ 
+ maintainer-clean-compile:
+ 
+-.c.lo:
+-	$(LIBTOOL) --mode=compile $(COMPILE) -c $<
+-
+ .s.lo:
+ 	$(LIBTOOL) --mode=compile $(COMPILE) -c $<
+ 
+@@ -367,243 +368,53 @@
+ subdir = heap
+ 
+ distdir: $(DISTFILES)
++	here=`cd $(top_builddir) && pwd`; \
++	top_distdir=`cd $(top_distdir) && pwd`; \
++	distdir=`cd $(distdir) && pwd`; \
++	cd $(top_srcdir) \
++	  && $(AUTOMAKE) --include-deps --build-dir=$$here --srcdir-name=$(top_srcdir) --output-dir=$$top_distdir --gnu heap/Makefile
+ 	@for file in $(DISTFILES); do \
+ 	  d=$(srcdir); \
+ 	  if test -d $$d/$$file; then \
+-	    cp -pr $$d/$$file $(distdir)/$$file; \
++	    cp -pr $$/$$file $(distdir)/$$file; \
+ 	  else \
+ 	    test -f $(distdir)/$$file \
+ 	    || ln $$d/$$file $(distdir)/$$file 2> /dev/null \
+ 	    || cp -p $$d/$$file $(distdir)/$$file || :; \
+ 	  fi; \
+ 	done
+-_check.o: _check.c heapdef.h ../include/my_base.h ../include/global.h \
+-	../include/my_config.h ../mit-pthreads/include/bits/local_lim.h \
+-	../mit-pthreads/include/endian.h ../include/dbug.h \
+-	../include/my_dir.h ../include/my_sys.h ../include/my_pthread.h \
+-	../mit-pthreads/include/pthread/config.h \
+-	../mit-pthreads/include/sched.h ../include/m_ctype.h \
+-	../include/raid.h ../include/m_string.h ../include/my_list.h \
+-	../include/heap.h ../include/thr_lock.h
+-_rectest.o: _rectest.c heapdef.h ../include/my_base.h \
+-	../include/global.h ../include/my_config.h \
+-	../mit-pthreads/include/bits/local_lim.h \
+-	../mit-pthreads/include/endian.h ../include/dbug.h \
+-	../include/my_dir.h ../include/my_sys.h ../include/my_pthread.h \
+-	../mit-pthreads/include/pthread/config.h \
+-	../mit-pthreads/include/sched.h ../include/m_ctype.h \
+-	../include/raid.h ../include/m_string.h ../include/my_list.h \
+-	../include/heap.h ../include/thr_lock.h
+-hp_block.o: hp_block.c heapdef.h ../include/my_base.h \
+-	../include/global.h ../include/my_config.h \
+-	../mit-pthreads/include/bits/local_lim.h \
+-	../mit-pthreads/include/endian.h ../include/dbug.h \
+-	../include/my_dir.h ../include/my_sys.h ../include/my_pthread.h \
+-	../mit-pthreads/include/pthread/config.h \
+-	../mit-pthreads/include/sched.h ../include/m_ctype.h \
+-	../include/raid.h ../include/m_string.h ../include/my_list.h \
+-	../include/heap.h ../include/thr_lock.h
+-hp_clear.o: hp_clear.c heapdef.h ../include/my_base.h \
+-	../include/global.h ../include/my_config.h \
+-	../mit-pthreads/include/bits/local_lim.h \
+-	../mit-pthreads/include/endian.h ../include/dbug.h \
+-	../include/my_dir.h ../include/my_sys.h ../include/my_pthread.h \
+-	../mit-pthreads/include/pthread/config.h \
+-	../mit-pthreads/include/sched.h ../include/m_ctype.h \
+-	../include/raid.h ../include/m_string.h ../include/my_list.h \
+-	../include/heap.h ../include/thr_lock.h
+-hp_close.o: hp_close.c heapdef.h ../include/my_base.h \
+-	../include/global.h ../include/my_config.h \
+-	../mit-pthreads/include/bits/local_lim.h \
+-	../mit-pthreads/include/endian.h ../include/dbug.h \
+-	../include/my_dir.h ../include/my_sys.h ../include/my_pthread.h \
+-	../mit-pthreads/include/pthread/config.h \
+-	../mit-pthreads/include/sched.h ../include/m_ctype.h \
+-	../include/raid.h ../include/m_string.h ../include/my_list.h \
+-	../include/heap.h ../include/thr_lock.h
+-hp_create.o: hp_create.c heapdef.h ../include/my_base.h \
+-	../include/global.h ../include/my_config.h \
+-	../mit-pthreads/include/bits/local_lim.h \
+-	../mit-pthreads/include/endian.h ../include/dbug.h \
+-	../include/my_dir.h ../include/my_sys.h ../include/my_pthread.h \
+-	../mit-pthreads/include/pthread/config.h \
+-	../mit-pthreads/include/sched.h ../include/m_ctype.h \
+-	../include/raid.h ../include/m_string.h ../include/my_list.h \
+-	../include/heap.h ../include/thr_lock.h
+-hp_delete.o: hp_delete.c heapdef.h ../include/my_base.h \
+-	../include/global.h ../include/my_config.h \
+-	../mit-pthreads/include/bits/local_lim.h \
+-	../mit-pthreads/include/endian.h ../include/dbug.h \
+-	../include/my_dir.h ../include/my_sys.h ../include/my_pthread.h \
+-	../mit-pthreads/include/pthread/config.h \
+-	../mit-pthreads/include/sched.h ../include/m_ctype.h \
+-	../include/raid.h ../include/m_string.h ../include/my_list.h \
+-	../include/heap.h ../include/thr_lock.h
+-hp_extra.o: hp_extra.c heapdef.h ../include/my_base.h \
+-	../include/global.h ../include/my_config.h \
+-	../mit-pthreads/include/bits/local_lim.h \
+-	../mit-pthreads/include/endian.h ../include/dbug.h \
+-	../include/my_dir.h ../include/my_sys.h ../include/my_pthread.h \
+-	../mit-pthreads/include/pthread/config.h \
+-	../mit-pthreads/include/sched.h ../include/m_ctype.h \
+-	../include/raid.h ../include/m_string.h ../include/my_list.h \
+-	../include/heap.h ../include/thr_lock.h
+-hp_hash.o: hp_hash.c heapdef.h ../include/my_base.h ../include/global.h \
+-	../include/my_config.h ../mit-pthreads/include/bits/local_lim.h \
+-	../mit-pthreads/include/endian.h ../include/dbug.h \
+-	../include/my_dir.h ../include/my_sys.h ../include/my_pthread.h \
+-	../mit-pthreads/include/pthread/config.h \
+-	../mit-pthreads/include/sched.h ../include/m_ctype.h \
+-	../include/raid.h ../include/m_string.h ../include/my_list.h \
+-	../include/heap.h ../include/thr_lock.h
+-hp_info.o: hp_info.c heapdef.h ../include/my_base.h ../include/global.h \
+-	../include/my_config.h ../mit-pthreads/include/bits/local_lim.h \
+-	../mit-pthreads/include/endian.h ../include/dbug.h \
+-	../include/my_dir.h ../include/my_sys.h ../include/my_pthread.h \
+-	../mit-pthreads/include/pthread/config.h \
+-	../mit-pthreads/include/sched.h ../include/m_ctype.h \
+-	../include/raid.h ../include/m_string.h ../include/my_list.h \
+-	../include/heap.h ../include/thr_lock.h
+-hp_open.o: hp_open.c heapdef.h ../include/my_base.h ../include/global.h \
+-	../include/my_config.h ../mit-pthreads/include/bits/local_lim.h \
+-	../mit-pthreads/include/endian.h ../include/dbug.h \
+-	../include/my_dir.h ../include/my_sys.h ../include/my_pthread.h \
+-	../mit-pthreads/include/pthread/config.h \
+-	../mit-pthreads/include/sched.h ../include/m_ctype.h \
+-	../include/raid.h ../include/m_string.h ../include/my_list.h \
+-	../include/heap.h ../include/thr_lock.h
+-hp_panic.o: hp_panic.c heapdef.h ../include/my_base.h \
+-	../include/global.h ../include/my_config.h \
+-	../mit-pthreads/include/bits/local_lim.h \
+-	../mit-pthreads/include/endian.h ../include/dbug.h \
+-	../include/my_dir.h ../include/my_sys.h ../include/my_pthread.h \
+-	../mit-pthreads/include/pthread/config.h \
+-	../mit-pthreads/include/sched.h ../include/m_ctype.h \
+-	../include/raid.h ../include/m_string.h ../include/my_list.h \
+-	../include/heap.h ../include/thr_lock.h
+-hp_rename.o: hp_rename.c heapdef.h ../include/my_base.h \
+-	../include/global.h ../include/my_config.h \
+-	../mit-pthreads/include/bits/local_lim.h \
+-	../mit-pthreads/include/endian.h ../include/dbug.h \
+-	../include/my_dir.h ../include/my_sys.h ../include/my_pthread.h \
+-	../mit-pthreads/include/pthread/config.h \
+-	../mit-pthreads/include/sched.h ../include/m_ctype.h \
+-	../include/raid.h ../include/m_string.h ../include/my_list.h \
+-	../include/heap.h ../include/thr_lock.h
+-hp_rfirst.o: hp_rfirst.c heapdef.h ../include/my_base.h \
+-	../include/global.h ../include/my_config.h \
+-	../mit-pthreads/include/bits/local_lim.h \
+-	../mit-pthreads/include/endian.h ../include/dbug.h \
+-	../include/my_dir.h ../include/my_sys.h ../include/my_pthread.h \
+-	../mit-pthreads/include/pthread/config.h \
+-	../mit-pthreads/include/sched.h ../include/m_ctype.h \
+-	../include/raid.h ../include/m_string.h ../include/my_list.h \
+-	../include/heap.h ../include/thr_lock.h
+-hp_rkey.o: hp_rkey.c heapdef.h ../include/my_base.h ../include/global.h \
+-	../include/my_config.h ../mit-pthreads/include/bits/local_lim.h \
+-	../mit-pthreads/include/endian.h ../include/dbug.h \
+-	../include/my_dir.h ../include/my_sys.h ../include/my_pthread.h \
+-	../mit-pthreads/include/pthread/config.h \
+-	../mit-pthreads/include/sched.h ../include/m_ctype.h \
+-	../include/raid.h ../include/m_string.h ../include/my_list.h \
+-	../include/heap.h ../include/thr_lock.h
+-hp_rlast.o: hp_rlast.c heapdef.h ../include/my_base.h \
+-	../include/global.h ../include/my_config.h \
+-	../mit-pthreads/include/bits/local_lim.h \
+-	../mit-pthreads/include/endian.h ../include/dbug.h \
+-	../include/my_dir.h ../include/my_sys.h ../include/my_pthread.h \
+-	../mit-pthreads/include/pthread/config.h \
+-	../mit-pthreads/include/sched.h ../include/m_ctype.h \
+-	../include/raid.h ../include/m_string.h ../include/my_list.h \
+-	../include/heap.h ../include/thr_lock.h
+-hp_rnext.o: hp_rnext.c heapdef.h ../include/my_base.h \
+-	../include/global.h ../include/my_config.h \
+-	../mit-pthreads/include/bits/local_lim.h \
+-	../mit-pthreads/include/endian.h ../include/dbug.h \
+-	../include/my_dir.h ../include/my_sys.h ../include/my_pthread.h \
+-	../mit-pthreads/include/pthread/config.h \
+-	../mit-pthreads/include/sched.h ../include/m_ctype.h \
+-	../include/raid.h ../include/m_string.h ../include/my_list.h \
+-	../include/heap.h ../include/thr_lock.h
+-hp_rprev.o: hp_rprev.c heapdef.h ../include/my_base.h \
+-	../include/global.h ../include/my_config.h \
+-	../mit-pthreads/include/bits/local_lim.h \
+-	../mit-pthreads/include/endian.h ../include/dbug.h \
+-	../include/my_dir.h ../include/my_sys.h ../include/my_pthread.h \
+-	../mit-pthreads/include/pthread/config.h \
+-	../mit-pthreads/include/sched.h ../include/m_ctype.h \
+-	../include/raid.h ../include/m_string.h ../include/my_list.h \
+-	../include/heap.h ../include/thr_lock.h
+-hp_rrnd.o: hp_rrnd.c heapdef.h ../include/my_base.h ../include/global.h \
+-	../include/my_config.h ../mit-pthreads/include/bits/local_lim.h \
+-	../mit-pthreads/include/endian.h ../include/dbug.h \
+-	../include/my_dir.h ../include/my_sys.h ../include/my_pthread.h \
+-	../mit-pthreads/include/pthread/config.h \
+-	../mit-pthreads/include/sched.h ../include/m_ctype.h \
+-	../include/raid.h ../include/m_string.h ../include/my_list.h \
+-	../include/heap.h ../include/thr_lock.h
+-hp_rsame.o: hp_rsame.c heapdef.h ../include/my_base.h \
+-	../include/global.h ../include/my_config.h \
+-	../mit-pthreads/include/bits/local_lim.h \
+-	../mit-pthreads/include/endian.h ../include/dbug.h \
+-	../include/my_dir.h ../include/my_sys.h ../include/my_pthread.h \
+-	../mit-pthreads/include/pthread/config.h \
+-	../mit-pthreads/include/sched.h ../include/m_ctype.h \
+-	../include/raid.h ../include/m_string.h ../include/my_list.h \
+-	../include/heap.h ../include/thr_lock.h
+-hp_scan.o: hp_scan.c heapdef.h ../include/my_base.h ../include/global.h \
+-	../include/my_config.h ../mit-pthreads/include/bits/local_lim.h \
+-	../mit-pthreads/include/endian.h ../include/dbug.h \
+-	../include/my_dir.h ../include/my_sys.h ../include/my_pthread.h \
+-	../mit-pthreads/include/pthread/config.h \
+-	../mit-pthreads/include/sched.h ../include/m_ctype.h \
+-	../include/raid.h ../include/m_string.h ../include/my_list.h \
+-	../include/heap.h ../include/thr_lock.h
+-hp_static.o: hp_static.c heapdef.h ../include/my_base.h \
+-	../include/global.h ../include/my_config.h \
+-	../mit-pthreads/include/bits/local_lim.h \
+-	../mit-pthreads/include/endian.h ../include/dbug.h \
+-	../include/my_dir.h ../include/my_sys.h ../include/my_pthread.h \
+-	../mit-pthreads/include/pthread/config.h \
+-	../mit-pthreads/include/sched.h ../include/m_ctype.h \
+-	../include/raid.h ../include/m_string.h ../include/my_list.h \
+-	../include/heap.h ../include/thr_lock.h
+-hp_test1.o: hp_test1.c ../include/global.h ../include/my_config.h \
+-	../mit-pthreads/include/bits/local_lim.h \
+-	../mit-pthreads/include/endian.h ../include/dbug.h \
+-	../include/my_sys.h ../include/my_pthread.h \
+-	../mit-pthreads/include/pthread/config.h \
+-	../mit-pthreads/include/sched.h ../include/m_ctype.h \
+-	../include/raid.h ../include/m_string.h ../include/heap.h \
+-	../include/my_base.h ../include/my_list.h ../include/thr_lock.h
+-hp_test2.o: hp_test2.c heapdef.h ../include/my_base.h \
+-	../include/global.h ../include/my_config.h \
+-	../mit-pthreads/include/bits/local_lim.h \
+-	../mit-pthreads/include/endian.h ../include/dbug.h \
+-	../include/my_dir.h ../include/my_sys.h ../include/my_pthread.h \
+-	../mit-pthreads/include/pthread/config.h \
+-	../mit-pthreads/include/sched.h ../include/m_ctype.h \
+-	../include/raid.h ../include/m_string.h ../include/my_list.h \
+-	../include/heap.h ../include/thr_lock.h
+-hp_update.o: hp_update.c heapdef.h ../include/my_base.h \
+-	../include/global.h ../include/my_config.h \
+-	../mit-pthreads/include/bits/local_lim.h \
+-	../mit-pthreads/include/endian.h ../include/dbug.h \
+-	../include/my_dir.h ../include/my_sys.h ../include/my_pthread.h \
+-	../mit-pthreads/include/pthread/config.h \
+-	../mit-pthreads/include/sched.h ../include/m_ctype.h \
+-	../include/raid.h ../include/m_string.h ../include/my_list.h \
+-	../include/heap.h ../include/thr_lock.h
+-hp_write.o: hp_write.c heapdef.h ../include/my_base.h \
+-	../include/global.h ../include/my_config.h \
+-	../mit-pthreads/include/bits/local_lim.h \
+-	../mit-pthreads/include/endian.h ../include/dbug.h \
+-	../include/my_dir.h ../include/my_sys.h ../include/my_pthread.h \
+-	../mit-pthreads/include/pthread/config.h \
+-	../mit-pthreads/include/sched.h ../include/m_ctype.h \
+-	../include/raid.h ../include/m_string.h ../include/my_list.h \
+-	../include/heap.h ../include/thr_lock.h
+ 
++DEPS_MAGIC := $(shell mkdir .deps > /dev/null 2>&1 || :)
++
++-include $(DEP_FILES)
++
++mostlyclean-depend:
++
++clean-depend:
++
++distclean-depend:
++	-rm -rf .deps
++
++maintainer-clean-depend:
++
++%.o: %.c
++	@echo '$(COMPILE) -c $<'; \
++	$(COMPILE) -Wp,-MD,.deps/$(*F).pp -c $<
++	@-cp .deps/$(*F).pp .deps/$(*F).P; \
++	tr ' ' '\012' < .deps/$(*F).pp \
++	  | sed -e 's/^\\$$//' -e '/^$$/ d' -e '/:$$/ d' -e 's/$$/ :/' \
++	    >> .deps/$(*F).P; \
++	rm .deps/$(*F).pp
++
++%.lo: %.c
++	@echo '$(LTCOMPILE) -c $<'; \
++	$(LTCOMPILE) -Wp,-MD,.deps/$(*F).pp -c $<
++	@-sed -e 's/^\([^:]*\)\.o[ 	]*:/\1.lo \1.o :/' \
++	  < .deps/$(*F).pp > .deps/$(*F).P; \
++	tr ' ' '\012' < .deps/$(*F).pp \
++	  | sed -e 's/^\\$$//' -e '/^$$/ d' -e '/:$$/ d' -e 's/$$/ :/' \
++	    >> .deps/$(*F).P; \
++	rm -f .deps/$(*F).pp
+ info-am:
+ info: info-am
+ dvi-am:
+@@ -642,19 +453,20 @@
+ maintainer-clean-generic:
+ mostlyclean-am:  mostlyclean-pkglibLIBRARIES mostlyclean-compile \
+ 		mostlyclean-libtool mostlyclean-noinstPROGRAMS \
+-		mostlyclean-tags mostlyclean-generic
++		mostlyclean-tags mostlyclean-depend mostlyclean-generic
+ 
+ mostlyclean: mostlyclean-am
+ 
+ clean-am:  clean-pkglibLIBRARIES clean-compile clean-libtool \
+-		clean-noinstPROGRAMS clean-tags clean-generic \
+-		mostlyclean-am
++		clean-noinstPROGRAMS clean-tags clean-depend \
++		clean-generic mostlyclean-am
+ 
+ clean: clean-am
+ 
+ distclean-am:  distclean-pkglibLIBRARIES distclean-compile \
+ 		distclean-libtool distclean-noinstPROGRAMS \
+-		distclean-tags distclean-generic clean-am
++		distclean-tags distclean-depend distclean-generic \
++		clean-am
+ 	-rm -f libtool
+ 
+ distclean: distclean-am
+@@ -662,7 +474,8 @@
+ maintainer-clean-am:  maintainer-clean-pkglibLIBRARIES \
+ 		maintainer-clean-compile maintainer-clean-libtool \
+ 		maintainer-clean-noinstPROGRAMS maintainer-clean-tags \
+-		maintainer-clean-generic distclean-am
++		maintainer-clean-depend maintainer-clean-generic \
++		distclean-am
+ 	@echo "This command is intended for maintainers to use;"
+ 	@echo "it deletes files that may require special tools to rebuild."
+ 
+@@ -676,12 +489,13 @@
+ maintainer-clean-libtool mostlyclean-noinstPROGRAMS \
+ distclean-noinstPROGRAMS clean-noinstPROGRAMS \
+ maintainer-clean-noinstPROGRAMS tags mostlyclean-tags distclean-tags \
+-clean-tags maintainer-clean-tags distdir info-am info dvi-am dvi check \
+-check-am installcheck-am installcheck install-exec-am install-exec \
+-install-data-am install-data install-am install uninstall-am uninstall \
+-all-redirect all-am all installdirs mostlyclean-generic \
+-distclean-generic clean-generic maintainer-clean-generic clean \
+-mostlyclean distclean maintainer-clean
++clean-tags maintainer-clean-tags distdir mostlyclean-depend \
++distclean-depend clean-depend maintainer-clean-depend info-am info \
++dvi-am dvi check check-am installcheck-am installcheck install-exec-am \
++install-exec install-data-am install-data install-am install \
++uninstall-am uninstall all-redirect all-am all installdirs \
++mostlyclean-generic distclean-generic clean-generic \
++maintainer-clean-generic clean mostlyclean distclean maintainer-clean
+ 
+ 
+ # Don't update the files from bitkeeper
+diff -r -u mysql-3.23.36.orig/include/Makefile.in mysql-3.23.36/include/Makefile.in
+--- mysql-3.23.36.orig/include/Makefile.in	Tue Mar 27 10:19:48 2001
++++ mysql-3.23.36/include/Makefile.in	Fri Apr 13 16:23:23 2001
+@@ -198,14 +198,14 @@
+ 
+ DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST)
+ 
+-TAR = gtar
++TAR = tar
+ GZIP_ENV = --best
+ all: all-redirect
+ .SUFFIXES:
+ $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) 
+-	cd $(top_srcdir) && $(AUTOMAKE) --gnu --include-deps include/Makefile
++	cd $(top_srcdir) && $(AUTOMAKE) --gnu include/Makefile
+ 
+-Makefile: $(srcdir)/Makefile.in  $(top_builddir)/config.status
++Makefile: $(srcdir)/Makefile.in  $(top_builddir)/config.status $(BUILT_SOURCES)
+ 	cd $(top_builddir) \
+ 	  && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status
+ 
+@@ -261,10 +261,15 @@
+ subdir = include
+ 
+ distdir: $(DISTFILES)
++	here=`cd $(top_builddir) && pwd`; \
++	top_distdir=`cd $(top_distdir) && pwd`; \
++	distdir=`cd $(distdir) && pwd`; \
++	cd $(top_srcdir) \
++	  && $(AUTOMAKE) --include-deps --build-dir=$$here --srcdir-name=$(top_srcdir) --output-dir=$$top_distdir --gnu include/Makefile
+ 	@for file in $(DISTFILES); do \
+ 	  d=$(srcdir); \
+ 	  if test -d $$d/$$file; then \
+-	    cp -pr $$d/$$file $(distdir)/$$file; \
++	    cp -pr $$/$$file $(distdir)/$$file; \
+ 	  else \
+ 	    test -f $(distdir)/$$file \
+ 	    || ln $$d/$$file $(distdir)/$$file 2> /dev/null \
+diff -r -u mysql-3.23.36.orig/isam/Makefile.in mysql-3.23.36/isam/Makefile.in
+--- mysql-3.23.36.orig/isam/Makefile.in	Tue Mar 27 10:20:19 2001
++++ mysql-3.23.36/isam/Makefile.in	Fri Apr 13 16:23:20 2001
+@@ -245,8 +245,17 @@
+ 
+ DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST)
+ 
+-TAR = gtar
++TAR = tar
+ GZIP_ENV = --best
++DEP_FILES =  .deps/_cache.P .deps/_dbug.P .deps/_dynrec.P .deps/_key.P \
++.deps/_locking.P .deps/_packrec.P .deps/_page.P .deps/_search.P \
++.deps/_statrec.P .deps/changed.P .deps/close.P .deps/create.P \
++.deps/delete.P .deps/extra.P .deps/info.P .deps/isamchk.P \
++.deps/isamlog.P .deps/log.P .deps/open.P .deps/pack_isam.P \
++.deps/panic.P .deps/range.P .deps/rfirst.P .deps/rkey.P .deps/rlast.P \
++.deps/rnext.P .deps/rprev.P .deps/rrnd.P .deps/rsame.P .deps/rsamepos.P \
++.deps/sort.P .deps/static.P .deps/test1.P .deps/test2.P .deps/test3.P \
++.deps/update.P .deps/write.P
+ SOURCES = $(libnisam_a_SOURCES) $(isamchk_SOURCES) isamlog.c pack_isam.c test1.c test2.c test3.c
+ OBJECTS = $(libnisam_a_OBJECTS) $(isamchk_OBJECTS) isamlog.o pack_isam.o test1.o test2.o test3.o
+ 
+@@ -254,9 +263,9 @@
+ .SUFFIXES:
+ .SUFFIXES: .S .c .lo .o .s
+ $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) 
+-	cd $(top_srcdir) && $(AUTOMAKE) --gnu --include-deps isam/Makefile
++	cd $(top_srcdir) && $(AUTOMAKE) --gnu isam/Makefile
+ 
+-Makefile: $(srcdir)/Makefile.in  $(top_builddir)/config.status
++Makefile: $(srcdir)/Makefile.in  $(top_builddir)/config.status $(BUILT_SOURCES)
+ 	cd $(top_builddir) \
+ 	  && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status
+ 
+@@ -293,9 +302,6 @@
+ 	  rm -f $(DESTDIR)$(pkglibdir)/$$p; \
+ 	done
+ 
+-.c.o:
+-	$(COMPILE) -c $<
+-
+ .s.o:
+ 	$(COMPILE) -c $<
+ 
+@@ -312,9 +318,6 @@
+ 
+ maintainer-clean-compile:
+ 
+-.c.lo:
+-	$(LIBTOOL) --mode=compile $(COMPILE) -c $<
+-
+ .s.lo:
+ 	$(LIBTOOL) --mode=compile $(COMPILE) -c $<
+ 
+@@ -428,350 +431,53 @@
+ subdir = isam
+ 
+ distdir: $(DISTFILES)
++	here=`cd $(top_builddir) && pwd`; \
++	top_distdir=`cd $(top_distdir) && pwd`; \
++	distdir=`cd $(distdir) && pwd`; \
++	cd $(top_srcdir) \
++	  && $(AUTOMAKE) --include-deps --build-dir=$$here --srcdir-name=$(top_srcdir) --output-dir=$$top_distdir --gnu isam/Makefile
+ 	@for file in $(DISTFILES); do \
+ 	  d=$(srcdir); \
+ 	  if test -d $$d/$$file; then \
+-	    cp -pr $$d/$$file $(distdir)/$$file; \
++	    cp -pr $$/$$file $(distdir)/$$file; \
+ 	  else \
+ 	    test -f $(distdir)/$$file \
+ 	    || ln $$d/$$file $(distdir)/$$file 2> /dev/null \
+ 	    || cp -p $$d/$$file $(distdir)/$$file || :; \
+ 	  fi; \
+ 	done
+-_cache.o: _cache.c isamdef.h ../include/nisam.h ../include/my_base.h \
+-	../include/global.h ../include/my_config.h \
+-	../mit-pthreads/include/bits/local_lim.h \
+-	../mit-pthreads/include/endian.h ../include/dbug.h \
+-	../include/my_dir.h ../include/my_sys.h ../include/my_pthread.h \
+-	../mit-pthreads/include/pthread/config.h \
+-	../mit-pthreads/include/sched.h ../include/m_ctype.h \
+-	../include/raid.h ../include/m_string.h ../include/my_list.h \
+-	../include/thr_lock.h
+-_dbug.o: _dbug.c isamdef.h ../include/nisam.h ../include/my_base.h \
+-	../include/global.h ../include/my_config.h \
+-	../mit-pthreads/include/bits/local_lim.h \
+-	../mit-pthreads/include/endian.h ../include/dbug.h \
+-	../include/my_dir.h ../include/my_sys.h ../include/my_pthread.h \
+-	../mit-pthreads/include/pthread/config.h \
+-	../mit-pthreads/include/sched.h ../include/m_ctype.h \
+-	../include/raid.h ../include/m_string.h ../include/my_list.h \
+-	../include/thr_lock.h
+-_dynrec.o: _dynrec.c isamdef.h ../include/nisam.h ../include/my_base.h \
+-	../include/global.h ../include/my_config.h \
+-	../mit-pthreads/include/bits/local_lim.h \
+-	../mit-pthreads/include/endian.h ../include/dbug.h \
+-	../include/my_dir.h ../include/my_sys.h ../include/my_pthread.h \
+-	../mit-pthreads/include/pthread/config.h \
+-	../mit-pthreads/include/sched.h ../include/m_ctype.h \
+-	../include/raid.h ../include/m_string.h ../include/my_list.h \
+-	../include/thr_lock.h
+-_key.o: _key.c isamdef.h ../include/nisam.h ../include/my_base.h \
+-	../include/global.h ../include/my_config.h \
+-	../mit-pthreads/include/bits/local_lim.h \
+-	../mit-pthreads/include/endian.h ../include/dbug.h \
+-	../include/my_dir.h ../include/my_sys.h ../include/my_pthread.h \
+-	../mit-pthreads/include/pthread/config.h \
+-	../mit-pthreads/include/sched.h ../include/m_ctype.h \
+-	../include/raid.h ../include/m_string.h ../include/my_list.h \
+-	../include/thr_lock.h
+-_locking.o: _locking.c isamdef.h ../include/nisam.h ../include/my_base.h \
+-	../include/global.h ../include/my_config.h \
+-	../mit-pthreads/include/bits/local_lim.h \
+-	../mit-pthreads/include/endian.h ../include/dbug.h \
+-	../include/my_dir.h ../include/my_sys.h ../include/my_pthread.h \
+-	../mit-pthreads/include/pthread/config.h \
+-	../mit-pthreads/include/sched.h ../include/m_ctype.h \
+-	../include/raid.h ../include/m_string.h ../include/my_list.h \
+-	../include/thr_lock.h
+-_packrec.o: _packrec.c isamdef.h ../include/nisam.h ../include/my_base.h \
+-	../include/global.h ../include/my_config.h \
+-	../mit-pthreads/include/bits/local_lim.h \
+-	../mit-pthreads/include/endian.h ../include/dbug.h \
+-	../include/my_dir.h ../include/my_sys.h ../include/my_pthread.h \
+-	../mit-pthreads/include/pthread/config.h \
+-	../mit-pthreads/include/sched.h ../include/m_ctype.h \
+-	../include/raid.h ../include/m_string.h ../include/my_list.h \
+-	../include/thr_lock.h
+-_page.o: _page.c isamdef.h ../include/nisam.h ../include/my_base.h \
+-	../include/global.h ../include/my_config.h \
+-	../mit-pthreads/include/bits/local_lim.h \
+-	../mit-pthreads/include/endian.h ../include/dbug.h \
+-	../include/my_dir.h ../include/my_sys.h ../include/my_pthread.h \
+-	../mit-pthreads/include/pthread/config.h \
+-	../mit-pthreads/include/sched.h ../include/m_ctype.h \
+-	../include/raid.h ../include/m_string.h ../include/my_list.h \
+-	../include/thr_lock.h
+-_search.o: _search.c isamdef.h ../include/nisam.h ../include/my_base.h \
+-	../include/global.h ../include/my_config.h \
+-	../mit-pthreads/include/bits/local_lim.h \
+-	../mit-pthreads/include/endian.h ../include/dbug.h \
+-	../include/my_dir.h ../include/my_sys.h ../include/my_pthread.h \
+-	../mit-pthreads/include/pthread/config.h \
+-	../mit-pthreads/include/sched.h ../include/m_ctype.h \
+-	../include/raid.h ../include/m_string.h ../include/my_list.h \
+-	../include/thr_lock.h
+-_statrec.o: _statrec.c isamdef.h ../include/nisam.h ../include/my_base.h \
+-	../include/global.h ../include/my_config.h \
+-	../mit-pthreads/include/bits/local_lim.h \
+-	../mit-pthreads/include/endian.h ../include/dbug.h \
+-	../include/my_dir.h ../include/my_sys.h ../include/my_pthread.h \
+-	../mit-pthreads/include/pthread/config.h \
+-	../mit-pthreads/include/sched.h ../include/m_ctype.h \
+-	../include/raid.h ../include/m_string.h ../include/my_list.h \
+-	../include/thr_lock.h
+-changed.o: changed.c isamdef.h ../include/nisam.h ../include/my_base.h \
+-	../include/global.h ../include/my_config.h \
+-	../mit-pthreads/include/bits/local_lim.h \
+-	../mit-pthreads/include/endian.h ../include/dbug.h \
+-	../include/my_dir.h ../include/my_sys.h ../include/my_pthread.h \
+-	../mit-pthreads/include/pthread/config.h \
+-	../mit-pthreads/include/sched.h ../include/m_ctype.h \
+-	../include/raid.h ../include/m_string.h ../include/my_list.h \
+-	../include/thr_lock.h
+-close.o: close.c isamdef.h ../include/nisam.h ../include/my_base.h \
+-	../include/global.h ../include/my_config.h \
+-	../mit-pthreads/include/bits/local_lim.h \
+-	../mit-pthreads/include/endian.h ../include/dbug.h \
+-	../include/my_dir.h ../include/my_sys.h ../include/my_pthread.h \
+-	../mit-pthreads/include/pthread/config.h \
+-	../mit-pthreads/include/sched.h ../include/m_ctype.h \
+-	../include/raid.h ../include/m_string.h ../include/my_list.h \
+-	../include/thr_lock.h
+-create.o: create.c isamdef.h ../include/nisam.h ../include/my_base.h \
+-	../include/global.h ../include/my_config.h \
+-	../mit-pthreads/include/bits/local_lim.h \
+-	../mit-pthreads/include/endian.h ../include/dbug.h \
+-	../include/my_dir.h ../include/my_sys.h ../include/my_pthread.h \
+-	../mit-pthreads/include/pthread/config.h \
+-	../mit-pthreads/include/sched.h ../include/m_ctype.h \
+-	../include/raid.h ../include/m_string.h ../include/my_list.h \
+-	../include/thr_lock.h
+-delete.o: delete.c isamdef.h ../include/nisam.h ../include/my_base.h \
+-	../include/global.h ../include/my_config.h \
+-	../mit-pthreads/include/bits/local_lim.h \
+-	../mit-pthreads/include/endian.h ../include/dbug.h \
+-	../include/my_dir.h ../include/my_sys.h ../include/my_pthread.h \
+-	../mit-pthreads/include/pthread/config.h \
+-	../mit-pthreads/include/sched.h ../include/m_ctype.h \
+-	../include/raid.h ../include/m_string.h ../include/my_list.h \
+-	../include/thr_lock.h
+-extra.o: extra.c isamdef.h ../include/nisam.h ../include/my_base.h \
+-	../include/global.h ../include/my_config.h \
+-	../mit-pthreads/include/bits/local_lim.h \
+-	../mit-pthreads/include/endian.h ../include/dbug.h \
+-	../include/my_dir.h ../include/my_sys.h ../include/my_pthread.h \
+-	../mit-pthreads/include/pthread/config.h \
+-	../mit-pthreads/include/sched.h ../include/m_ctype.h \
+-	../include/raid.h ../include/m_string.h ../include/my_list.h \
+-	../include/thr_lock.h
+-info.o: info.c isamdef.h ../include/nisam.h ../include/my_base.h \
+-	../include/global.h ../include/my_config.h \
+-	../mit-pthreads/include/bits/local_lim.h \
+-	../mit-pthreads/include/endian.h ../include/dbug.h \
+-	../include/my_dir.h ../include/my_sys.h ../include/my_pthread.h \
+-	../mit-pthreads/include/pthread/config.h \
+-	../mit-pthreads/include/sched.h ../include/m_ctype.h \
+-	../include/raid.h ../include/m_string.h ../include/my_list.h \
+-	../include/thr_lock.h
+-isamchk.o: isamchk.c isamdef.h ../include/nisam.h ../include/my_base.h \
+-	../include/global.h ../include/my_config.h \
+-	../mit-pthreads/include/bits/local_lim.h \
+-	../mit-pthreads/include/endian.h ../include/dbug.h \
+-	../include/my_dir.h ../include/my_sys.h ../include/my_pthread.h \
+-	../mit-pthreads/include/pthread/config.h \
+-	../mit-pthreads/include/sched.h ../include/m_ctype.h \
+-	../include/raid.h ../include/m_string.h ../include/my_list.h \
+-	../include/thr_lock.h ../include/getopt.h
+-isamlog.o: isamlog.c isamdef.h ../include/nisam.h ../include/my_base.h \
+-	../include/global.h ../include/my_config.h \
+-	../mit-pthreads/include/bits/local_lim.h \
+-	../mit-pthreads/include/endian.h ../include/dbug.h \
+-	../include/my_dir.h ../include/my_sys.h ../include/my_pthread.h \
+-	../mit-pthreads/include/pthread/config.h \
+-	../mit-pthreads/include/sched.h ../include/m_ctype.h \
+-	../include/raid.h ../include/m_string.h ../include/my_list.h \
+-	../include/thr_lock.h ../include/my_tree.h
+-log.o: log.c isamdef.h ../include/nisam.h ../include/my_base.h \
+-	../include/global.h ../include/my_config.h \
+-	../mit-pthreads/include/bits/local_lim.h \
+-	../mit-pthreads/include/endian.h ../include/dbug.h \
+-	../include/my_dir.h ../include/my_sys.h ../include/my_pthread.h \
+-	../mit-pthreads/include/pthread/config.h \
+-	../mit-pthreads/include/sched.h ../include/m_ctype.h \
+-	../include/raid.h ../include/m_string.h ../include/my_list.h \
+-	../include/thr_lock.h
+-open.o: open.c isamdef.h ../include/nisam.h ../include/my_base.h \
+-	../include/global.h ../include/my_config.h \
+-	../mit-pthreads/include/bits/local_lim.h \
+-	../mit-pthreads/include/endian.h ../include/dbug.h \
+-	../include/my_dir.h ../include/my_sys.h ../include/my_pthread.h \
+-	../mit-pthreads/include/pthread/config.h \
+-	../mit-pthreads/include/sched.h ../include/m_ctype.h \
+-	../include/raid.h ../include/m_string.h ../include/my_list.h \
+-	../include/thr_lock.h
+-pack_isam.o: pack_isam.c isamdef.h ../include/nisam.h \
+-	../include/my_base.h ../include/global.h ../include/my_config.h \
+-	../mit-pthreads/include/bits/local_lim.h \
+-	../mit-pthreads/include/endian.h ../include/dbug.h \
+-	../include/my_dir.h ../include/my_sys.h ../include/my_pthread.h \
+-	../mit-pthreads/include/pthread/config.h \
+-	../mit-pthreads/include/sched.h ../include/m_ctype.h \
+-	../include/raid.h ../include/m_string.h ../include/my_list.h \
+-	../include/thr_lock.h ../include/queues.h ../include/my_tree.h \
+-	../include/mysys_err.h ../include/getopt.h
+-panic.o: panic.c isamdef.h ../include/nisam.h ../include/my_base.h \
+-	../include/global.h ../include/my_config.h \
+-	../mit-pthreads/include/bits/local_lim.h \
+-	../mit-pthreads/include/endian.h ../include/dbug.h \
+-	../include/my_dir.h ../include/my_sys.h ../include/my_pthread.h \
+-	../mit-pthreads/include/pthread/config.h \
+-	../mit-pthreads/include/sched.h ../include/m_ctype.h \
+-	../include/raid.h ../include/m_string.h ../include/my_list.h \
+-	../include/thr_lock.h
+-range.o: range.c isamdef.h ../include/nisam.h ../include/my_base.h \
+-	../include/global.h ../include/my_config.h \
+-	../mit-pthreads/include/bits/local_lim.h \
+-	../mit-pthreads/include/endian.h ../include/dbug.h \
+-	../include/my_dir.h ../include/my_sys.h ../include/my_pthread.h \
+-	../mit-pthreads/include/pthread/config.h \
+-	../mit-pthreads/include/sched.h ../include/m_ctype.h \
+-	../include/raid.h ../include/m_string.h ../include/my_list.h \
+-	../include/thr_lock.h
+-rfirst.o: rfirst.c isamdef.h ../include/nisam.h ../include/my_base.h \
+-	../include/global.h ../include/my_config.h \
+-	../mit-pthreads/include/bits/local_lim.h \
+-	../mit-pthreads/include/endian.h ../include/dbug.h \
+-	../include/my_dir.h ../include/my_sys.h ../include/my_pthread.h \
+-	../mit-pthreads/include/pthread/config.h \
+-	../mit-pthreads/include/sched.h ../include/m_ctype.h \
+-	../include/raid.h ../include/m_string.h ../include/my_list.h \
+-	../include/thr_lock.h
+-rkey.o: rkey.c isamdef.h ../include/nisam.h ../include/my_base.h \
+-	../include/global.h ../include/my_config.h \
+-	../mit-pthreads/include/bits/local_lim.h \
+-	../mit-pthreads/include/endian.h ../include/dbug.h \
+-	../include/my_dir.h ../include/my_sys.h ../include/my_pthread.h \
+-	../mit-pthreads/include/pthread/config.h \
+-	../mit-pthreads/include/sched.h ../include/m_ctype.h \
+-	../include/raid.h ../include/m_string.h ../include/my_list.h \
+-	../include/thr_lock.h
+-rlast.o: rlast.c isamdef.h ../include/nisam.h ../include/my_base.h \
+-	../include/global.h ../include/my_config.h \
+-	../mit-pthreads/include/bits/local_lim.h \
+-	../mit-pthreads/include/endian.h ../include/dbug.h \
+-	../include/my_dir.h ../include/my_sys.h ../include/my_pthread.h \
+-	../mit-pthreads/include/pthread/config.h \
+-	../mit-pthreads/include/sched.h ../include/m_ctype.h \
+-	../include/raid.h ../include/m_string.h ../include/my_list.h \
+-	../include/thr_lock.h
+-rnext.o: rnext.c isamdef.h ../include/nisam.h ../include/my_base.h \
+-	../include/global.h ../include/my_config.h \
+-	../mit-pthreads/include/bits/local_lim.h \
+-	../mit-pthreads/include/endian.h ../include/dbug.h \
+-	../include/my_dir.h ../include/my_sys.h ../include/my_pthread.h \
+-	../mit-pthreads/include/pthread/config.h \
+-	../mit-pthreads/include/sched.h ../include/m_ctype.h \
+-	../include/raid.h ../include/m_string.h ../include/my_list.h \
+-	../include/thr_lock.h
+-rprev.o: rprev.c isamdef.h ../include/nisam.h ../include/my_base.h \
+-	../include/global.h ../include/my_config.h \
+-	../mit-pthreads/include/bits/local_lim.h \
+-	../mit-pthreads/include/endian.h ../include/dbug.h \
+-	../include/my_dir.h ../include/my_sys.h ../include/my_pthread.h \
+-	../mit-pthreads/include/pthread/config.h \
+-	../mit-pthreads/include/sched.h ../include/m_ctype.h \
+-	../include/raid.h ../include/m_string.h ../include/my_list.h \
+-	../include/thr_lock.h
+-rrnd.o: rrnd.c isamdef.h ../include/nisam.h ../include/my_base.h \
+-	../include/global.h ../include/my_config.h \
+-	../mit-pthreads/include/bits/local_lim.h \
+-	../mit-pthreads/include/endian.h ../include/dbug.h \
+-	../include/my_dir.h ../include/my_sys.h ../include/my_pthread.h \
+-	../mit-pthreads/include/pthread/config.h \
+-	../mit-pthreads/include/sched.h ../include/m_ctype.h \
+-	../include/raid.h ../include/m_string.h ../include/my_list.h \
+-	../include/thr_lock.h
+-rsame.o: rsame.c isamdef.h ../include/nisam.h ../include/my_base.h \
+-	../include/global.h ../include/my_config.h \
+-	../mit-pthreads/include/bits/local_lim.h \
+-	../mit-pthreads/include/endian.h ../include/dbug.h \
+-	../include/my_dir.h ../include/my_sys.h ../include/my_pthread.h \
+-	../mit-pthreads/include/pthread/config.h \
+-	../mit-pthreads/include/sched.h ../include/m_ctype.h \
+-	../include/raid.h ../include/m_string.h ../include/my_list.h \
+-	../include/thr_lock.h
+-rsamepos.o: rsamepos.c isamdef.h ../include/nisam.h ../include/my_base.h \
+-	../include/global.h ../include/my_config.h \
+-	../mit-pthreads/include/bits/local_lim.h \
+-	../mit-pthreads/include/endian.h ../include/dbug.h \
+-	../include/my_dir.h ../include/my_sys.h ../include/my_pthread.h \
+-	../mit-pthreads/include/pthread/config.h \
+-	../mit-pthreads/include/sched.h ../include/m_ctype.h \
+-	../include/raid.h ../include/m_string.h ../include/my_list.h \
+-	../include/thr_lock.h
+-sort.o: sort.c isamdef.h ../include/nisam.h ../include/my_base.h \
+-	../include/global.h ../include/my_config.h \
+-	../mit-pthreads/include/bits/local_lim.h \
+-	../mit-pthreads/include/endian.h ../include/dbug.h \
+-	../include/my_dir.h ../include/my_sys.h ../include/my_pthread.h \
+-	../mit-pthreads/include/pthread/config.h \
+-	../mit-pthreads/include/sched.h ../include/m_ctype.h \
+-	../include/raid.h ../include/m_string.h ../include/my_list.h \
+-	../include/thr_lock.h ../include/queues.h
+-static.o: static.c isamdef.h ../include/nisam.h ../include/my_base.h \
+-	../include/global.h ../include/my_config.h \
+-	../mit-pthreads/include/bits/local_lim.h \
+-	../mit-pthreads/include/endian.h ../include/dbug.h \
+-	../include/my_dir.h ../include/my_sys.h ../include/my_pthread.h \
+-	../mit-pthreads/include/pthread/config.h \
+-	../mit-pthreads/include/sched.h ../include/m_ctype.h \
+-	../include/raid.h ../include/m_string.h ../include/my_list.h \
+-	../include/thr_lock.h
+-test1.o: test1.c isamdef.h ../include/nisam.h ../include/my_base.h \
+-	../include/global.h ../include/my_config.h \
+-	../mit-pthreads/include/bits/local_lim.h \
+-	../mit-pthreads/include/endian.h ../include/dbug.h \
+-	../include/my_dir.h ../include/my_sys.h ../include/my_pthread.h \
+-	../mit-pthreads/include/pthread/config.h \
+-	../mit-pthreads/include/sched.h ../include/m_ctype.h \
+-	../include/raid.h ../include/m_string.h ../include/my_list.h \
+-	../include/thr_lock.h
+-test2.o: test2.c isamdef.h ../include/nisam.h ../include/my_base.h \
+-	../include/global.h ../include/my_config.h \
+-	../mit-pthreads/include/bits/local_lim.h \
+-	../mit-pthreads/include/endian.h ../include/dbug.h \
+-	../include/my_dir.h ../include/my_sys.h ../include/my_pthread.h \
+-	../mit-pthreads/include/pthread/config.h \
+-	../mit-pthreads/include/sched.h ../include/m_ctype.h \
+-	../include/raid.h ../include/m_string.h ../include/my_list.h \
+-	../include/thr_lock.h
+-test3.o: test3.c ../include/nisam.h ../include/my_base.h \
+-	../include/global.h ../include/my_config.h \
+-	../mit-pthreads/include/bits/local_lim.h \
+-	../mit-pthreads/include/endian.h ../include/dbug.h \
+-	../include/my_dir.h ../include/my_sys.h ../include/my_pthread.h \
+-	../mit-pthreads/include/pthread/config.h \
+-	../mit-pthreads/include/sched.h ../include/m_ctype.h \
+-	../include/raid.h ../include/m_string.h ../include/my_list.h
+-update.o: update.c isamdef.h ../include/nisam.h ../include/my_base.h \
+-	../include/global.h ../include/my_config.h \
+-	../mit-pthreads/include/bits/local_lim.h \
+-	../mit-pthreads/include/endian.h ../include/dbug.h \
+-	../include/my_dir.h ../include/my_sys.h ../include/my_pthread.h \
+-	../mit-pthreads/include/pthread/config.h \
+-	../mit-pthreads/include/sched.h ../include/m_ctype.h \
+-	../include/raid.h ../include/m_string.h ../include/my_list.h \
+-	../include/thr_lock.h
+-write.o: write.c isamdef.h ../include/nisam.h ../include/my_base.h \
+-	../include/global.h ../include/my_config.h \
+-	../mit-pthreads/include/bits/local_lim.h \
+-	../mit-pthreads/include/endian.h ../include/dbug.h \
+-	../include/my_dir.h ../include/my_sys.h ../include/my_pthread.h \
+-	../mit-pthreads/include/pthread/config.h \
+-	../mit-pthreads/include/sched.h ../include/m_ctype.h \
+-	../include/raid.h ../include/m_string.h ../include/my_list.h \
+-	../include/thr_lock.h
+ 
++DEPS_MAGIC := $(shell mkdir .deps > /dev/null 2>&1 || :)
++
++-include $(DEP_FILES)
++
++mostlyclean-depend:
++
++clean-depend:
++
++distclean-depend:
++	-rm -rf .deps
++
++maintainer-clean-depend:
++
++%.o: %.c
++	@echo '$(COMPILE) -c $<'; \
++	$(COMPILE) -Wp,-MD,.deps/$(*F).pp -c $<
++	@-cp .deps/$(*F).pp .deps/$(*F).P; \
++	tr ' ' '\012' < .deps/$(*F).pp \
++	  | sed -e 's/^\\$$//' -e '/^$$/ d' -e '/:$$/ d' -e 's/$$/ :/' \
++	    >> .deps/$(*F).P; \
++	rm .deps/$(*F).pp
++
++%.lo: %.c
++	@echo '$(LTCOMPILE) -c $<'; \
++	$(LTCOMPILE) -Wp,-MD,.deps/$(*F).pp -c $<
++	@-sed -e 's/^\([^:]*\)\.o[ 	]*:/\1.lo \1.o :/' \
++	  < .deps/$(*F).pp > .deps/$(*F).P; \
++	tr ' ' '\012' < .deps/$(*F).pp \
++	  | sed -e 's/^\\$$//' -e '/^$$/ d' -e '/:$$/ d' -e 's/$$/ :/' \
++	    >> .deps/$(*F).P; \
++	rm -f .deps/$(*F).pp
+ info-am:
+ info: info-am
+ dvi-am:
+@@ -812,20 +518,20 @@
+ mostlyclean-am:  mostlyclean-pkglibLIBRARIES mostlyclean-compile \
+ 		mostlyclean-libtool mostlyclean-binPROGRAMS \
+ 		mostlyclean-noinstPROGRAMS mostlyclean-tags \
+-		mostlyclean-generic
++		mostlyclean-depend mostlyclean-generic
+ 
+ mostlyclean: mostlyclean-am
+ 
+ clean-am:  clean-pkglibLIBRARIES clean-compile clean-libtool \
+ 		clean-binPROGRAMS clean-noinstPROGRAMS clean-tags \
+-		clean-generic mostlyclean-am
++		clean-depend clean-generic mostlyclean-am
+ 
+ clean: clean-am
+ 
+ distclean-am:  distclean-pkglibLIBRARIES distclean-compile \
+ 		distclean-libtool distclean-binPROGRAMS \
+ 		distclean-noinstPROGRAMS distclean-tags \
+-		distclean-generic clean-am
++		distclean-depend distclean-generic clean-am
+ 	-rm -f libtool
+ 
+ distclean: distclean-am
+@@ -834,7 +540,8 @@
+ 		maintainer-clean-compile maintainer-clean-libtool \
+ 		maintainer-clean-binPROGRAMS \
+ 		maintainer-clean-noinstPROGRAMS maintainer-clean-tags \
+-		maintainer-clean-generic distclean-am
++		maintainer-clean-depend maintainer-clean-generic \
++		distclean-am
+ 	@echo "This command is intended for maintainers to use;"
+ 	@echo "it deletes files that may require special tools to rebuild."
+ 
+@@ -850,11 +557,13 @@
+ install-binPROGRAMS mostlyclean-noinstPROGRAMS distclean-noinstPROGRAMS \
+ clean-noinstPROGRAMS maintainer-clean-noinstPROGRAMS tags \
+ mostlyclean-tags distclean-tags clean-tags maintainer-clean-tags \
+-distdir info-am info dvi-am dvi check check-am installcheck-am \
+-installcheck install-exec-am install-exec install-data-am install-data \
+-install-am install uninstall-am uninstall all-redirect all-am all \
+-installdirs mostlyclean-generic distclean-generic clean-generic \
+-maintainer-clean-generic clean mostlyclean distclean maintainer-clean
++distdir mostlyclean-depend distclean-depend clean-depend \
++maintainer-clean-depend info-am info dvi-am dvi check check-am \
++installcheck-am installcheck install-exec-am install-exec \
++install-data-am install-data install-am install uninstall-am uninstall \
++all-redirect all-am all installdirs mostlyclean-generic \
++distclean-generic clean-generic maintainer-clean-generic clean \
++mostlyclean distclean maintainer-clean
+ 
+ 
+ # Move to automake rules ?
+diff -r -u mysql-3.23.36.orig/libmysql/Makefile.in mysql-3.23.36/libmysql/Makefile.in
+--- mysql-3.23.36.orig/libmysql/Makefile.in	Tue Mar 27 10:19:53 2001
++++ mysql-3.23.36/libmysql/Makefile.in	Fri Apr 13 16:23:22 2001
+@@ -269,8 +269,10 @@
+ 
+ DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST)
+ 
+-TAR = gtar
++TAR = tar
+ GZIP_ENV = --best
++DEP_FILES =  .deps/conf_to_src.P .deps/errmsg.P .deps/get_password.P \
++.deps/libmysql.P .deps/net.P .deps/password.P .deps/violite.P
+ SOURCES = $(libmysqlclient_la_SOURCES) $(conf_to_src_SOURCES)
+ OBJECTS = $(libmysqlclient_la_OBJECTS) $(conf_to_src_OBJECTS)
+ 
+@@ -278,9 +280,9 @@
+ .SUFFIXES:
+ .SUFFIXES: .S .c .lo .o .s
+ $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) $(srcdir)/Makefile.shared
+-	cd $(top_srcdir) && $(AUTOMAKE) --gnu --include-deps libmysql/Makefile
++	cd $(top_srcdir) && $(AUTOMAKE) --gnu libmysql/Makefile
+ 
+-Makefile: $(srcdir)/Makefile.in  $(top_builddir)/config.status
++Makefile: $(srcdir)/Makefile.in  $(top_builddir)/config.status $(BUILT_SOURCES)
+ 	cd $(top_builddir) \
+ 	  && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status
+ 
+@@ -310,9 +312,6 @@
+ 	  $(LIBTOOL)  --mode=uninstall rm -f $(DESTDIR)$(pkglibdir)/$$p; \
+ 	done
+ 
+-.c.o:
+-	$(COMPILE) -c $<
+-
+ .s.o:
+ 	$(COMPILE) -c $<
+ 
+@@ -329,9 +328,6 @@
+ 
+ maintainer-clean-compile:
+ 
+-.c.lo:
+-	$(LIBTOOL) --mode=compile $(COMPILE) -c $<
+-
+ .s.lo:
+ 	$(LIBTOOL) --mode=compile $(COMPILE) -c $<
+ 
+@@ -398,288 +394,53 @@
+ subdir = libmysql
+ 
+ distdir: $(DISTFILES)
++	here=`cd $(top_builddir) && pwd`; \
++	top_distdir=`cd $(top_distdir) && pwd`; \
++	distdir=`cd $(distdir) && pwd`; \
++	cd $(top_srcdir) \
++	  && $(AUTOMAKE) --include-deps --build-dir=$$here --srcdir-name=$(top_srcdir) --output-dir=$$top_distdir --gnu libmysql/Makefile
+ 	@for file in $(DISTFILES); do \
+ 	  d=$(srcdir); \
+ 	  if test -d $$d/$$file; then \
+-	    cp -pr $$d/$$file $(distdir)/$$file; \
++	    cp -pr $$/$$file $(distdir)/$$file; \
+ 	  else \
+ 	    test -f $(distdir)/$$file \
+ 	    || ln $$d/$$file $(distdir)/$$file 2> /dev/null \
+ 	    || cp -p $$d/$$file $(distdir)/$$file || :; \
+ 	  fi; \
+ 	done
+-array.lo array.o : array.c mysys_priv.h ../include/global.h \
+-	../include/my_config.h ../include/getopt.h ../include/dbug.h \
+-	../include/my_sys.h ../include/m_ctype.h ../include/raid.h \
+-	../include/m_string.h
+-bchange.lo bchange.o : bchange.c ../include/global.h \
+-	../include/my_config.h ../include/getopt.h ../include/dbug.h \
+-	../include/m_string.h
+-bmove.lo bmove.o : bmove.c ../include/global.h ../include/my_config.h \
+-	../include/getopt.h ../include/dbug.h ../include/m_string.h
+-bmove_upp.lo bmove_upp.o : bmove_upp.c ../include/global.h \
+-	../include/my_config.h ../include/getopt.h ../include/dbug.h \
+-	../include/m_string.h
+-charset.lo charset.o : charset.c mysys_priv.h ../include/global.h \
+-	../include/my_config.h ../include/getopt.h ../include/dbug.h \
+-	../include/my_sys.h ../include/m_ctype.h ../include/raid.h \
+-	../include/mysys_err.h ../include/m_string.h \
+-	../include/my_dir.h
+-conf_to_src.o: conf_to_src.c ../include/getopt.h
+-ctype.lo ctype.o : ctype.c ../include/global.h ../include/my_config.h \
+-	../include/getopt.h ../include/dbug.h ../include/m_ctype.h \
+-	ctype_extra_sources.c ctype_autoconf.c
+-dbug.lo dbug.o : dbug.c ../include/global.h ../include/my_config.h \
+-	../include/getopt.h ../include/dbug.h ../include/m_string.h
+-default.lo default.o : default.c mysys_priv.h ../include/global.h \
+-	../include/my_config.h ../include/getopt.h ../include/dbug.h \
+-	../include/my_sys.h ../include/m_ctype.h ../include/raid.h \
+-	../include/m_string.h
+-errmsg.lo errmsg.o : errmsg.c ../include/global.h ../include/my_config.h \
+-	../include/getopt.h ../include/dbug.h ../include/my_sys.h \
+-	../include/m_ctype.h ../include/raid.h ../include/errmsg.h
+-errors.lo errors.o : errors.c mysys_priv.h ../include/global.h \
+-	../include/my_config.h ../include/getopt.h ../include/dbug.h \
+-	../include/my_sys.h ../include/m_ctype.h ../include/raid.h \
+-	../include/mysys_err.h
+-get_password.lo get_password.o : get_password.c ../include/global.h \
+-	../include/my_config.h ../include/getopt.h ../include/dbug.h \
+-	../include/my_sys.h ../include/m_ctype.h ../include/raid.h \
+-	../include/mysql.h ../include/mysql_com.h \
+-	../include/mysql_version.h ../include/m_string.h
+-getopt.lo getopt.o : getopt.c ../include/global.h ../include/my_config.h \
+-	../include/getopt.h ../include/dbug.h ../include/m_string.h
+-getopt1.lo getopt1.o : getopt1.c ../include/global.h \
+-	../include/my_config.h ../include/getopt.h ../include/dbug.h
+-getvar.lo getvar.o : getvar.c mysys_priv.h ../include/global.h \
+-	../include/my_config.h ../include/getopt.h ../include/dbug.h \
+-	../include/my_sys.h ../include/m_ctype.h ../include/raid.h \
+-	../include/m_string.h
+-hash.lo hash.o : hash.c mysys_priv.h ../include/global.h \
+-	../include/my_config.h ../include/getopt.h ../include/dbug.h \
+-	../include/my_sys.h ../include/m_ctype.h ../include/raid.h \
+-	../include/m_string.h ../include/hash.h
+-int2str.lo int2str.o : int2str.c ../include/global.h \
+-	../include/my_config.h ../include/getopt.h ../include/dbug.h \
+-	../include/m_string.h
+-is_prefix.lo is_prefix.o : is_prefix.c ../include/global.h \
+-	../include/my_config.h ../include/getopt.h ../include/dbug.h \
+-	../include/m_string.h
+-libmysql.lo libmysql.o : libmysql.c ../include/global.h \
+-	../include/my_config.h ../include/getopt.h ../include/dbug.h \
+-	../include/my_sys.h ../include/m_ctype.h ../include/raid.h \
+-	../include/mysys_err.h ../include/m_string.h ../include/mysql.h \
+-	../include/mysql_com.h ../include/mysql_version.h \
+-	../include/mysqld_error.h ../include/errmsg.h \
+-	../include/violite.h ../include/my_net.h
+-list.lo list.o : list.c mysys_priv.h ../include/global.h \
+-	../include/my_config.h ../include/getopt.h ../include/dbug.h \
+-	../include/my_sys.h ../include/m_ctype.h ../include/raid.h \
+-	../include/my_list.h
+-llstr.lo llstr.o : llstr.c ../include/global.h ../include/my_config.h \
+-	../include/getopt.h ../include/dbug.h ../include/m_string.h
+-longlong2str.lo longlong2str.o : longlong2str.c ../include/global.h \
+-	../include/my_config.h ../include/getopt.h ../include/dbug.h \
+-	../include/m_string.h
+-mf_casecnv.lo mf_casecnv.o : mf_casecnv.c mysys_priv.h \
+-	../include/global.h ../include/my_config.h ../include/getopt.h \
+-	../include/dbug.h ../include/my_sys.h ../include/m_ctype.h \
+-	../include/raid.h
+-mf_dirname.lo mf_dirname.o : mf_dirname.c mysys_priv.h \
+-	../include/global.h ../include/my_config.h ../include/getopt.h \
+-	../include/dbug.h ../include/my_sys.h ../include/m_ctype.h \
+-	../include/raid.h ../include/m_string.h
+-mf_fn_ext.lo mf_fn_ext.o : mf_fn_ext.c mysys_priv.h ../include/global.h \
+-	../include/my_config.h ../include/getopt.h ../include/dbug.h \
+-	../include/my_sys.h ../include/m_ctype.h ../include/raid.h \
+-	../include/m_string.h
+-mf_format.lo mf_format.o : mf_format.c mysys_priv.h ../include/global.h \
+-	../include/my_config.h ../include/getopt.h ../include/dbug.h \
+-	../include/my_sys.h ../include/m_ctype.h ../include/raid.h \
+-	../include/m_string.h
+-mf_loadpath.lo mf_loadpath.o : mf_loadpath.c mysys_priv.h \
+-	../include/global.h ../include/my_config.h ../include/getopt.h \
+-	../include/dbug.h ../include/my_sys.h ../include/m_ctype.h \
+-	../include/raid.h ../include/m_string.h
+-mf_pack.lo mf_pack.o : mf_pack.c mysys_priv.h ../include/global.h \
+-	../include/my_config.h ../include/getopt.h ../include/dbug.h \
+-	../include/my_sys.h ../include/m_ctype.h ../include/raid.h \
+-	../include/m_string.h
+-mf_path.lo mf_path.o : mf_path.c mysys_priv.h ../include/global.h \
+-	../include/my_config.h ../include/getopt.h ../include/dbug.h \
+-	../include/my_sys.h ../include/m_ctype.h ../include/raid.h \
+-	../include/m_string.h
+-mf_tempfile.lo mf_tempfile.o : mf_tempfile.c mysys_priv.h \
+-	../include/global.h ../include/my_config.h ../include/getopt.h \
+-	../include/dbug.h ../include/my_sys.h ../include/m_ctype.h \
+-	../include/raid.h ../include/m_string.h my_static.h \
+-	../include/mysys_err.h
+-mf_unixpath.lo mf_unixpath.o : mf_unixpath.c mysys_priv.h \
+-	../include/global.h ../include/my_config.h ../include/getopt.h \
+-	../include/dbug.h ../include/my_sys.h ../include/m_ctype.h \
+-	../include/raid.h ../include/m_string.h
+-mf_wcomp.lo mf_wcomp.o : mf_wcomp.c mysys_priv.h ../include/global.h \
+-	../include/my_config.h ../include/getopt.h ../include/dbug.h \
+-	../include/my_sys.h ../include/m_ctype.h ../include/raid.h
+-mulalloc.lo mulalloc.o : mulalloc.c mysys_priv.h ../include/global.h \
+-	../include/my_config.h ../include/getopt.h ../include/dbug.h \
+-	../include/my_sys.h ../include/m_ctype.h ../include/raid.h
+-my_alloc.lo my_alloc.o : my_alloc.c ../include/global.h \
+-	../include/my_config.h ../include/getopt.h ../include/dbug.h \
+-	../include/my_sys.h ../include/m_ctype.h ../include/raid.h \
+-	../include/m_string.h
+-my_compress.lo my_compress.o : my_compress.c ../include/global.h \
+-	../include/my_config.h ../include/getopt.h ../include/dbug.h \
+-	../include/my_sys.h ../include/m_ctype.h ../include/raid.h
+-my_create.lo my_create.o : my_create.c mysys_priv.h ../include/global.h \
+-	../include/my_config.h ../include/getopt.h ../include/dbug.h \
+-	../include/my_sys.h ../include/m_ctype.h ../include/raid.h \
+-	../include/my_dir.h ../include/mysys_err.h
+-my_delete.lo my_delete.o : my_delete.c mysys_priv.h ../include/global.h \
+-	../include/my_config.h ../include/getopt.h ../include/dbug.h \
+-	../include/my_sys.h ../include/m_ctype.h ../include/raid.h \
+-	../include/mysys_err.h
+-my_div.lo my_div.o : my_div.c mysys_priv.h ../include/global.h \
+-	../include/my_config.h ../include/getopt.h ../include/dbug.h \
+-	../include/my_sys.h ../include/m_ctype.h ../include/raid.h
+-my_error.lo my_error.o : my_error.c mysys_priv.h ../include/global.h \
+-	../include/my_config.h ../include/getopt.h ../include/dbug.h \
+-	../include/my_sys.h ../include/m_ctype.h ../include/raid.h \
+-	../include/mysys_err.h ../include/m_string.h
+-my_fopen.lo my_fopen.o : my_fopen.c mysys_priv.h ../include/global.h \
+-	../include/my_config.h ../include/getopt.h ../include/dbug.h \
+-	../include/my_sys.h ../include/m_ctype.h ../include/raid.h \
+-	my_static.h ../include/mysys_err.h
+-my_fstream.lo my_fstream.o : my_fstream.c mysys_priv.h \
+-	../include/global.h ../include/my_config.h ../include/getopt.h \
+-	../include/dbug.h ../include/my_sys.h ../include/m_ctype.h \
+-	../include/raid.h ../include/mysys_err.h
+-my_getwd.lo my_getwd.o : my_getwd.c mysys_priv.h ../include/global.h \
+-	../include/my_config.h ../include/getopt.h ../include/dbug.h \
+-	../include/my_sys.h ../include/m_ctype.h ../include/raid.h \
+-	../include/m_string.h ../include/mysys_err.h
+-my_init.lo my_init.o : my_init.c mysys_priv.h ../include/global.h \
+-	../include/my_config.h ../include/getopt.h ../include/dbug.h \
+-	../include/my_sys.h ../include/m_ctype.h ../include/raid.h \
+-	my_static.h ../include/mysys_err.h ../include/m_string.h
+-my_lib.lo my_lib.o : my_lib.c mysys_priv.h ../include/global.h \
+-	../include/my_config.h ../include/getopt.h ../include/dbug.h \
+-	../include/my_sys.h ../include/m_ctype.h ../include/raid.h \
+-	../include/m_string.h ../include/my_dir.h \
+-	../include/mysys_err.h
+-my_malloc.lo my_malloc.o : my_malloc.c mysys_priv.h ../include/global.h \
+-	../include/my_config.h ../include/getopt.h ../include/dbug.h \
+-	../include/my_sys.h ../include/m_ctype.h ../include/raid.h \
+-	../include/mysys_err.h ../include/m_string.h
+-my_messnc.lo my_messnc.o : my_messnc.c mysys_priv.h ../include/global.h \
+-	../include/my_config.h ../include/getopt.h ../include/dbug.h \
+-	../include/my_sys.h ../include/m_ctype.h ../include/raid.h
+-my_net.lo my_net.o : my_net.c mysys_priv.h ../include/global.h \
+-	../include/my_config.h ../include/getopt.h ../include/dbug.h \
+-	../include/my_sys.h ../include/m_ctype.h ../include/raid.h \
+-	../include/m_string.h
+-my_once.lo my_once.o : my_once.c mysys_priv.h ../include/global.h \
+-	../include/my_config.h ../include/getopt.h ../include/dbug.h \
+-	../include/my_sys.h ../include/m_ctype.h ../include/raid.h \
+-	my_static.h ../include/mysys_err.h
+-my_open.lo my_open.o : my_open.c mysys_priv.h ../include/global.h \
+-	../include/my_config.h ../include/getopt.h ../include/dbug.h \
+-	../include/my_sys.h ../include/m_ctype.h ../include/raid.h \
+-	../include/mysys_err.h ../include/my_dir.h
+-my_pthread.lo my_pthread.o : my_pthread.c mysys_priv.h \
+-	../include/global.h ../include/my_config.h ../include/getopt.h \
+-	../include/dbug.h ../include/my_sys.h ../include/m_ctype.h \
+-	../include/raid.h
+-my_read.lo my_read.o : my_read.c mysys_priv.h ../include/global.h \
+-	../include/my_config.h ../include/getopt.h ../include/dbug.h \
+-	../include/my_sys.h ../include/m_ctype.h ../include/raid.h \
+-	../include/mysys_err.h
+-my_realloc.lo my_realloc.o : my_realloc.c mysys_priv.h \
+-	../include/global.h ../include/my_config.h ../include/getopt.h \
+-	../include/dbug.h ../include/my_sys.h ../include/m_ctype.h \
+-	../include/raid.h ../include/mysys_err.h
+-my_static.lo my_static.o : my_static.c mysys_priv.h ../include/global.h \
+-	../include/my_config.h ../include/getopt.h ../include/dbug.h \
+-	../include/my_sys.h ../include/m_ctype.h ../include/raid.h \
+-	my_static.h ../include/my_alarm.h
+-my_thr_init.lo my_thr_init.o : my_thr_init.c mysys_priv.h \
+-	../include/global.h ../include/my_config.h ../include/getopt.h \
+-	../include/dbug.h ../include/my_sys.h ../include/m_ctype.h \
+-	../include/raid.h ../include/m_string.h
+-my_write.lo my_write.o : my_write.c mysys_priv.h ../include/global.h \
+-	../include/my_config.h ../include/getopt.h ../include/dbug.h \
+-	../include/my_sys.h ../include/m_ctype.h ../include/raid.h \
+-	../include/mysys_err.h
+-net.lo net.o : net.c ../include/global.h ../include/my_config.h \
+-	../include/getopt.h ../include/dbug.h ../include/violite.h \
+-	../include/my_net.h ../include/my_sys.h ../include/m_ctype.h \
+-	../include/raid.h ../include/m_string.h ../include/mysql.h \
+-	../include/mysql_com.h ../include/mysql_version.h \
+-	../include/mysqld_error.h
+-password.lo password.o : password.c ../include/global.h \
+-	../include/my_config.h ../include/getopt.h ../include/dbug.h \
+-	../include/my_sys.h ../include/m_ctype.h ../include/raid.h \
+-	../include/m_string.h ../include/mysql.h ../include/mysql_com.h \
+-	../include/mysql_version.h
+-safemalloc.lo safemalloc.o : safemalloc.c mysys_priv.h \
+-	../include/global.h ../include/my_config.h ../include/getopt.h \
+-	../include/dbug.h ../include/my_sys.h ../include/m_ctype.h \
+-	../include/raid.h ../include/m_string.h my_static.h \
+-	../include/mysys_err.h
+-str2int.lo str2int.o : str2int.c ../include/global.h \
+-	../include/my_config.h ../include/getopt.h ../include/dbug.h \
+-	../include/m_string.h ../include/m_ctype.h ../include/my_sys.h \
+-	../include/raid.h
+-strcend.lo strcend.o : strcend.c ../include/global.h \
+-	../include/my_config.h ../include/getopt.h ../include/dbug.h \
+-	../include/m_string.h
+-strcont.lo strcont.o : strcont.c ../include/global.h \
+-	../include/my_config.h ../include/getopt.h ../include/dbug.h \
+-	../include/m_string.h
+-strend.lo strend.o : strend.c ../include/global.h ../include/my_config.h \
+-	../include/getopt.h ../include/dbug.h ../include/m_string.h
+-strfill.lo strfill.o : strfill.c ../include/global.h \
+-	../include/my_config.h ../include/getopt.h ../include/dbug.h \
+-	../include/m_string.h
+-string.lo string.o : string.c mysys_priv.h ../include/global.h \
+-	../include/my_config.h ../include/getopt.h ../include/dbug.h \
+-	../include/my_sys.h ../include/m_ctype.h ../include/raid.h \
+-	../include/m_string.h
+-strinstr.lo strinstr.o : strinstr.c ../include/global.h \
+-	../include/my_config.h ../include/getopt.h ../include/dbug.h \
+-	../include/m_string.h
+-strmake.lo strmake.o : strmake.c ../include/global.h \
+-	../include/my_config.h ../include/getopt.h ../include/dbug.h \
+-	../include/m_string.h
+-strmov.lo strmov.o : strmov.c ../include/global.h ../include/my_config.h \
+-	../include/getopt.h ../include/dbug.h ../include/m_string.h
+-strnlen.lo strnlen.o : strnlen.c ../include/global.h \
+-	../include/my_config.h ../include/getopt.h ../include/dbug.h \
+-	../include/m_string.h
+-strnmov.lo strnmov.o : strnmov.c ../include/global.h \
+-	../include/my_config.h ../include/getopt.h ../include/dbug.h \
+-	../include/m_string.h
+-strtoll.lo strtoll.o : strtoll.c ../include/global.h \
+-	../include/my_config.h ../include/getopt.h ../include/dbug.h \
+-	../include/m_string.h
+-strtoull.lo strtoull.o : strtoull.c ../include/global.h \
+-	../include/my_config.h ../include/getopt.h ../include/dbug.h \
+-	../include/m_string.h
+-strxmov.lo strxmov.o : strxmov.c ../include/global.h \
+-	../include/my_config.h ../include/getopt.h ../include/dbug.h \
+-	../include/m_string.h
+-thr_mutex.lo thr_mutex.o : thr_mutex.c ../include/global.h \
+-	../include/my_config.h ../include/getopt.h ../include/dbug.h \
+-	../include/m_string.h
+-typelib.lo typelib.o : typelib.c mysys_priv.h ../include/global.h \
+-	../include/my_config.h ../include/getopt.h ../include/dbug.h \
+-	../include/my_sys.h ../include/m_ctype.h ../include/raid.h \
+-	../include/m_string.h
+-violite.lo violite.o : violite.c ../include/global.h \
+-	../include/my_config.h ../include/getopt.h ../include/dbug.h \
+-	../include/violite.h ../include/my_net.h ../include/my_sys.h \
+-	../include/m_ctype.h ../include/raid.h ../include/m_string.h
+ 
++DEPS_MAGIC := $(shell mkdir .deps > /dev/null 2>&1 || :)
++
++-include $(DEP_FILES)
++
++mostlyclean-depend:
++
++clean-depend:
++
++distclean-depend:
++	-rm -rf .deps
++
++maintainer-clean-depend:
++
++%.o: %.c
++	@echo '$(COMPILE) -c $<'; \
++	$(COMPILE) -Wp,-MD,.deps/$(*F).pp -c $<
++	@-cp .deps/$(*F).pp .deps/$(*F).P; \
++	tr ' ' '\012' < .deps/$(*F).pp \
++	  | sed -e 's/^\\$$//' -e '/^$$/ d' -e '/:$$/ d' -e 's/$$/ :/' \
++	    >> .deps/$(*F).P; \
++	rm .deps/$(*F).pp
++
++%.lo: %.c
++	@echo '$(LTCOMPILE) -c $<'; \
++	$(LTCOMPILE) -Wp,-MD,.deps/$(*F).pp -c $<
++	@-sed -e 's/^\([^:]*\)\.o[ 	]*:/\1.lo \1.o :/' \
++	  < .deps/$(*F).pp > .deps/$(*F).P; \
++	tr ' ' '\012' < .deps/$(*F).pp \
++	  | sed -e 's/^\\$$//' -e '/^$$/ d' -e '/:$$/ d' -e 's/$$/ :/' \
++	    >> .deps/$(*F).P; \
++	rm -f .deps/$(*F).pp
+ info-am:
+ info: info-am
+ dvi-am:
+@@ -719,19 +480,20 @@
+ maintainer-clean-generic:
+ mostlyclean-am:  mostlyclean-pkglibLTLIBRARIES mostlyclean-compile \
+ 		mostlyclean-libtool mostlyclean-noinstPROGRAMS \
+-		mostlyclean-tags mostlyclean-generic
++		mostlyclean-tags mostlyclean-depend mostlyclean-generic
+ 
+ mostlyclean: mostlyclean-am
+ 
+ clean-am:  clean-pkglibLTLIBRARIES clean-compile clean-libtool \
+-		clean-noinstPROGRAMS clean-tags clean-generic \
+-		mostlyclean-am clean-local
++		clean-noinstPROGRAMS clean-tags clean-depend \
++		clean-generic mostlyclean-am clean-local
+ 
+ clean: clean-am
+ 
+ distclean-am:  distclean-pkglibLTLIBRARIES distclean-compile \
+ 		distclean-libtool distclean-noinstPROGRAMS \
+-		distclean-tags distclean-generic clean-am
++		distclean-tags distclean-depend distclean-generic \
++		clean-am
+ 	-rm -f libtool
+ 
+ distclean: distclean-am
+@@ -739,7 +501,8 @@
+ maintainer-clean-am:  maintainer-clean-pkglibLTLIBRARIES \
+ 		maintainer-clean-compile maintainer-clean-libtool \
+ 		maintainer-clean-noinstPROGRAMS maintainer-clean-tags \
+-		maintainer-clean-generic distclean-am
++		maintainer-clean-depend maintainer-clean-generic \
++		distclean-am
+ 	@echo "This command is intended for maintainers to use;"
+ 	@echo "it deletes files that may require special tools to rebuild."
+ 
+@@ -753,12 +516,13 @@
+ clean-libtool maintainer-clean-libtool mostlyclean-noinstPROGRAMS \
+ distclean-noinstPROGRAMS clean-noinstPROGRAMS \
+ maintainer-clean-noinstPROGRAMS tags mostlyclean-tags distclean-tags \
+-clean-tags maintainer-clean-tags distdir info-am info dvi-am dvi check \
+-check-am installcheck-am installcheck install-exec-am install-exec \
+-install-data-am install-data install-am install uninstall-am uninstall \
+-all-redirect all-am all installdirs mostlyclean-generic \
+-distclean-generic clean-generic maintainer-clean-generic clean \
+-mostlyclean distclean maintainer-clean
++clean-tags maintainer-clean-tags distdir mostlyclean-depend \
++distclean-depend clean-depend maintainer-clean-depend info-am info \
++dvi-am dvi check check-am installcheck-am installcheck install-exec-am \
++install-exec install-data-am install-data install-am install \
++uninstall-am uninstall all-redirect all-am all installdirs \
++mostlyclean-generic distclean-generic clean-generic \
++maintainer-clean-generic clean mostlyclean distclean maintainer-clean
+ 
+ 
+ # The automatic dependencies miss this
+diff -r -u mysql-3.23.36.orig/libmysql_r/Makefile.in mysql-3.23.36/libmysql_r/Makefile.in
+--- mysql-3.23.36.orig/libmysql_r/Makefile.in	Tue Mar 27 10:19:52 2001
++++ mysql-3.23.36/libmysql_r/Makefile.in	Fri Apr 13 16:23:21 2001
+@@ -259,8 +259,10 @@
+ 
+ DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST)
+ 
+-TAR = gtar
++TAR = tar
+ GZIP_ENV = --best
++DEP_FILES =  .deps/conf_to_src.P .deps/errmsg.P .deps/get_password.P \
++.deps/libmysql.P .deps/net.P .deps/password.P .deps/violite.P
+ SOURCES = $(libmysqlclient_r_la_SOURCES) $(conf_to_src_SOURCES)
+ OBJECTS = $(libmysqlclient_r_la_OBJECTS) $(conf_to_src_OBJECTS)
+ 
+@@ -268,9 +270,9 @@
+ .SUFFIXES:
+ .SUFFIXES: .S .c .lo .o .s
+ $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) $(top_srcdir)/libmysql/Makefile.shared
+-	cd $(top_srcdir) && $(AUTOMAKE) --gnu --include-deps libmysql_r/Makefile
++	cd $(top_srcdir) && $(AUTOMAKE) --gnu libmysql_r/Makefile
+ 
+-Makefile: $(srcdir)/Makefile.in  $(top_builddir)/config.status
++Makefile: $(srcdir)/Makefile.in  $(top_builddir)/config.status $(BUILT_SOURCES)
+ 	cd $(top_builddir) \
+ 	  && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status
+ 
+@@ -300,9 +302,6 @@
+ 	  $(LIBTOOL)  --mode=uninstall rm -f $(DESTDIR)$(pkglibdir)/$$p; \
+ 	done
+ 
+-.c.o:
+-	$(COMPILE) -c $<
+-
+ .s.o:
+ 	$(COMPILE) -c $<
+ 
+@@ -319,9 +318,6 @@
+ 
+ maintainer-clean-compile:
+ 
+-.c.lo:
+-	$(LIBTOOL) --mode=compile $(COMPILE) -c $<
+-
+ .s.lo:
+ 	$(LIBTOOL) --mode=compile $(COMPILE) -c $<
+ 
+@@ -388,490 +384,53 @@
+ subdir = libmysql_r
+ 
+ distdir: $(DISTFILES)
++	here=`cd $(top_builddir) && pwd`; \
++	top_distdir=`cd $(top_distdir) && pwd`; \
++	distdir=`cd $(distdir) && pwd`; \
++	cd $(top_srcdir) \
++	  && $(AUTOMAKE) --include-deps --build-dir=$$here --srcdir-name=$(top_srcdir) --output-dir=$$top_distdir --gnu libmysql_r/Makefile
+ 	@for file in $(DISTFILES); do \
+ 	  d=$(srcdir); \
+ 	  if test -d $$d/$$file; then \
+-	    cp -pr $$d/$$file $(distdir)/$$file; \
++	    cp -pr $$/$$file $(distdir)/$$file; \
+ 	  else \
+ 	    test -f $(distdir)/$$file \
+ 	    || ln $$d/$$file $(distdir)/$$file 2> /dev/null \
+ 	    || cp -p $$d/$$file $(distdir)/$$file || :; \
+ 	  fi; \
+ 	done
+-array.lo array.o : array.c mysys_priv.h ../include/global.h \
+-	../include/my_config.h ../mit-pthreads/include/bits/local_lim.h \
+-	../mit-pthreads/include/endian.h ../include/dbug.h \
+-	../include/my_sys.h ../include/my_pthread.h \
+-	../mit-pthreads/include/pthread/config.h \
+-	../mit-pthreads/include/sched.h ../include/m_ctype.h \
+-	../include/raid.h ../include/m_string.h
+-bchange.lo bchange.o : bchange.c ../include/global.h \
+-	../include/my_config.h ../mit-pthreads/include/bits/local_lim.h \
+-	../mit-pthreads/include/endian.h ../include/dbug.h \
+-	../include/m_string.h
+-bmove.lo bmove.o : bmove.c ../include/global.h ../include/my_config.h \
+-	../mit-pthreads/include/bits/local_lim.h \
+-	../mit-pthreads/include/endian.h ../include/dbug.h \
+-	../include/m_string.h
+-bmove_upp.lo bmove_upp.o : bmove_upp.c ../include/global.h \
+-	../include/my_config.h ../mit-pthreads/include/bits/local_lim.h \
+-	../mit-pthreads/include/endian.h ../include/dbug.h \
+-	../include/m_string.h
+-charset.lo charset.o : charset.c mysys_priv.h ../include/global.h \
+-	../include/my_config.h ../mit-pthreads/include/bits/local_lim.h \
+-	../mit-pthreads/include/endian.h ../include/dbug.h \
+-	../include/my_sys.h ../include/my_pthread.h \
+-	../mit-pthreads/include/pthread/config.h \
+-	../mit-pthreads/include/sched.h ../include/m_ctype.h \
+-	../include/raid.h ../include/mysys_err.h ../include/m_string.h \
+-	../include/my_dir.h
+-conf_to_src.o: conf_to_src.c ../mit-pthreads/include/endian.h
+-ctype.lo ctype.o : ctype.c ../include/global.h ../include/my_config.h \
+-	../mit-pthreads/include/bits/local_lim.h \
+-	../mit-pthreads/include/endian.h ../include/dbug.h \
+-	../include/m_ctype.h ctype_extra_sources.c ctype_autoconf.c
+-dbug.lo dbug.o : dbug.c ../include/global.h ../include/my_config.h \
+-	../mit-pthreads/include/bits/local_lim.h \
+-	../mit-pthreads/include/endian.h ../include/dbug.h \
+-	../include/m_string.h ../include/my_pthread.h \
+-	../mit-pthreads/include/pthread/config.h \
+-	../mit-pthreads/include/sched.h
+-default.lo default.o : default.c mysys_priv.h ../include/global.h \
+-	../include/my_config.h ../mit-pthreads/include/bits/local_lim.h \
+-	../mit-pthreads/include/endian.h ../include/dbug.h \
+-	../include/my_sys.h ../include/my_pthread.h \
+-	../mit-pthreads/include/pthread/config.h \
+-	../mit-pthreads/include/sched.h ../include/m_ctype.h \
+-	../include/raid.h ../include/m_string.h
+-errmsg.lo errmsg.o : errmsg.c ../include/global.h ../include/my_config.h \
+-	../mit-pthreads/include/bits/local_lim.h \
+-	../mit-pthreads/include/endian.h ../include/dbug.h \
+-	../include/my_sys.h ../include/my_pthread.h \
+-	../mit-pthreads/include/pthread/config.h \
+-	../mit-pthreads/include/sched.h ../include/m_ctype.h \
+-	../include/raid.h ../include/errmsg.h
+-errors.lo errors.o : errors.c mysys_priv.h ../include/global.h \
+-	../include/my_config.h ../mit-pthreads/include/bits/local_lim.h \
+-	../mit-pthreads/include/endian.h ../include/dbug.h \
+-	../include/my_sys.h ../include/my_pthread.h \
+-	../mit-pthreads/include/pthread/config.h \
+-	../mit-pthreads/include/sched.h ../include/m_ctype.h \
+-	../include/raid.h ../include/mysys_err.h
+-get_password.lo get_password.o : get_password.c ../include/global.h \
+-	../include/my_config.h ../mit-pthreads/include/bits/local_lim.h \
+-	../mit-pthreads/include/endian.h ../include/dbug.h \
+-	../include/my_sys.h ../include/my_pthread.h \
+-	../mit-pthreads/include/pthread/config.h \
+-	../mit-pthreads/include/sched.h ../include/m_ctype.h \
+-	../include/raid.h ../include/mysql.h ../include/mysql_com.h \
+-	../include/mysql_version.h ../include/m_string.h
+-getopt.lo getopt.o : getopt.c ../include/global.h ../include/my_config.h \
+-	../mit-pthreads/include/bits/local_lim.h \
+-	../mit-pthreads/include/endian.h ../include/dbug.h \
+-	../include/m_string.h
+-getopt1.lo getopt1.o : getopt1.c ../include/global.h \
+-	../include/my_config.h ../mit-pthreads/include/bits/local_lim.h \
+-	../mit-pthreads/include/endian.h ../include/dbug.h \
+-	../include/getopt.h
+-getvar.lo getvar.o : getvar.c mysys_priv.h ../include/global.h \
+-	../include/my_config.h ../mit-pthreads/include/bits/local_lim.h \
+-	../mit-pthreads/include/endian.h ../include/dbug.h \
+-	../include/my_sys.h ../include/my_pthread.h \
+-	../mit-pthreads/include/pthread/config.h \
+-	../mit-pthreads/include/sched.h ../include/m_ctype.h \
+-	../include/raid.h ../include/m_string.h
+-hash.lo hash.o : hash.c mysys_priv.h ../include/global.h \
+-	../include/my_config.h ../mit-pthreads/include/bits/local_lim.h \
+-	../mit-pthreads/include/endian.h ../include/dbug.h \
+-	../include/my_sys.h ../include/my_pthread.h \
+-	../mit-pthreads/include/pthread/config.h \
+-	../mit-pthreads/include/sched.h ../include/m_ctype.h \
+-	../include/raid.h ../include/m_string.h ../include/hash.h
+-int2str.lo int2str.o : int2str.c ../include/global.h \
+-	../include/my_config.h ../mit-pthreads/include/bits/local_lim.h \
+-	../mit-pthreads/include/endian.h ../include/dbug.h \
+-	../include/m_string.h
+-is_prefix.lo is_prefix.o : is_prefix.c ../include/global.h \
+-	../include/my_config.h ../mit-pthreads/include/bits/local_lim.h \
+-	../mit-pthreads/include/endian.h ../include/dbug.h \
+-	../include/m_string.h
+-libmysql.lo libmysql.o : libmysql.c ../include/global.h \
+-	../include/my_config.h ../mit-pthreads/include/bits/local_lim.h \
+-	../mit-pthreads/include/endian.h ../include/dbug.h \
+-	../include/my_sys.h ../include/my_pthread.h \
+-	../mit-pthreads/include/pthread/config.h \
+-	../mit-pthreads/include/sched.h ../include/m_ctype.h \
+-	../include/raid.h ../include/mysys_err.h ../include/m_string.h \
+-	../include/mysql.h ../include/mysql_com.h \
+-	../include/mysql_version.h ../include/mysqld_error.h \
+-	../include/errmsg.h ../include/violite.h ../include/my_net.h
+-list.lo list.o : list.c mysys_priv.h ../include/global.h \
+-	../include/my_config.h ../mit-pthreads/include/bits/local_lim.h \
+-	../mit-pthreads/include/endian.h ../include/dbug.h \
+-	../include/my_sys.h ../include/my_pthread.h \
+-	../mit-pthreads/include/pthread/config.h \
+-	../mit-pthreads/include/sched.h ../include/m_ctype.h \
+-	../include/raid.h ../include/my_list.h
+-llstr.lo llstr.o : llstr.c ../include/global.h ../include/my_config.h \
+-	../mit-pthreads/include/bits/local_lim.h \
+-	../mit-pthreads/include/endian.h ../include/dbug.h \
+-	../include/m_string.h
+-longlong2str.lo longlong2str.o : longlong2str.c ../include/global.h \
+-	../include/my_config.h ../mit-pthreads/include/bits/local_lim.h \
+-	../mit-pthreads/include/endian.h ../include/dbug.h \
+-	../include/m_string.h
+-mf_casecnv.lo mf_casecnv.o : mf_casecnv.c mysys_priv.h \
+-	../include/global.h ../include/my_config.h \
+-	../mit-pthreads/include/bits/local_lim.h \
+-	../mit-pthreads/include/endian.h ../include/dbug.h \
+-	../include/my_sys.h ../include/my_pthread.h \
+-	../mit-pthreads/include/pthread/config.h \
+-	../mit-pthreads/include/sched.h ../include/m_ctype.h \
+-	../include/raid.h
+-mf_dirname.lo mf_dirname.o : mf_dirname.c mysys_priv.h \
+-	../include/global.h ../include/my_config.h \
+-	../mit-pthreads/include/bits/local_lim.h \
+-	../mit-pthreads/include/endian.h ../include/dbug.h \
+-	../include/my_sys.h ../include/my_pthread.h \
+-	../mit-pthreads/include/pthread/config.h \
+-	../mit-pthreads/include/sched.h ../include/m_ctype.h \
+-	../include/raid.h ../include/m_string.h
+-mf_fn_ext.lo mf_fn_ext.o : mf_fn_ext.c mysys_priv.h ../include/global.h \
+-	../include/my_config.h ../mit-pthreads/include/bits/local_lim.h \
+-	../mit-pthreads/include/endian.h ../include/dbug.h \
+-	../include/my_sys.h ../include/my_pthread.h \
+-	../mit-pthreads/include/pthread/config.h \
+-	../mit-pthreads/include/sched.h ../include/m_ctype.h \
+-	../include/raid.h ../include/m_string.h
+-mf_format.lo mf_format.o : mf_format.c mysys_priv.h ../include/global.h \
+-	../include/my_config.h ../mit-pthreads/include/bits/local_lim.h \
+-	../mit-pthreads/include/endian.h ../include/dbug.h \
+-	../include/my_sys.h ../include/my_pthread.h \
+-	../mit-pthreads/include/pthread/config.h \
+-	../mit-pthreads/include/sched.h ../include/m_ctype.h \
+-	../include/raid.h ../include/m_string.h
+-mf_loadpath.lo mf_loadpath.o : mf_loadpath.c mysys_priv.h \
+-	../include/global.h ../include/my_config.h \
+-	../mit-pthreads/include/bits/local_lim.h \
+-	../mit-pthreads/include/endian.h ../include/dbug.h \
+-	../include/my_sys.h ../include/my_pthread.h \
+-	../mit-pthreads/include/pthread/config.h \
+-	../mit-pthreads/include/sched.h ../include/m_ctype.h \
+-	../include/raid.h ../include/m_string.h
+-mf_pack.lo mf_pack.o : mf_pack.c mysys_priv.h ../include/global.h \
+-	../include/my_config.h ../mit-pthreads/include/bits/local_lim.h \
+-	../mit-pthreads/include/endian.h ../include/dbug.h \
+-	../include/my_sys.h ../include/my_pthread.h \
+-	../mit-pthreads/include/pthread/config.h \
+-	../mit-pthreads/include/sched.h ../include/m_ctype.h \
+-	../include/raid.h ../include/m_string.h
+-mf_path.lo mf_path.o : mf_path.c mysys_priv.h ../include/global.h \
+-	../include/my_config.h ../mit-pthreads/include/bits/local_lim.h \
+-	../mit-pthreads/include/endian.h ../include/dbug.h \
+-	../include/my_sys.h ../include/my_pthread.h \
+-	../mit-pthreads/include/pthread/config.h \
+-	../mit-pthreads/include/sched.h ../include/m_ctype.h \
+-	../include/raid.h ../include/m_string.h
+-mf_tempfile.lo mf_tempfile.o : mf_tempfile.c mysys_priv.h \
+-	../include/global.h ../include/my_config.h \
+-	../mit-pthreads/include/bits/local_lim.h \
+-	../mit-pthreads/include/endian.h ../include/dbug.h \
+-	../include/my_sys.h ../include/my_pthread.h \
+-	../mit-pthreads/include/pthread/config.h \
+-	../mit-pthreads/include/sched.h ../include/m_ctype.h \
+-	../include/raid.h ../include/m_string.h my_static.h \
+-	../include/mysys_err.h
+-mf_unixpath.lo mf_unixpath.o : mf_unixpath.c mysys_priv.h \
+-	../include/global.h ../include/my_config.h \
+-	../mit-pthreads/include/bits/local_lim.h \
+-	../mit-pthreads/include/endian.h ../include/dbug.h \
+-	../include/my_sys.h ../include/my_pthread.h \
+-	../mit-pthreads/include/pthread/config.h \
+-	../mit-pthreads/include/sched.h ../include/m_ctype.h \
+-	../include/raid.h ../include/m_string.h
+-mf_wcomp.lo mf_wcomp.o : mf_wcomp.c mysys_priv.h ../include/global.h \
+-	../include/my_config.h ../mit-pthreads/include/bits/local_lim.h \
+-	../mit-pthreads/include/endian.h ../include/dbug.h \
+-	../include/my_sys.h ../include/my_pthread.h \
+-	../mit-pthreads/include/pthread/config.h \
+-	../mit-pthreads/include/sched.h ../include/m_ctype.h \
+-	../include/raid.h
+-mulalloc.lo mulalloc.o : mulalloc.c mysys_priv.h ../include/global.h \
+-	../include/my_config.h ../mit-pthreads/include/bits/local_lim.h \
+-	../mit-pthreads/include/endian.h ../include/dbug.h \
+-	../include/my_sys.h ../include/my_pthread.h \
+-	../mit-pthreads/include/pthread/config.h \
+-	../mit-pthreads/include/sched.h ../include/m_ctype.h \
+-	../include/raid.h
+-my_alloc.lo my_alloc.o : my_alloc.c ../include/global.h \
+-	../include/my_config.h ../mit-pthreads/include/bits/local_lim.h \
+-	../mit-pthreads/include/endian.h ../include/dbug.h \
+-	../include/my_sys.h ../include/my_pthread.h \
+-	../mit-pthreads/include/pthread/config.h \
+-	../mit-pthreads/include/sched.h ../include/m_ctype.h \
+-	../include/raid.h ../include/m_string.h
+-my_compress.lo my_compress.o : my_compress.c ../include/global.h \
+-	../include/my_config.h ../mit-pthreads/include/bits/local_lim.h \
+-	../mit-pthreads/include/endian.h ../include/dbug.h \
+-	../include/my_sys.h ../include/my_pthread.h \
+-	../mit-pthreads/include/pthread/config.h \
+-	../mit-pthreads/include/sched.h ../include/m_ctype.h \
+-	../include/raid.h
+-my_create.lo my_create.o : my_create.c mysys_priv.h ../include/global.h \
+-	../include/my_config.h ../mit-pthreads/include/bits/local_lim.h \
+-	../mit-pthreads/include/endian.h ../include/dbug.h \
+-	../include/my_sys.h ../include/my_pthread.h \
+-	../mit-pthreads/include/pthread/config.h \
+-	../mit-pthreads/include/sched.h ../include/m_ctype.h \
+-	../include/raid.h ../include/my_dir.h ../include/mysys_err.h
+-my_delete.lo my_delete.o : my_delete.c mysys_priv.h ../include/global.h \
+-	../include/my_config.h ../mit-pthreads/include/bits/local_lim.h \
+-	../mit-pthreads/include/endian.h ../include/dbug.h \
+-	../include/my_sys.h ../include/my_pthread.h \
+-	../mit-pthreads/include/pthread/config.h \
+-	../mit-pthreads/include/sched.h ../include/m_ctype.h \
+-	../include/raid.h ../include/mysys_err.h
+-my_div.lo my_div.o : my_div.c mysys_priv.h ../include/global.h \
+-	../include/my_config.h ../mit-pthreads/include/bits/local_lim.h \
+-	../mit-pthreads/include/endian.h ../include/dbug.h \
+-	../include/my_sys.h ../include/my_pthread.h \
+-	../mit-pthreads/include/pthread/config.h \
+-	../mit-pthreads/include/sched.h ../include/m_ctype.h \
+-	../include/raid.h
+-my_error.lo my_error.o : my_error.c mysys_priv.h ../include/global.h \
+-	../include/my_config.h ../mit-pthreads/include/bits/local_lim.h \
+-	../mit-pthreads/include/endian.h ../include/dbug.h \
+-	../include/my_sys.h ../include/my_pthread.h \
+-	../mit-pthreads/include/pthread/config.h \
+-	../mit-pthreads/include/sched.h ../include/m_ctype.h \
+-	../include/raid.h ../include/mysys_err.h ../include/m_string.h
+-my_fopen.lo my_fopen.o : my_fopen.c mysys_priv.h ../include/global.h \
+-	../include/my_config.h ../mit-pthreads/include/bits/local_lim.h \
+-	../mit-pthreads/include/endian.h ../include/dbug.h \
+-	../include/my_sys.h ../include/my_pthread.h \
+-	../mit-pthreads/include/pthread/config.h \
+-	../mit-pthreads/include/sched.h ../include/m_ctype.h \
+-	../include/raid.h my_static.h ../include/mysys_err.h
+-my_fstream.lo my_fstream.o : my_fstream.c mysys_priv.h \
+-	../include/global.h ../include/my_config.h \
+-	../mit-pthreads/include/bits/local_lim.h \
+-	../mit-pthreads/include/endian.h ../include/dbug.h \
+-	../include/my_sys.h ../include/my_pthread.h \
+-	../mit-pthreads/include/pthread/config.h \
+-	../mit-pthreads/include/sched.h ../include/m_ctype.h \
+-	../include/raid.h ../include/mysys_err.h
+-my_getwd.lo my_getwd.o : my_getwd.c mysys_priv.h ../include/global.h \
+-	../include/my_config.h ../mit-pthreads/include/bits/local_lim.h \
+-	../mit-pthreads/include/endian.h ../include/dbug.h \
+-	../include/my_sys.h ../include/my_pthread.h \
+-	../mit-pthreads/include/pthread/config.h \
+-	../mit-pthreads/include/sched.h ../include/m_ctype.h \
+-	../include/raid.h ../include/m_string.h ../include/mysys_err.h
+-my_init.lo my_init.o : my_init.c mysys_priv.h ../include/global.h \
+-	../include/my_config.h ../mit-pthreads/include/bits/local_lim.h \
+-	../mit-pthreads/include/endian.h ../include/dbug.h \
+-	../include/my_sys.h ../include/my_pthread.h \
+-	../mit-pthreads/include/pthread/config.h \
+-	../mit-pthreads/include/sched.h ../include/m_ctype.h \
+-	../include/raid.h my_static.h ../include/mysys_err.h \
+-	../include/m_string.h
+-my_lib.lo my_lib.o : my_lib.c mysys_priv.h ../include/global.h \
+-	../include/my_config.h ../mit-pthreads/include/bits/local_lim.h \
+-	../mit-pthreads/include/endian.h ../include/dbug.h \
+-	../include/my_sys.h ../include/my_pthread.h \
+-	../mit-pthreads/include/pthread/config.h \
+-	../mit-pthreads/include/sched.h ../include/m_ctype.h \
+-	../include/raid.h ../include/m_string.h ../include/my_dir.h \
+-	../include/mysys_err.h
+-my_malloc.lo my_malloc.o : my_malloc.c mysys_priv.h ../include/global.h \
+-	../include/my_config.h ../mit-pthreads/include/bits/local_lim.h \
+-	../mit-pthreads/include/endian.h ../include/dbug.h \
+-	../include/my_sys.h ../include/my_pthread.h \
+-	../mit-pthreads/include/pthread/config.h \
+-	../mit-pthreads/include/sched.h ../include/m_ctype.h \
+-	../include/raid.h ../include/mysys_err.h ../include/m_string.h
+-my_messnc.lo my_messnc.o : my_messnc.c mysys_priv.h ../include/global.h \
+-	../include/my_config.h ../mit-pthreads/include/bits/local_lim.h \
+-	../mit-pthreads/include/endian.h ../include/dbug.h \
+-	../include/my_sys.h ../include/my_pthread.h \
+-	../mit-pthreads/include/pthread/config.h \
+-	../mit-pthreads/include/sched.h ../include/m_ctype.h \
+-	../include/raid.h
+-my_net.lo my_net.o : my_net.c mysys_priv.h ../include/global.h \
+-	../include/my_config.h ../mit-pthreads/include/bits/local_lim.h \
+-	../mit-pthreads/include/endian.h ../include/dbug.h \
+-	../include/my_sys.h ../include/my_pthread.h \
+-	../mit-pthreads/include/pthread/config.h \
+-	../mit-pthreads/include/sched.h ../include/m_ctype.h \
+-	../include/raid.h ../include/m_string.h
+-my_once.lo my_once.o : my_once.c mysys_priv.h ../include/global.h \
+-	../include/my_config.h ../mit-pthreads/include/bits/local_lim.h \
+-	../mit-pthreads/include/endian.h ../include/dbug.h \
+-	../include/my_sys.h ../include/my_pthread.h \
+-	../mit-pthreads/include/pthread/config.h \
+-	../mit-pthreads/include/sched.h ../include/m_ctype.h \
+-	../include/raid.h my_static.h ../include/mysys_err.h
+-my_open.lo my_open.o : my_open.c mysys_priv.h ../include/global.h \
+-	../include/my_config.h ../mit-pthreads/include/bits/local_lim.h \
+-	../mit-pthreads/include/endian.h ../include/dbug.h \
+-	../include/my_sys.h ../include/my_pthread.h \
+-	../mit-pthreads/include/pthread/config.h \
+-	../mit-pthreads/include/sched.h ../include/m_ctype.h \
+-	../include/raid.h ../include/mysys_err.h ../include/my_dir.h
+-my_pthread.lo my_pthread.o : my_pthread.c mysys_priv.h \
+-	../include/global.h ../include/my_config.h \
+-	../mit-pthreads/include/bits/local_lim.h \
+-	../mit-pthreads/include/endian.h ../include/dbug.h \
+-	../include/my_sys.h ../include/my_pthread.h \
+-	../mit-pthreads/include/pthread/config.h \
+-	../mit-pthreads/include/sched.h ../include/m_ctype.h \
+-	../include/raid.h ../include/m_string.h ../include/thr_alarm.h
+-my_read.lo my_read.o : my_read.c mysys_priv.h ../include/global.h \
+-	../include/my_config.h ../mit-pthreads/include/bits/local_lim.h \
+-	../mit-pthreads/include/endian.h ../include/dbug.h \
+-	../include/my_sys.h ../include/my_pthread.h \
+-	../mit-pthreads/include/pthread/config.h \
+-	../mit-pthreads/include/sched.h ../include/m_ctype.h \
+-	../include/raid.h ../include/mysys_err.h
+-my_realloc.lo my_realloc.o : my_realloc.c mysys_priv.h \
+-	../include/global.h ../include/my_config.h \
+-	../mit-pthreads/include/bits/local_lim.h \
+-	../mit-pthreads/include/endian.h ../include/dbug.h \
+-	../include/my_sys.h ../include/my_pthread.h \
+-	../mit-pthreads/include/pthread/config.h \
+-	../mit-pthreads/include/sched.h ../include/m_ctype.h \
+-	../include/raid.h ../include/mysys_err.h
+-my_static.lo my_static.o : my_static.c mysys_priv.h ../include/global.h \
+-	../include/my_config.h ../mit-pthreads/include/bits/local_lim.h \
+-	../mit-pthreads/include/endian.h ../include/dbug.h \
+-	../include/my_sys.h ../include/my_pthread.h \
+-	../mit-pthreads/include/pthread/config.h \
+-	../mit-pthreads/include/sched.h ../include/m_ctype.h \
+-	../include/raid.h my_static.h ../include/my_alarm.h
+-my_thr_init.lo my_thr_init.o : my_thr_init.c mysys_priv.h \
+-	../include/global.h ../include/my_config.h \
+-	../mit-pthreads/include/bits/local_lim.h \
+-	../mit-pthreads/include/endian.h ../include/dbug.h \
+-	../include/my_sys.h ../include/my_pthread.h \
+-	../mit-pthreads/include/pthread/config.h \
+-	../mit-pthreads/include/sched.h ../include/m_ctype.h \
+-	../include/raid.h ../include/m_string.h
+-my_write.lo my_write.o : my_write.c mysys_priv.h ../include/global.h \
+-	../include/my_config.h ../mit-pthreads/include/bits/local_lim.h \
+-	../mit-pthreads/include/endian.h ../include/dbug.h \
+-	../include/my_sys.h ../include/my_pthread.h \
+-	../mit-pthreads/include/pthread/config.h \
+-	../mit-pthreads/include/sched.h ../include/m_ctype.h \
+-	../include/raid.h ../include/mysys_err.h
+-net.lo net.o : net.c ../include/global.h ../include/my_config.h \
+-	../mit-pthreads/include/bits/local_lim.h \
+-	../mit-pthreads/include/endian.h ../include/dbug.h \
+-	../include/violite.h ../include/my_net.h ../include/my_sys.h \
+-	../include/my_pthread.h \
+-	../mit-pthreads/include/pthread/config.h \
+-	../mit-pthreads/include/sched.h ../include/m_ctype.h \
+-	../include/raid.h ../include/m_string.h ../include/mysql.h \
+-	../include/mysql_com.h ../include/mysql_version.h \
+-	../include/mysqld_error.h
+-password.lo password.o : password.c ../include/global.h \
+-	../include/my_config.h ../mit-pthreads/include/bits/local_lim.h \
+-	../mit-pthreads/include/endian.h ../include/dbug.h \
+-	../include/my_sys.h ../include/my_pthread.h \
+-	../mit-pthreads/include/pthread/config.h \
+-	../mit-pthreads/include/sched.h ../include/m_ctype.h \
+-	../include/raid.h ../include/m_string.h ../include/mysql.h \
+-	../include/mysql_com.h ../include/mysql_version.h
+-safemalloc.lo safemalloc.o : safemalloc.c mysys_priv.h \
+-	../include/global.h ../include/my_config.h \
+-	../mit-pthreads/include/bits/local_lim.h \
+-	../mit-pthreads/include/endian.h ../include/dbug.h \
+-	../include/my_sys.h ../include/my_pthread.h \
+-	../mit-pthreads/include/pthread/config.h \
+-	../mit-pthreads/include/sched.h ../include/m_ctype.h \
+-	../include/raid.h ../include/m_string.h my_static.h \
+-	../include/mysys_err.h
+-str2int.lo str2int.o : str2int.c ../include/global.h \
+-	../include/my_config.h ../mit-pthreads/include/bits/local_lim.h \
+-	../mit-pthreads/include/endian.h ../include/dbug.h \
+-	../include/m_string.h ../include/m_ctype.h ../include/my_sys.h \
+-	../include/my_pthread.h \
+-	../mit-pthreads/include/pthread/config.h \
+-	../mit-pthreads/include/sched.h ../include/raid.h
+-strcend.lo strcend.o : strcend.c ../include/global.h \
+-	../include/my_config.h ../mit-pthreads/include/bits/local_lim.h \
+-	../mit-pthreads/include/endian.h ../include/dbug.h \
+-	../include/m_string.h
+-strcont.lo strcont.o : strcont.c ../include/global.h \
+-	../include/my_config.h ../mit-pthreads/include/bits/local_lim.h \
+-	../mit-pthreads/include/endian.h ../include/dbug.h \
+-	../include/m_string.h
+-strend.lo strend.o : strend.c ../include/global.h ../include/my_config.h \
+-	../mit-pthreads/include/bits/local_lim.h \
+-	../mit-pthreads/include/endian.h ../include/dbug.h \
+-	../include/m_string.h
+-strfill.lo strfill.o : strfill.c ../include/global.h \
+-	../include/my_config.h ../mit-pthreads/include/bits/local_lim.h \
+-	../mit-pthreads/include/endian.h ../include/dbug.h \
+-	../include/m_string.h
+-string.lo string.o : string.c mysys_priv.h ../include/global.h \
+-	../include/my_config.h ../mit-pthreads/include/bits/local_lim.h \
+-	../mit-pthreads/include/endian.h ../include/dbug.h \
+-	../include/my_sys.h ../include/my_pthread.h \
+-	../mit-pthreads/include/pthread/config.h \
+-	../mit-pthreads/include/sched.h ../include/m_ctype.h \
+-	../include/raid.h ../include/m_string.h
+-strinstr.lo strinstr.o : strinstr.c ../include/global.h \
+-	../include/my_config.h ../mit-pthreads/include/bits/local_lim.h \
+-	../mit-pthreads/include/endian.h ../include/dbug.h \
+-	../include/m_string.h
+-strmake.lo strmake.o : strmake.c ../include/global.h \
+-	../include/my_config.h ../mit-pthreads/include/bits/local_lim.h \
+-	../mit-pthreads/include/endian.h ../include/dbug.h \
+-	../include/m_string.h
+-strmov.lo strmov.o : strmov.c ../include/global.h ../include/my_config.h \
+-	../mit-pthreads/include/bits/local_lim.h \
+-	../mit-pthreads/include/endian.h ../include/dbug.h \
+-	../include/m_string.h
+-strnlen.lo strnlen.o : strnlen.c ../include/global.h \
+-	../include/my_config.h ../mit-pthreads/include/bits/local_lim.h \
+-	../mit-pthreads/include/endian.h ../include/dbug.h \
+-	../include/m_string.h
+-strnmov.lo strnmov.o : strnmov.c ../include/global.h \
+-	../include/my_config.h ../mit-pthreads/include/bits/local_lim.h \
+-	../mit-pthreads/include/endian.h ../include/dbug.h \
+-	../include/m_string.h
+-strtoll.lo strtoll.o : strtoll.c ../include/global.h \
+-	../include/my_config.h ../mit-pthreads/include/bits/local_lim.h \
+-	../mit-pthreads/include/endian.h ../include/dbug.h \
+-	../include/m_string.h
+-strtoull.lo strtoull.o : strtoull.c ../include/global.h \
+-	../include/my_config.h ../mit-pthreads/include/bits/local_lim.h \
+-	../mit-pthreads/include/endian.h ../include/dbug.h \
+-	../include/m_string.h
+-strxmov.lo strxmov.o : strxmov.c ../include/global.h \
+-	../include/my_config.h ../mit-pthreads/include/bits/local_lim.h \
+-	../mit-pthreads/include/endian.h ../include/dbug.h \
+-	../include/m_string.h
+-thr_mutex.lo thr_mutex.o : thr_mutex.c ../include/global.h \
+-	../include/my_config.h ../mit-pthreads/include/bits/local_lim.h \
+-	../mit-pthreads/include/endian.h ../include/dbug.h \
+-	../include/m_string.h
+-typelib.lo typelib.o : typelib.c mysys_priv.h ../include/global.h \
+-	../include/my_config.h ../mit-pthreads/include/bits/local_lim.h \
+-	../mit-pthreads/include/endian.h ../include/dbug.h \
+-	../include/my_sys.h ../include/my_pthread.h \
+-	../mit-pthreads/include/pthread/config.h \
+-	../mit-pthreads/include/sched.h ../include/m_ctype.h \
+-	../include/raid.h ../include/m_string.h
+-violite.lo violite.o : violite.c ../include/global.h \
+-	../include/my_config.h ../mit-pthreads/include/bits/local_lim.h \
+-	../mit-pthreads/include/endian.h ../include/dbug.h \
+-	../include/violite.h ../include/my_net.h ../include/my_sys.h \
+-	../include/my_pthread.h \
+-	../mit-pthreads/include/pthread/config.h \
+-	../mit-pthreads/include/sched.h ../include/m_ctype.h \
+-	../include/raid.h ../include/m_string.h
+ 
++DEPS_MAGIC := $(shell mkdir .deps > /dev/null 2>&1 || :)
++
++-include $(DEP_FILES)
++
++mostlyclean-depend:
++
++clean-depend:
++
++distclean-depend:
++	-rm -rf .deps
++
++maintainer-clean-depend:
++
++%.o: %.c
++	@echo '$(COMPILE) -c $<'; \
++	$(COMPILE) -Wp,-MD,.deps/$(*F).pp -c $<
++	@-cp .deps/$(*F).pp .deps/$(*F).P; \
++	tr ' ' '\012' < .deps/$(*F).pp \
++	  | sed -e 's/^\\$$//' -e '/^$$/ d' -e '/:$$/ d' -e 's/$$/ :/' \
++	    >> .deps/$(*F).P; \
++	rm .deps/$(*F).pp
++
++%.lo: %.c
++	@echo '$(LTCOMPILE) -c $<'; \
++	$(LTCOMPILE) -Wp,-MD,.deps/$(*F).pp -c $<
++	@-sed -e 's/^\([^:]*\)\.o[ 	]*:/\1.lo \1.o :/' \
++	  < .deps/$(*F).pp > .deps/$(*F).P; \
++	tr ' ' '\012' < .deps/$(*F).pp \
++	  | sed -e 's/^\\$$//' -e '/^$$/ d' -e '/:$$/ d' -e 's/$$/ :/' \
++	    >> .deps/$(*F).P; \
++	rm -f .deps/$(*F).pp
+ info-am:
+ info: info-am
+ dvi-am:
+@@ -911,19 +470,20 @@
+ maintainer-clean-generic:
+ mostlyclean-am:  mostlyclean-pkglibLTLIBRARIES mostlyclean-compile \
+ 		mostlyclean-libtool mostlyclean-noinstPROGRAMS \
+-		mostlyclean-tags mostlyclean-generic
++		mostlyclean-tags mostlyclean-depend mostlyclean-generic
+ 
+ mostlyclean: mostlyclean-am
+ 
+ clean-am:  clean-pkglibLTLIBRARIES clean-compile clean-libtool \
+-		clean-noinstPROGRAMS clean-tags clean-generic \
+-		mostlyclean-am clean-local
++		clean-noinstPROGRAMS clean-tags clean-depend \
++		clean-generic mostlyclean-am clean-local
+ 
+ clean: clean-am
+ 
+ distclean-am:  distclean-pkglibLTLIBRARIES distclean-compile \
+ 		distclean-libtool distclean-noinstPROGRAMS \
+-		distclean-tags distclean-generic clean-am
++		distclean-tags distclean-depend distclean-generic \
++		clean-am
+ 	-rm -f libtool
+ 
+ distclean: distclean-am
+@@ -931,7 +491,8 @@
+ maintainer-clean-am:  maintainer-clean-pkglibLTLIBRARIES \
+ 		maintainer-clean-compile maintainer-clean-libtool \
+ 		maintainer-clean-noinstPROGRAMS maintainer-clean-tags \
+-		maintainer-clean-generic distclean-am
++		maintainer-clean-depend maintainer-clean-generic \
++		distclean-am
+ 	@echo "This command is intended for maintainers to use;"
+ 	@echo "it deletes files that may require special tools to rebuild."
+ 
+@@ -945,12 +506,13 @@
+ clean-libtool maintainer-clean-libtool mostlyclean-noinstPROGRAMS \
+ distclean-noinstPROGRAMS clean-noinstPROGRAMS \
+ maintainer-clean-noinstPROGRAMS tags mostlyclean-tags distclean-tags \
+-clean-tags maintainer-clean-tags distdir info-am info dvi-am dvi check \
+-check-am installcheck-am installcheck install-exec-am install-exec \
+-install-data-am install-data install-am install uninstall-am uninstall \
+-all-redirect all-am all installdirs mostlyclean-generic \
+-distclean-generic clean-generic maintainer-clean-generic clean \
+-mostlyclean distclean maintainer-clean
++clean-tags maintainer-clean-tags distdir mostlyclean-depend \
++distclean-depend clean-depend maintainer-clean-depend info-am info \
++dvi-am dvi check check-am installcheck-am installcheck install-exec-am \
++install-exec install-data-am install-data install-am install \
++uninstall-am uninstall all-redirect all-am all installdirs \
++mostlyclean-generic distclean-generic clean-generic \
++maintainer-clean-generic clean mostlyclean distclean maintainer-clean
+ 
+ 
+ # The automatic dependencies miss this
+diff -r -u mysql-3.23.36.orig/man/Makefile.in mysql-3.23.36/man/Makefile.in
+--- mysql-3.23.36.orig/man/Makefile.in	Tue Mar 27 10:20:30 2001
++++ mysql-3.23.36/man/Makefile.in	Fri Apr 13 16:23:21 2001
+@@ -189,14 +189,14 @@
+ 
+ DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST)
+ 
+-TAR = gtar
++TAR = tar
+ GZIP_ENV = --best
+ all: all-redirect
+ .SUFFIXES:
+ $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) 
+-	cd $(top_srcdir) && $(AUTOMAKE) --gnu --include-deps man/Makefile
++	cd $(top_srcdir) && $(AUTOMAKE) --gnu man/Makefile
+ 
+-Makefile: $(srcdir)/Makefile.in  $(top_builddir)/config.status
++Makefile: $(srcdir)/Makefile.in  $(top_builddir)/config.status $(BUILT_SOURCES)
+ 	cd $(top_builddir) \
+ 	  && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status
+ 
+@@ -248,10 +248,15 @@
+ subdir = man
+ 
+ distdir: $(DISTFILES)
++	here=`cd $(top_builddir) && pwd`; \
++	top_distdir=`cd $(top_distdir) && pwd`; \
++	distdir=`cd $(distdir) && pwd`; \
++	cd $(top_srcdir) \
++	  && $(AUTOMAKE) --include-deps --build-dir=$$here --srcdir-name=$(top_srcdir) --output-dir=$$top_distdir --gnu man/Makefile
+ 	@for file in $(DISTFILES); do \
+ 	  d=$(srcdir); \
+ 	  if test -d $$d/$$file; then \
+-	    cp -pr $$d/$$file $(distdir)/$$file; \
++	    cp -pr $$/$$file $(distdir)/$$file; \
+ 	  else \
+ 	    test -f $(distdir)/$$file \
+ 	    || ln $$d/$$file $(distdir)/$$file 2> /dev/null \
+diff -r -u mysql-3.23.36.orig/merge/Makefile.in mysql-3.23.36/merge/Makefile.in
+--- mysql-3.23.36.orig/merge/Makefile.in	Tue Mar 27 10:20:20 2001
++++ mysql-3.23.36/merge/Makefile.in	Fri Apr 13 16:23:23 2001
+@@ -205,8 +205,11 @@
+ 
+ DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST)
+ 
+-TAR = gtar
++TAR = tar
+ GZIP_ENV = --best
++DEP_FILES =  .deps/_locking.P .deps/close.P .deps/create.P \
++.deps/delete.P .deps/extra.P .deps/info.P .deps/open.P .deps/panic.P \
++.deps/rrnd.P .deps/rsame.P .deps/static.P .deps/update.P
+ SOURCES = $(libmerge_a_SOURCES)
+ OBJECTS = $(libmerge_a_OBJECTS)
+ 
+@@ -214,9 +217,9 @@
+ .SUFFIXES:
+ .SUFFIXES: .S .c .lo .o .s
+ $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) 
+-	cd $(top_srcdir) && $(AUTOMAKE) --gnu --include-deps merge/Makefile
++	cd $(top_srcdir) && $(AUTOMAKE) --gnu merge/Makefile
+ 
+-Makefile: $(srcdir)/Makefile.in  $(top_builddir)/config.status
++Makefile: $(srcdir)/Makefile.in  $(top_builddir)/config.status $(BUILT_SOURCES)
+ 	cd $(top_builddir) \
+ 	  && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status
+ 
+@@ -253,9 +256,6 @@
+ 	  rm -f $(DESTDIR)$(pkglibdir)/$$p; \
+ 	done
+ 
+-.c.o:
+-	$(COMPILE) -c $<
+-
+ .s.o:
+ 	$(COMPILE) -c $<
+ 
+@@ -272,9 +272,6 @@
+ 
+ maintainer-clean-compile:
+ 
+-.c.lo:
+-	$(LIBTOOL) --mode=compile $(COMPILE) -c $<
+-
+ .s.lo:
+ 	$(LIBTOOL) --mode=compile $(COMPILE) -c $<
+ 
+@@ -330,125 +327,53 @@
+ subdir = merge
+ 
+ distdir: $(DISTFILES)
++	here=`cd $(top_builddir) && pwd`; \
++	top_distdir=`cd $(top_distdir) && pwd`; \
++	distdir=`cd $(distdir) && pwd`; \
++	cd $(top_srcdir) \
++	  && $(AUTOMAKE) --include-deps --build-dir=$$here --srcdir-name=$(top_srcdir) --output-dir=$$top_distdir --gnu merge/Makefile
+ 	@for file in $(DISTFILES); do \
+ 	  d=$(srcdir); \
+ 	  if test -d $$d/$$file; then \
+-	    cp -pr $$d/$$file $(distdir)/$$file; \
++	    cp -pr $$/$$file $(distdir)/$$file; \
+ 	  else \
+ 	    test -f $(distdir)/$$file \
+ 	    || ln $$d/$$file $(distdir)/$$file 2> /dev/null \
+ 	    || cp -p $$d/$$file $(distdir)/$$file || :; \
+ 	  fi; \
+ 	done
+-_locking.o: _locking.c mrgdef.h ../isam/isamdef.h ../include/nisam.h \
+-	../include/my_base.h ../include/global.h ../include/my_config.h \
+-	../mit-pthreads/include/bits/local_lim.h \
+-	../mit-pthreads/include/endian.h ../include/dbug.h \
+-	../include/my_dir.h ../include/my_sys.h ../include/my_pthread.h \
+-	../mit-pthreads/include/pthread/config.h \
+-	../mit-pthreads/include/sched.h ../include/m_ctype.h \
+-	../include/raid.h ../include/m_string.h ../include/my_list.h \
+-	../include/thr_lock.h ../include/merge.h
+-close.o: close.c mrgdef.h ../isam/isamdef.h ../include/nisam.h \
+-	../include/my_base.h ../include/global.h ../include/my_config.h \
+-	../mit-pthreads/include/bits/local_lim.h \
+-	../mit-pthreads/include/endian.h ../include/dbug.h \
+-	../include/my_dir.h ../include/my_sys.h ../include/my_pthread.h \
+-	../mit-pthreads/include/pthread/config.h \
+-	../mit-pthreads/include/sched.h ../include/m_ctype.h \
+-	../include/raid.h ../include/m_string.h ../include/my_list.h \
+-	../include/thr_lock.h ../include/merge.h
+-create.o: create.c mrgdef.h ../isam/isamdef.h ../include/nisam.h \
+-	../include/my_base.h ../include/global.h ../include/my_config.h \
+-	../mit-pthreads/include/bits/local_lim.h \
+-	../mit-pthreads/include/endian.h ../include/dbug.h \
+-	../include/my_dir.h ../include/my_sys.h ../include/my_pthread.h \
+-	../mit-pthreads/include/pthread/config.h \
+-	../mit-pthreads/include/sched.h ../include/m_ctype.h \
+-	../include/raid.h ../include/m_string.h ../include/my_list.h \
+-	../include/thr_lock.h ../include/merge.h
+-delete.o: delete.c mrgdef.h ../isam/isamdef.h ../include/nisam.h \
+-	../include/my_base.h ../include/global.h ../include/my_config.h \
+-	../mit-pthreads/include/bits/local_lim.h \
+-	../mit-pthreads/include/endian.h ../include/dbug.h \
+-	../include/my_dir.h ../include/my_sys.h ../include/my_pthread.h \
+-	../mit-pthreads/include/pthread/config.h \
+-	../mit-pthreads/include/sched.h ../include/m_ctype.h \
+-	../include/raid.h ../include/m_string.h ../include/my_list.h \
+-	../include/thr_lock.h ../include/merge.h
+-extra.o: extra.c mrgdef.h ../isam/isamdef.h ../include/nisam.h \
+-	../include/my_base.h ../include/global.h ../include/my_config.h \
+-	../mit-pthreads/include/bits/local_lim.h \
+-	../mit-pthreads/include/endian.h ../include/dbug.h \
+-	../include/my_dir.h ../include/my_sys.h ../include/my_pthread.h \
+-	../mit-pthreads/include/pthread/config.h \
+-	../mit-pthreads/include/sched.h ../include/m_ctype.h \
+-	../include/raid.h ../include/m_string.h ../include/my_list.h \
+-	../include/thr_lock.h ../include/merge.h
+-info.o: info.c mrgdef.h ../isam/isamdef.h ../include/nisam.h \
+-	../include/my_base.h ../include/global.h ../include/my_config.h \
+-	../mit-pthreads/include/bits/local_lim.h \
+-	../mit-pthreads/include/endian.h ../include/dbug.h \
+-	../include/my_dir.h ../include/my_sys.h ../include/my_pthread.h \
+-	../mit-pthreads/include/pthread/config.h \
+-	../mit-pthreads/include/sched.h ../include/m_ctype.h \
+-	../include/raid.h ../include/m_string.h ../include/my_list.h \
+-	../include/thr_lock.h ../include/merge.h
+-open.o: open.c mrgdef.h ../isam/isamdef.h ../include/nisam.h \
+-	../include/my_base.h ../include/global.h ../include/my_config.h \
+-	../mit-pthreads/include/bits/local_lim.h \
+-	../mit-pthreads/include/endian.h ../include/dbug.h \
+-	../include/my_dir.h ../include/my_sys.h ../include/my_pthread.h \
+-	../mit-pthreads/include/pthread/config.h \
+-	../mit-pthreads/include/sched.h ../include/m_ctype.h \
+-	../include/raid.h ../include/m_string.h ../include/my_list.h \
+-	../include/thr_lock.h ../include/merge.h
+-panic.o: panic.c mrgdef.h ../isam/isamdef.h ../include/nisam.h \
+-	../include/my_base.h ../include/global.h ../include/my_config.h \
+-	../mit-pthreads/include/bits/local_lim.h \
+-	../mit-pthreads/include/endian.h ../include/dbug.h \
+-	../include/my_dir.h ../include/my_sys.h ../include/my_pthread.h \
+-	../mit-pthreads/include/pthread/config.h \
+-	../mit-pthreads/include/sched.h ../include/m_ctype.h \
+-	../include/raid.h ../include/m_string.h ../include/my_list.h \
+-	../include/thr_lock.h ../include/merge.h
+-rrnd.o: rrnd.c mrgdef.h ../isam/isamdef.h ../include/nisam.h \
+-	../include/my_base.h ../include/global.h ../include/my_config.h \
+-	../mit-pthreads/include/bits/local_lim.h \
+-	../mit-pthreads/include/endian.h ../include/dbug.h \
+-	../include/my_dir.h ../include/my_sys.h ../include/my_pthread.h \
+-	../mit-pthreads/include/pthread/config.h \
+-	../mit-pthreads/include/sched.h ../include/m_ctype.h \
+-	../include/raid.h ../include/m_string.h ../include/my_list.h \
+-	../include/thr_lock.h ../include/merge.h
+-rsame.o: rsame.c mrgdef.h ../isam/isamdef.h ../include/nisam.h \
+-	../include/my_base.h ../include/global.h ../include/my_config.h \
+-	../mit-pthreads/include/bits/local_lim.h \
+-	../mit-pthreads/include/endian.h ../include/dbug.h \
+-	../include/my_dir.h ../include/my_sys.h ../include/my_pthread.h \
+-	../mit-pthreads/include/pthread/config.h \
+-	../mit-pthreads/include/sched.h ../include/m_ctype.h \
+-	../include/raid.h ../include/m_string.h ../include/my_list.h \
+-	../include/thr_lock.h ../include/merge.h
+-static.o: static.c mrgdef.h ../isam/isamdef.h ../include/nisam.h \
+-	../include/my_base.h ../include/global.h ../include/my_config.h \
+-	../mit-pthreads/include/bits/local_lim.h \
+-	../mit-pthreads/include/endian.h ../include/dbug.h \
+-	../include/my_dir.h ../include/my_sys.h ../include/my_pthread.h \
+-	../mit-pthreads/include/pthread/config.h \
+-	../mit-pthreads/include/sched.h ../include/m_ctype.h \
+-	../include/raid.h ../include/m_string.h ../include/my_list.h \
+-	../include/thr_lock.h ../include/merge.h
+-update.o: update.c mrgdef.h ../isam/isamdef.h ../include/nisam.h \
+-	../include/my_base.h ../include/global.h ../include/my_config.h \
+-	../mit-pthreads/include/bits/local_lim.h \
+-	../mit-pthreads/include/endian.h ../include/dbug.h \
+-	../include/my_dir.h ../include/my_sys.h ../include/my_pthread.h \
+-	../mit-pthreads/include/pthread/config.h \
+-	../mit-pthreads/include/sched.h ../include/m_ctype.h \
+-	../include/raid.h ../include/m_string.h ../include/my_list.h \
+-	../include/thr_lock.h ../include/merge.h
+ 
++DEPS_MAGIC := $(shell mkdir .deps > /dev/null 2>&1 || :)
++
++-include $(DEP_FILES)
++
++mostlyclean-depend:
++
++clean-depend:
++
++distclean-depend:
++	-rm -rf .deps
++
++maintainer-clean-depend:
++
++%.o: %.c
++	@echo '$(COMPILE) -c $<'; \
++	$(COMPILE) -Wp,-MD,.deps/$(*F).pp -c $<
++	@-cp .deps/$(*F).pp .deps/$(*F).P; \
++	tr ' ' '\012' < .deps/$(*F).pp \
++	  | sed -e 's/^\\$$//' -e '/^$$/ d' -e '/:$$/ d' -e 's/$$/ :/' \
++	    >> .deps/$(*F).P; \
++	rm .deps/$(*F).pp
++
++%.lo: %.c
++	@echo '$(LTCOMPILE) -c $<'; \
++	$(LTCOMPILE) -Wp,-MD,.deps/$(*F).pp -c $<
++	@-sed -e 's/^\([^:]*\)\.o[ 	]*:/\1.lo \1.o :/' \
++	  < .deps/$(*F).pp > .deps/$(*F).P; \
++	tr ' ' '\012' < .deps/$(*F).pp \
++	  | sed -e 's/^\\$$//' -e '/^$$/ d' -e '/:$$/ d' -e 's/$$/ :/' \
++	    >> .deps/$(*F).P; \
++	rm -f .deps/$(*F).pp
+ info-am:
+ info: info-am
+ dvi-am:
+@@ -486,27 +411,27 @@
+ 
+ maintainer-clean-generic:
+ mostlyclean-am:  mostlyclean-pkglibLIBRARIES mostlyclean-compile \
+-		mostlyclean-libtool mostlyclean-tags \
++		mostlyclean-libtool mostlyclean-tags mostlyclean-depend \
+ 		mostlyclean-generic
+ 
+ mostlyclean: mostlyclean-am
+ 
+ clean-am:  clean-pkglibLIBRARIES clean-compile clean-libtool clean-tags \
+-		clean-generic mostlyclean-am
++		clean-depend clean-generic mostlyclean-am
+ 
+ clean: clean-am
+ 
+ distclean-am:  distclean-pkglibLIBRARIES distclean-compile \
+-		distclean-libtool distclean-tags distclean-generic \
+-		clean-am
++		distclean-libtool distclean-tags distclean-depend \
++		distclean-generic clean-am
+ 	-rm -f libtool
+ 
+ distclean: distclean-am
+ 
+ maintainer-clean-am:  maintainer-clean-pkglibLIBRARIES \
+ 		maintainer-clean-compile maintainer-clean-libtool \
+-		maintainer-clean-tags maintainer-clean-generic \
+-		distclean-am
++		maintainer-clean-tags maintainer-clean-depend \
++		maintainer-clean-generic distclean-am
+ 	@echo "This command is intended for maintainers to use;"
+ 	@echo "it deletes files that may require special tools to rebuild."
+ 
+@@ -518,12 +443,13 @@
+ distclean-compile clean-compile maintainer-clean-compile \
+ mostlyclean-libtool distclean-libtool clean-libtool \
+ maintainer-clean-libtool tags mostlyclean-tags distclean-tags \
+-clean-tags maintainer-clean-tags distdir info-am info dvi-am dvi check \
+-check-am installcheck-am installcheck install-exec-am install-exec \
+-install-data-am install-data install-am install uninstall-am uninstall \
+-all-redirect all-am all installdirs mostlyclean-generic \
+-distclean-generic clean-generic maintainer-clean-generic clean \
+-mostlyclean distclean maintainer-clean
++clean-tags maintainer-clean-tags distdir mostlyclean-depend \
++distclean-depend clean-depend maintainer-clean-depend info-am info \
++dvi-am dvi check check-am installcheck-am installcheck install-exec-am \
++install-exec install-data-am install-data install-am install \
++uninstall-am uninstall all-redirect all-am all installdirs \
++mostlyclean-generic distclean-generic clean-generic \
++maintainer-clean-generic clean mostlyclean distclean maintainer-clean
+ 
+ 
+ # Don't update the files from bitkeeper
+diff -r -u mysql-3.23.36.orig/myisam/Makefile.in mysql-3.23.36/myisam/Makefile.in
+--- mysql-3.23.36.orig/myisam/Makefile.in	Tue Mar 27 10:20:22 2001
++++ mysql-3.23.36/myisam/Makefile.in	Fri Apr 13 16:23:21 2001
+@@ -265,8 +265,22 @@
+ 
+ DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST)
+ 
+-TAR = gtar
++TAR = tar
+ GZIP_ENV = --best
++DEP_FILES =  .deps/ft_eval.P .deps/ft_parser.P .deps/ft_search.P \
++.deps/ft_static.P .deps/ft_stopwords.P .deps/ft_test1.P \
++.deps/ft_update.P .deps/mi_cache.P .deps/mi_changed.P .deps/mi_check.P \
++.deps/mi_checksum.P .deps/mi_close.P .deps/mi_create.P .deps/mi_dbug.P \
++.deps/mi_delete.P .deps/mi_delete_all.P .deps/mi_delete_table.P \
++.deps/mi_dynrec.P .deps/mi_extra.P .deps/mi_info.P .deps/mi_key.P \
++.deps/mi_locking.P .deps/mi_log.P .deps/mi_open.P .deps/mi_packrec.P \
++.deps/mi_page.P .deps/mi_panic.P .deps/mi_range.P .deps/mi_rename.P \
++.deps/mi_rfirst.P .deps/mi_rkey.P .deps/mi_rlast.P .deps/mi_rnext.P \
++.deps/mi_rnext_same.P .deps/mi_rprev.P .deps/mi_rrnd.P .deps/mi_rsame.P \
++.deps/mi_rsamepos.P .deps/mi_scan.P .deps/mi_search.P .deps/mi_static.P \
++.deps/mi_statrec.P .deps/mi_test1.P .deps/mi_test2.P .deps/mi_test3.P \
++.deps/mi_unique.P .deps/mi_update.P .deps/mi_write.P .deps/myisamchk.P \
++.deps/myisamlog.P .deps/myisampack.P .deps/sort.P
+ SOURCES = $(libmyisam_a_SOURCES) myisamchk.c myisamlog.c myisampack.c mi_test1.c mi_test2.c mi_test3.c ft_test1.c ft_eval.c
+ OBJECTS = $(libmyisam_a_OBJECTS) myisamchk.o myisamlog.o myisampack.o mi_test1.o mi_test2.o mi_test3.o ft_test1.o ft_eval.o
+ 
+@@ -274,9 +288,9 @@
+ .SUFFIXES:
+ .SUFFIXES: .S .c .lo .o .s .sh
+ $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) 
+-	cd $(top_srcdir) && $(AUTOMAKE) --gnu --include-deps myisam/Makefile
++	cd $(top_srcdir) && $(AUTOMAKE) --gnu myisam/Makefile
+ 
+-Makefile: $(srcdir)/Makefile.in  $(top_builddir)/config.status
++Makefile: $(srcdir)/Makefile.in  $(top_builddir)/config.status $(BUILT_SOURCES)
+ 	cd $(top_builddir) \
+ 	  && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status
+ 
+@@ -313,9 +327,6 @@
+ 	  rm -f $(DESTDIR)$(pkglibdir)/$$p; \
+ 	done
+ 
+-.c.o:
+-	$(COMPILE) -c $<
+-
+ .s.o:
+ 	$(COMPILE) -c $<
+ 
+@@ -332,9 +343,6 @@
+ 
+ maintainer-clean-compile:
+ 
+-.c.lo:
+-	$(LIBTOOL) --mode=compile $(COMPILE) -c $<
+-
+ .s.lo:
+ 	$(LIBTOOL) --mode=compile $(COMPILE) -c $<
+ 
+@@ -475,508 +483,53 @@
+ subdir = myisam
+ 
+ distdir: $(DISTFILES)
++	here=`cd $(top_builddir) && pwd`; \
++	top_distdir=`cd $(top_distdir) && pwd`; \
++	distdir=`cd $(distdir) && pwd`; \
++	cd $(top_srcdir) \
++	  && $(AUTOMAKE) --include-deps --build-dir=$$here --srcdir-name=$(top_srcdir) --output-dir=$$top_distdir --gnu myisam/Makefile
+ 	@for file in $(DISTFILES); do \
+ 	  d=$(srcdir); \
+ 	  if test -d $$d/$$file; then \
+-	    cp -pr $$d/$$file $(distdir)/$$file; \
++	    cp -pr $$/$$file $(distdir)/$$file; \
+ 	  else \
+ 	    test -f $(distdir)/$$file \
+ 	    || ln $$d/$$file $(distdir)/$$file 2> /dev/null \
+ 	    || cp -p $$d/$$file $(distdir)/$$file || :; \
+ 	  fi; \
+ 	done
+-ft_eval.o: ft_eval.c ftdefs.h fulltext.h myisamdef.h ../include/myisam.h \
+-	../include/my_base.h ../include/global.h ../include/my_config.h \
+-	../mit-pthreads/include/bits/local_lim.h \
+-	../mit-pthreads/include/endian.h ../include/dbug.h \
+-	../include/my_dir.h ../include/my_sys.h ../include/my_pthread.h \
+-	../mit-pthreads/include/pthread/config.h \
+-	../mit-pthreads/include/sched.h ../include/m_ctype.h \
+-	../include/raid.h ../include/m_string.h ../include/my_list.h \
+-	../include/myisampack.h ../include/thr_lock.h \
+-	../include/ft_global.h ../include/my_tree.h ft_eval.h \
+-	../include/getopt.h
+-ft_parser.o: ft_parser.c ftdefs.h fulltext.h myisamdef.h \
+-	../include/myisam.h ../include/my_base.h ../include/global.h \
+-	../include/my_config.h ../mit-pthreads/include/bits/local_lim.h \
+-	../mit-pthreads/include/endian.h ../include/dbug.h \
+-	../include/my_dir.h ../include/my_sys.h ../include/my_pthread.h \
+-	../mit-pthreads/include/pthread/config.h \
+-	../mit-pthreads/include/sched.h ../include/m_ctype.h \
+-	../include/raid.h ../include/m_string.h ../include/my_list.h \
+-	../include/myisampack.h ../include/thr_lock.h \
+-	../include/ft_global.h ../include/my_tree.h
+-ft_search.o: ft_search.c ftdefs.h fulltext.h myisamdef.h \
+-	../include/myisam.h ../include/my_base.h ../include/global.h \
+-	../include/my_config.h ../mit-pthreads/include/bits/local_lim.h \
+-	../mit-pthreads/include/endian.h ../include/dbug.h \
+-	../include/my_dir.h ../include/my_sys.h ../include/my_pthread.h \
+-	../mit-pthreads/include/pthread/config.h \
+-	../mit-pthreads/include/sched.h ../include/m_ctype.h \
+-	../include/raid.h ../include/m_string.h ../include/my_list.h \
+-	../include/myisampack.h ../include/thr_lock.h \
+-	../include/ft_global.h ../include/my_tree.h
+-ft_static.o: ft_static.c ftdefs.h fulltext.h myisamdef.h \
+-	../include/myisam.h ../include/my_base.h ../include/global.h \
+-	../include/my_config.h ../mit-pthreads/include/bits/local_lim.h \
+-	../mit-pthreads/include/endian.h ../include/dbug.h \
+-	../include/my_dir.h ../include/my_sys.h ../include/my_pthread.h \
+-	../mit-pthreads/include/pthread/config.h \
+-	../mit-pthreads/include/sched.h ../include/m_ctype.h \
+-	../include/raid.h ../include/m_string.h ../include/my_list.h \
+-	../include/myisampack.h ../include/thr_lock.h \
+-	../include/ft_global.h ../include/my_tree.h
+-ft_stopwords.o: ft_stopwords.c ftdefs.h fulltext.h myisamdef.h \
+-	../include/myisam.h ../include/my_base.h ../include/global.h \
+-	../include/my_config.h ../mit-pthreads/include/bits/local_lim.h \
+-	../mit-pthreads/include/endian.h ../include/dbug.h \
+-	../include/my_dir.h ../include/my_sys.h ../include/my_pthread.h \
+-	../mit-pthreads/include/pthread/config.h \
+-	../mit-pthreads/include/sched.h ../include/m_ctype.h \
+-	../include/raid.h ../include/m_string.h ../include/my_list.h \
+-	../include/myisampack.h ../include/thr_lock.h \
+-	../include/ft_global.h ../include/my_tree.h
+-ft_test1.o: ft_test1.c ftdefs.h fulltext.h myisamdef.h \
+-	../include/myisam.h ../include/my_base.h ../include/global.h \
+-	../include/my_config.h ../mit-pthreads/include/bits/local_lim.h \
+-	../mit-pthreads/include/endian.h ../include/dbug.h \
+-	../include/my_dir.h ../include/my_sys.h ../include/my_pthread.h \
+-	../mit-pthreads/include/pthread/config.h \
+-	../mit-pthreads/include/sched.h ../include/m_ctype.h \
+-	../include/raid.h ../include/m_string.h ../include/my_list.h \
+-	../include/myisampack.h ../include/thr_lock.h \
+-	../include/ft_global.h ../include/my_tree.h ft_test1.h \
+-	../include/getopt.h
+-ft_update.o: ft_update.c ftdefs.h fulltext.h myisamdef.h \
+-	../include/myisam.h ../include/my_base.h ../include/global.h \
+-	../include/my_config.h ../mit-pthreads/include/bits/local_lim.h \
+-	../mit-pthreads/include/endian.h ../include/dbug.h \
+-	../include/my_dir.h ../include/my_sys.h ../include/my_pthread.h \
+-	../mit-pthreads/include/pthread/config.h \
+-	../mit-pthreads/include/sched.h ../include/m_ctype.h \
+-	../include/raid.h ../include/m_string.h ../include/my_list.h \
+-	../include/myisampack.h ../include/thr_lock.h \
+-	../include/ft_global.h ../include/my_tree.h
+-mi_cache.o: mi_cache.c myisamdef.h ../include/myisam.h \
+-	../include/my_base.h ../include/global.h ../include/my_config.h \
+-	../mit-pthreads/include/bits/local_lim.h \
+-	../mit-pthreads/include/endian.h ../include/dbug.h \
+-	../include/my_dir.h ../include/my_sys.h ../include/my_pthread.h \
+-	../mit-pthreads/include/pthread/config.h \
+-	../mit-pthreads/include/sched.h ../include/m_ctype.h \
+-	../include/raid.h ../include/m_string.h ../include/my_list.h \
+-	../include/myisampack.h ../include/thr_lock.h
+-mi_changed.o: mi_changed.c myisamdef.h ../include/myisam.h \
+-	../include/my_base.h ../include/global.h ../include/my_config.h \
+-	../mit-pthreads/include/bits/local_lim.h \
+-	../mit-pthreads/include/endian.h ../include/dbug.h \
+-	../include/my_dir.h ../include/my_sys.h ../include/my_pthread.h \
+-	../mit-pthreads/include/pthread/config.h \
+-	../mit-pthreads/include/sched.h ../include/m_ctype.h \
+-	../include/raid.h ../include/m_string.h ../include/my_list.h \
+-	../include/myisampack.h ../include/thr_lock.h
+-mi_check.o: mi_check.c fulltext.h myisamdef.h ../include/myisam.h \
+-	../include/my_base.h ../include/global.h ../include/my_config.h \
+-	../mit-pthreads/include/bits/local_lim.h \
+-	../mit-pthreads/include/endian.h ../include/dbug.h \
+-	../include/my_dir.h ../include/my_sys.h ../include/my_pthread.h \
+-	../mit-pthreads/include/pthread/config.h \
+-	../mit-pthreads/include/sched.h ../include/m_ctype.h \
+-	../include/raid.h ../include/m_string.h ../include/my_list.h \
+-	../include/myisampack.h ../include/thr_lock.h \
+-	../include/ft_global.h ../include/getopt.h
+-mi_checksum.o: mi_checksum.c myisamdef.h ../include/myisam.h \
+-	../include/my_base.h ../include/global.h ../include/my_config.h \
+-	../mit-pthreads/include/bits/local_lim.h \
+-	../mit-pthreads/include/endian.h ../include/dbug.h \
+-	../include/my_dir.h ../include/my_sys.h ../include/my_pthread.h \
+-	../mit-pthreads/include/pthread/config.h \
+-	../mit-pthreads/include/sched.h ../include/m_ctype.h \
+-	../include/raid.h ../include/m_string.h ../include/my_list.h \
+-	../include/myisampack.h ../include/thr_lock.h
+-mi_close.o: mi_close.c myisamdef.h ../include/myisam.h \
+-	../include/my_base.h ../include/global.h ../include/my_config.h \
+-	../mit-pthreads/include/bits/local_lim.h \
+-	../mit-pthreads/include/endian.h ../include/dbug.h \
+-	../include/my_dir.h ../include/my_sys.h ../include/my_pthread.h \
+-	../mit-pthreads/include/pthread/config.h \
+-	../mit-pthreads/include/sched.h ../include/m_ctype.h \
+-	../include/raid.h ../include/m_string.h ../include/my_list.h \
+-	../include/myisampack.h ../include/thr_lock.h
+-mi_create.o: mi_create.c fulltext.h myisamdef.h ../include/myisam.h \
+-	../include/my_base.h ../include/global.h ../include/my_config.h \
+-	../mit-pthreads/include/bits/local_lim.h \
+-	../mit-pthreads/include/endian.h ../include/dbug.h \
+-	../include/my_dir.h ../include/my_sys.h ../include/my_pthread.h \
+-	../mit-pthreads/include/pthread/config.h \
+-	../mit-pthreads/include/sched.h ../include/m_ctype.h \
+-	../include/raid.h ../include/m_string.h ../include/my_list.h \
+-	../include/myisampack.h ../include/thr_lock.h \
+-	../include/ft_global.h
+-mi_dbug.o: mi_dbug.c myisamdef.h ../include/myisam.h \
+-	../include/my_base.h ../include/global.h ../include/my_config.h \
+-	../mit-pthreads/include/bits/local_lim.h \
+-	../mit-pthreads/include/endian.h ../include/dbug.h \
+-	../include/my_dir.h ../include/my_sys.h ../include/my_pthread.h \
+-	../mit-pthreads/include/pthread/config.h \
+-	../mit-pthreads/include/sched.h ../include/m_ctype.h \
+-	../include/raid.h ../include/m_string.h ../include/my_list.h \
+-	../include/myisampack.h ../include/thr_lock.h
+-mi_delete.o: mi_delete.c fulltext.h myisamdef.h ../include/myisam.h \
+-	../include/my_base.h ../include/global.h ../include/my_config.h \
+-	../mit-pthreads/include/bits/local_lim.h \
+-	../mit-pthreads/include/endian.h ../include/dbug.h \
+-	../include/my_dir.h ../include/my_sys.h ../include/my_pthread.h \
+-	../mit-pthreads/include/pthread/config.h \
+-	../mit-pthreads/include/sched.h ../include/m_ctype.h \
+-	../include/raid.h ../include/m_string.h ../include/my_list.h \
+-	../include/myisampack.h ../include/thr_lock.h \
+-	../include/ft_global.h
+-mi_delete_all.o: mi_delete_all.c myisamdef.h ../include/myisam.h \
+-	../include/my_base.h ../include/global.h ../include/my_config.h \
+-	../mit-pthreads/include/bits/local_lim.h \
+-	../mit-pthreads/include/endian.h ../include/dbug.h \
+-	../include/my_dir.h ../include/my_sys.h ../include/my_pthread.h \
+-	../mit-pthreads/include/pthread/config.h \
+-	../mit-pthreads/include/sched.h ../include/m_ctype.h \
+-	../include/raid.h ../include/m_string.h ../include/my_list.h \
+-	../include/myisampack.h ../include/thr_lock.h
+-mi_delete_table.o: mi_delete_table.c fulltext.h myisamdef.h \
+-	../include/myisam.h ../include/my_base.h ../include/global.h \
+-	../include/my_config.h ../mit-pthreads/include/bits/local_lim.h \
+-	../mit-pthreads/include/endian.h ../include/dbug.h \
+-	../include/my_dir.h ../include/my_sys.h ../include/my_pthread.h \
+-	../mit-pthreads/include/pthread/config.h \
+-	../mit-pthreads/include/sched.h ../include/m_ctype.h \
+-	../include/raid.h ../include/m_string.h ../include/my_list.h \
+-	../include/myisampack.h ../include/thr_lock.h \
+-	../include/ft_global.h
+-mi_dynrec.o: mi_dynrec.c myisamdef.h ../include/myisam.h \
+-	../include/my_base.h ../include/global.h ../include/my_config.h \
+-	../mit-pthreads/include/bits/local_lim.h \
+-	../mit-pthreads/include/endian.h ../include/dbug.h \
+-	../include/my_dir.h ../include/my_sys.h ../include/my_pthread.h \
+-	../mit-pthreads/include/pthread/config.h \
+-	../mit-pthreads/include/sched.h ../include/m_ctype.h \
+-	../include/raid.h ../include/m_string.h ../include/my_list.h \
+-	../include/myisampack.h ../include/thr_lock.h
+-mi_extra.o: mi_extra.c myisamdef.h ../include/myisam.h \
+-	../include/my_base.h ../include/global.h ../include/my_config.h \
+-	../mit-pthreads/include/bits/local_lim.h \
+-	../mit-pthreads/include/endian.h ../include/dbug.h \
+-	../include/my_dir.h ../include/my_sys.h ../include/my_pthread.h \
+-	../mit-pthreads/include/pthread/config.h \
+-	../mit-pthreads/include/sched.h ../include/m_ctype.h \
+-	../include/raid.h ../include/m_string.h ../include/my_list.h \
+-	../include/myisampack.h ../include/thr_lock.h
+-mi_info.o: mi_info.c myisamdef.h ../include/myisam.h \
+-	../include/my_base.h ../include/global.h ../include/my_config.h \
+-	../mit-pthreads/include/bits/local_lim.h \
+-	../mit-pthreads/include/endian.h ../include/dbug.h \
+-	../include/my_dir.h ../include/my_sys.h ../include/my_pthread.h \
+-	../mit-pthreads/include/pthread/config.h \
+-	../mit-pthreads/include/sched.h ../include/m_ctype.h \
+-	../include/raid.h ../include/m_string.h ../include/my_list.h \
+-	../include/myisampack.h ../include/thr_lock.h
+-mi_key.o: mi_key.c myisamdef.h ../include/myisam.h ../include/my_base.h \
+-	../include/global.h ../include/my_config.h \
+-	../mit-pthreads/include/bits/local_lim.h \
+-	../mit-pthreads/include/endian.h ../include/dbug.h \
+-	../include/my_dir.h ../include/my_sys.h ../include/my_pthread.h \
+-	../mit-pthreads/include/pthread/config.h \
+-	../mit-pthreads/include/sched.h ../include/m_ctype.h \
+-	../include/raid.h ../include/m_string.h ../include/my_list.h \
+-	../include/myisampack.h ../include/thr_lock.h
+-mi_locking.o: mi_locking.c myisamdef.h ../include/myisam.h \
+-	../include/my_base.h ../include/global.h ../include/my_config.h \
+-	../mit-pthreads/include/bits/local_lim.h \
+-	../mit-pthreads/include/endian.h ../include/dbug.h \
+-	../include/my_dir.h ../include/my_sys.h ../include/my_pthread.h \
+-	../mit-pthreads/include/pthread/config.h \
+-	../mit-pthreads/include/sched.h ../include/m_ctype.h \
+-	../include/raid.h ../include/m_string.h ../include/my_list.h \
+-	../include/myisampack.h ../include/thr_lock.h
+-mi_log.o: mi_log.c myisamdef.h ../include/myisam.h ../include/my_base.h \
+-	../include/global.h ../include/my_config.h \
+-	../mit-pthreads/include/bits/local_lim.h \
+-	../mit-pthreads/include/endian.h ../include/dbug.h \
+-	../include/my_dir.h ../include/my_sys.h ../include/my_pthread.h \
+-	../mit-pthreads/include/pthread/config.h \
+-	../mit-pthreads/include/sched.h ../include/m_ctype.h \
+-	../include/raid.h ../include/m_string.h ../include/my_list.h \
+-	../include/myisampack.h ../include/thr_lock.h
+-mi_open.o: mi_open.c fulltext.h myisamdef.h ../include/myisam.h \
+-	../include/my_base.h ../include/global.h ../include/my_config.h \
+-	../mit-pthreads/include/bits/local_lim.h \
+-	../mit-pthreads/include/endian.h ../include/dbug.h \
+-	../include/my_dir.h ../include/my_sys.h ../include/my_pthread.h \
+-	../mit-pthreads/include/pthread/config.h \
+-	../mit-pthreads/include/sched.h ../include/m_ctype.h \
+-	../include/raid.h ../include/m_string.h ../include/my_list.h \
+-	../include/myisampack.h ../include/thr_lock.h \
+-	../include/ft_global.h
+-mi_packrec.o: mi_packrec.c myisamdef.h ../include/myisam.h \
+-	../include/my_base.h ../include/global.h ../include/my_config.h \
+-	../mit-pthreads/include/bits/local_lim.h \
+-	../mit-pthreads/include/endian.h ../include/dbug.h \
+-	../include/my_dir.h ../include/my_sys.h ../include/my_pthread.h \
+-	../mit-pthreads/include/pthread/config.h \
+-	../mit-pthreads/include/sched.h ../include/m_ctype.h \
+-	../include/raid.h ../include/m_string.h ../include/my_list.h \
+-	../include/myisampack.h ../include/thr_lock.h
+-mi_page.o: mi_page.c myisamdef.h ../include/myisam.h \
+-	../include/my_base.h ../include/global.h ../include/my_config.h \
+-	../mit-pthreads/include/bits/local_lim.h \
+-	../mit-pthreads/include/endian.h ../include/dbug.h \
+-	../include/my_dir.h ../include/my_sys.h ../include/my_pthread.h \
+-	../mit-pthreads/include/pthread/config.h \
+-	../mit-pthreads/include/sched.h ../include/m_ctype.h \
+-	../include/raid.h ../include/m_string.h ../include/my_list.h \
+-	../include/myisampack.h ../include/thr_lock.h
+-mi_panic.o: mi_panic.c fulltext.h myisamdef.h ../include/myisam.h \
+-	../include/my_base.h ../include/global.h ../include/my_config.h \
+-	../mit-pthreads/include/bits/local_lim.h \
+-	../mit-pthreads/include/endian.h ../include/dbug.h \
+-	../include/my_dir.h ../include/my_sys.h ../include/my_pthread.h \
+-	../mit-pthreads/include/pthread/config.h \
+-	../mit-pthreads/include/sched.h ../include/m_ctype.h \
+-	../include/raid.h ../include/m_string.h ../include/my_list.h \
+-	../include/myisampack.h ../include/thr_lock.h \
+-	../include/ft_global.h
+-mi_range.o: mi_range.c myisamdef.h ../include/myisam.h \
+-	../include/my_base.h ../include/global.h ../include/my_config.h \
+-	../mit-pthreads/include/bits/local_lim.h \
+-	../mit-pthreads/include/endian.h ../include/dbug.h \
+-	../include/my_dir.h ../include/my_sys.h ../include/my_pthread.h \
+-	../mit-pthreads/include/pthread/config.h \
+-	../mit-pthreads/include/sched.h ../include/m_ctype.h \
+-	../include/raid.h ../include/m_string.h ../include/my_list.h \
+-	../include/myisampack.h ../include/thr_lock.h
+-mi_rename.o: mi_rename.c fulltext.h myisamdef.h ../include/myisam.h \
+-	../include/my_base.h ../include/global.h ../include/my_config.h \
+-	../mit-pthreads/include/bits/local_lim.h \
+-	../mit-pthreads/include/endian.h ../include/dbug.h \
+-	../include/my_dir.h ../include/my_sys.h ../include/my_pthread.h \
+-	../mit-pthreads/include/pthread/config.h \
+-	../mit-pthreads/include/sched.h ../include/m_ctype.h \
+-	../include/raid.h ../include/m_string.h ../include/my_list.h \
+-	../include/myisampack.h ../include/thr_lock.h \
+-	../include/ft_global.h
+-mi_rfirst.o: mi_rfirst.c myisamdef.h ../include/myisam.h \
+-	../include/my_base.h ../include/global.h ../include/my_config.h \
+-	../mit-pthreads/include/bits/local_lim.h \
+-	../mit-pthreads/include/endian.h ../include/dbug.h \
+-	../include/my_dir.h ../include/my_sys.h ../include/my_pthread.h \
+-	../mit-pthreads/include/pthread/config.h \
+-	../mit-pthreads/include/sched.h ../include/m_ctype.h \
+-	../include/raid.h ../include/m_string.h ../include/my_list.h \
+-	../include/myisampack.h ../include/thr_lock.h
+-mi_rkey.o: mi_rkey.c myisamdef.h ../include/myisam.h \
+-	../include/my_base.h ../include/global.h ../include/my_config.h \
+-	../mit-pthreads/include/bits/local_lim.h \
+-	../mit-pthreads/include/endian.h ../include/dbug.h \
+-	../include/my_dir.h ../include/my_sys.h ../include/my_pthread.h \
+-	../mit-pthreads/include/pthread/config.h \
+-	../mit-pthreads/include/sched.h ../include/m_ctype.h \
+-	../include/raid.h ../include/m_string.h ../include/my_list.h \
+-	../include/myisampack.h ../include/thr_lock.h
+-mi_rlast.o: mi_rlast.c myisamdef.h ../include/myisam.h \
+-	../include/my_base.h ../include/global.h ../include/my_config.h \
+-	../mit-pthreads/include/bits/local_lim.h \
+-	../mit-pthreads/include/endian.h ../include/dbug.h \
+-	../include/my_dir.h ../include/my_sys.h ../include/my_pthread.h \
+-	../mit-pthreads/include/pthread/config.h \
+-	../mit-pthreads/include/sched.h ../include/m_ctype.h \
+-	../include/raid.h ../include/m_string.h ../include/my_list.h \
+-	../include/myisampack.h ../include/thr_lock.h
+-mi_rnext.o: mi_rnext.c myisamdef.h ../include/myisam.h \
+-	../include/my_base.h ../include/global.h ../include/my_config.h \
+-	../mit-pthreads/include/bits/local_lim.h \
+-	../mit-pthreads/include/endian.h ../include/dbug.h \
+-	../include/my_dir.h ../include/my_sys.h ../include/my_pthread.h \
+-	../mit-pthreads/include/pthread/config.h \
+-	../mit-pthreads/include/sched.h ../include/m_ctype.h \
+-	../include/raid.h ../include/m_string.h ../include/my_list.h \
+-	../include/myisampack.h ../include/thr_lock.h
+-mi_rnext_same.o: mi_rnext_same.c myisamdef.h ../include/myisam.h \
+-	../include/my_base.h ../include/global.h ../include/my_config.h \
+-	../mit-pthreads/include/bits/local_lim.h \
+-	../mit-pthreads/include/endian.h ../include/dbug.h \
+-	../include/my_dir.h ../include/my_sys.h ../include/my_pthread.h \
+-	../mit-pthreads/include/pthread/config.h \
+-	../mit-pthreads/include/sched.h ../include/m_ctype.h \
+-	../include/raid.h ../include/m_string.h ../include/my_list.h \
+-	../include/myisampack.h ../include/thr_lock.h
+-mi_rprev.o: mi_rprev.c myisamdef.h ../include/myisam.h \
+-	../include/my_base.h ../include/global.h ../include/my_config.h \
+-	../mit-pthreads/include/bits/local_lim.h \
+-	../mit-pthreads/include/endian.h ../include/dbug.h \
+-	../include/my_dir.h ../include/my_sys.h ../include/my_pthread.h \
+-	../mit-pthreads/include/pthread/config.h \
+-	../mit-pthreads/include/sched.h ../include/m_ctype.h \
+-	../include/raid.h ../include/m_string.h ../include/my_list.h \
+-	../include/myisampack.h ../include/thr_lock.h
+-mi_rrnd.o: mi_rrnd.c myisamdef.h ../include/myisam.h \
+-	../include/my_base.h ../include/global.h ../include/my_config.h \
+-	../mit-pthreads/include/bits/local_lim.h \
+-	../mit-pthreads/include/endian.h ../include/dbug.h \
+-	../include/my_dir.h ../include/my_sys.h ../include/my_pthread.h \
+-	../mit-pthreads/include/pthread/config.h \
+-	../mit-pthreads/include/sched.h ../include/m_ctype.h \
+-	../include/raid.h ../include/m_string.h ../include/my_list.h \
+-	../include/myisampack.h ../include/thr_lock.h
+-mi_rsame.o: mi_rsame.c myisamdef.h ../include/myisam.h \
+-	../include/my_base.h ../include/global.h ../include/my_config.h \
+-	../mit-pthreads/include/bits/local_lim.h \
+-	../mit-pthreads/include/endian.h ../include/dbug.h \
+-	../include/my_dir.h ../include/my_sys.h ../include/my_pthread.h \
+-	../mit-pthreads/include/pthread/config.h \
+-	../mit-pthreads/include/sched.h ../include/m_ctype.h \
+-	../include/raid.h ../include/m_string.h ../include/my_list.h \
+-	../include/myisampack.h ../include/thr_lock.h
+-mi_rsamepos.o: mi_rsamepos.c myisamdef.h ../include/myisam.h \
+-	../include/my_base.h ../include/global.h ../include/my_config.h \
+-	../mit-pthreads/include/bits/local_lim.h \
+-	../mit-pthreads/include/endian.h ../include/dbug.h \
+-	../include/my_dir.h ../include/my_sys.h ../include/my_pthread.h \
+-	../mit-pthreads/include/pthread/config.h \
+-	../mit-pthreads/include/sched.h ../include/m_ctype.h \
+-	../include/raid.h ../include/m_string.h ../include/my_list.h \
+-	../include/myisampack.h ../include/thr_lock.h
+-mi_scan.o: mi_scan.c myisamdef.h ../include/myisam.h \
+-	../include/my_base.h ../include/global.h ../include/my_config.h \
+-	../mit-pthreads/include/bits/local_lim.h \
+-	../mit-pthreads/include/endian.h ../include/dbug.h \
+-	../include/my_dir.h ../include/my_sys.h ../include/my_pthread.h \
+-	../mit-pthreads/include/pthread/config.h \
+-	../mit-pthreads/include/sched.h ../include/m_ctype.h \
+-	../include/raid.h ../include/m_string.h ../include/my_list.h \
+-	../include/myisampack.h ../include/thr_lock.h
+-mi_search.o: mi_search.c fulltext.h myisamdef.h ../include/myisam.h \
+-	../include/my_base.h ../include/global.h ../include/my_config.h \
+-	../mit-pthreads/include/bits/local_lim.h \
+-	../mit-pthreads/include/endian.h ../include/dbug.h \
+-	../include/my_dir.h ../include/my_sys.h ../include/my_pthread.h \
+-	../mit-pthreads/include/pthread/config.h \
+-	../mit-pthreads/include/sched.h ../include/m_ctype.h \
+-	../include/raid.h ../include/m_string.h ../include/my_list.h \
+-	../include/myisampack.h ../include/thr_lock.h \
+-	../include/ft_global.h
+-mi_static.o: mi_static.c myisamdef.h ../include/myisam.h \
+-	../include/my_base.h ../include/global.h ../include/my_config.h \
+-	../mit-pthreads/include/bits/local_lim.h \
+-	../mit-pthreads/include/endian.h ../include/dbug.h \
+-	../include/my_dir.h ../include/my_sys.h ../include/my_pthread.h \
+-	../mit-pthreads/include/pthread/config.h \
+-	../mit-pthreads/include/sched.h ../include/m_ctype.h \
+-	../include/raid.h ../include/m_string.h ../include/my_list.h \
+-	../include/myisampack.h ../include/thr_lock.h
+-mi_statrec.o: mi_statrec.c myisamdef.h ../include/myisam.h \
+-	../include/my_base.h ../include/global.h ../include/my_config.h \
+-	../mit-pthreads/include/bits/local_lim.h \
+-	../mit-pthreads/include/endian.h ../include/dbug.h \
+-	../include/my_dir.h ../include/my_sys.h ../include/my_pthread.h \
+-	../mit-pthreads/include/pthread/config.h \
+-	../mit-pthreads/include/sched.h ../include/m_ctype.h \
+-	../include/raid.h ../include/m_string.h ../include/my_list.h \
+-	../include/myisampack.h ../include/thr_lock.h
+-mi_test1.o: mi_test1.c ../include/myisam.h ../include/my_base.h \
+-	../include/global.h ../include/my_config.h \
+-	../mit-pthreads/include/bits/local_lim.h \
+-	../mit-pthreads/include/endian.h ../include/dbug.h \
+-	../include/my_dir.h ../include/my_sys.h ../include/my_pthread.h \
+-	../mit-pthreads/include/pthread/config.h \
+-	../mit-pthreads/include/sched.h ../include/m_ctype.h \
+-	../include/raid.h ../include/m_string.h ../include/my_list.h \
+-	../include/getopt.h
+-mi_test2.o: mi_test2.c myisamdef.h ../include/myisam.h \
+-	../include/my_base.h ../include/global.h ../include/my_config.h \
+-	../mit-pthreads/include/bits/local_lim.h \
+-	../mit-pthreads/include/endian.h ../include/dbug.h \
+-	../include/my_dir.h ../include/my_sys.h ../include/my_pthread.h \
+-	../mit-pthreads/include/pthread/config.h \
+-	../mit-pthreads/include/sched.h ../include/m_ctype.h \
+-	../include/raid.h ../include/m_string.h ../include/my_list.h \
+-	../include/myisampack.h ../include/thr_lock.h
+-mi_test3.o: mi_test3.c ../include/myisam.h ../include/my_base.h \
+-	../include/global.h ../include/my_config.h \
+-	../mit-pthreads/include/bits/local_lim.h \
+-	../mit-pthreads/include/endian.h ../include/dbug.h \
+-	../include/my_dir.h ../include/my_sys.h ../include/my_pthread.h \
+-	../mit-pthreads/include/pthread/config.h \
+-	../mit-pthreads/include/sched.h ../include/m_ctype.h \
+-	../include/raid.h ../include/m_string.h ../include/my_list.h
+-mi_unique.o: mi_unique.c myisamdef.h ../include/myisam.h \
+-	../include/my_base.h ../include/global.h ../include/my_config.h \
+-	../mit-pthreads/include/bits/local_lim.h \
+-	../mit-pthreads/include/endian.h ../include/dbug.h \
+-	../include/my_dir.h ../include/my_sys.h ../include/my_pthread.h \
+-	../mit-pthreads/include/pthread/config.h \
+-	../mit-pthreads/include/sched.h ../include/m_ctype.h \
+-	../include/raid.h ../include/m_string.h ../include/my_list.h \
+-	../include/myisampack.h ../include/thr_lock.h
+-mi_update.o: mi_update.c fulltext.h myisamdef.h ../include/myisam.h \
+-	../include/my_base.h ../include/global.h ../include/my_config.h \
+-	../mit-pthreads/include/bits/local_lim.h \
+-	../mit-pthreads/include/endian.h ../include/dbug.h \
+-	../include/my_dir.h ../include/my_sys.h ../include/my_pthread.h \
+-	../mit-pthreads/include/pthread/config.h \
+-	../mit-pthreads/include/sched.h ../include/m_ctype.h \
+-	../include/raid.h ../include/m_string.h ../include/my_list.h \
+-	../include/myisampack.h ../include/thr_lock.h \
+-	../include/ft_global.h
+-mi_write.o: mi_write.c fulltext.h myisamdef.h ../include/myisam.h \
+-	../include/my_base.h ../include/global.h ../include/my_config.h \
+-	../mit-pthreads/include/bits/local_lim.h \
+-	../mit-pthreads/include/endian.h ../include/dbug.h \
+-	../include/my_dir.h ../include/my_sys.h ../include/my_pthread.h \
+-	../mit-pthreads/include/pthread/config.h \
+-	../mit-pthreads/include/sched.h ../include/m_ctype.h \
+-	../include/raid.h ../include/m_string.h ../include/my_list.h \
+-	../include/myisampack.h ../include/thr_lock.h \
+-	../include/ft_global.h
+-myisamchk.o: myisamchk.c fulltext.h myisamdef.h ../include/myisam.h \
+-	../include/my_base.h ../include/global.h ../include/my_config.h \
+-	../mit-pthreads/include/bits/local_lim.h \
+-	../mit-pthreads/include/endian.h ../include/dbug.h \
+-	../include/my_dir.h ../include/my_sys.h ../include/my_pthread.h \
+-	../mit-pthreads/include/pthread/config.h \
+-	../mit-pthreads/include/sched.h ../include/m_ctype.h \
+-	../include/raid.h ../include/m_string.h ../include/my_list.h \
+-	../include/myisampack.h ../include/thr_lock.h \
+-	../include/ft_global.h ../include/getopt.h
+-myisamlog.o: myisamlog.c myisamdef.h ../include/myisam.h \
+-	../include/my_base.h ../include/global.h ../include/my_config.h \
+-	../mit-pthreads/include/bits/local_lim.h \
+-	../mit-pthreads/include/endian.h ../include/dbug.h \
+-	../include/my_dir.h ../include/my_sys.h ../include/my_pthread.h \
+-	../mit-pthreads/include/pthread/config.h \
+-	../mit-pthreads/include/sched.h ../include/m_ctype.h \
+-	../include/raid.h ../include/m_string.h ../include/my_list.h \
+-	../include/myisampack.h ../include/thr_lock.h \
+-	../include/my_tree.h
+-myisampack.o: myisampack.c myisamdef.h ../include/myisam.h \
+-	../include/my_base.h ../include/global.h ../include/my_config.h \
+-	../mit-pthreads/include/bits/local_lim.h \
+-	../mit-pthreads/include/endian.h ../include/dbug.h \
+-	../include/my_dir.h ../include/my_sys.h ../include/my_pthread.h \
+-	../mit-pthreads/include/pthread/config.h \
+-	../mit-pthreads/include/sched.h ../include/m_ctype.h \
+-	../include/raid.h ../include/m_string.h ../include/my_list.h \
+-	../include/myisampack.h ../include/thr_lock.h \
+-	../include/queues.h ../include/my_tree.h ../include/mysys_err.h \
+-	../include/getopt.h
+-sort.o: sort.c myisamdef.h ../include/myisam.h ../include/my_base.h \
+-	../include/global.h ../include/my_config.h \
+-	../mit-pthreads/include/bits/local_lim.h \
+-	../mit-pthreads/include/endian.h ../include/dbug.h \
+-	../include/my_dir.h ../include/my_sys.h ../include/my_pthread.h \
+-	../mit-pthreads/include/pthread/config.h \
+-	../mit-pthreads/include/sched.h ../include/m_ctype.h \
+-	../include/raid.h ../include/m_string.h ../include/my_list.h \
+-	../include/myisampack.h ../include/thr_lock.h \
+-	../include/queues.h
+ 
++DEPS_MAGIC := $(shell mkdir .deps > /dev/null 2>&1 || :)
++
++-include $(DEP_FILES)
++
++mostlyclean-depend:
++
++clean-depend:
++
++distclean-depend:
++	-rm -rf .deps
++
++maintainer-clean-depend:
++
++%.o: %.c
++	@echo '$(COMPILE) -c $<'; \
++	$(COMPILE) -Wp,-MD,.deps/$(*F).pp -c $<
++	@-cp .deps/$(*F).pp .deps/$(*F).P; \
++	tr ' ' '\012' < .deps/$(*F).pp \
++	  | sed -e 's/^\\$$//' -e '/^$$/ d' -e '/:$$/ d' -e 's/$$/ :/' \
++	    >> .deps/$(*F).P; \
++	rm .deps/$(*F).pp
++
++%.lo: %.c
++	@echo '$(LTCOMPILE) -c $<'; \
++	$(LTCOMPILE) -Wp,-MD,.deps/$(*F).pp -c $<
++	@-sed -e 's/^\([^:]*\)\.o[ 	]*:/\1.lo \1.o :/' \
++	  < .deps/$(*F).pp > .deps/$(*F).P; \
++	tr ' ' '\012' < .deps/$(*F).pp \
++	  | sed -e 's/^\\$$//' -e '/^$$/ d' -e '/:$$/ d' -e 's/$$/ :/' \
++	    >> .deps/$(*F).P; \
++	rm -f .deps/$(*F).pp
+ info-am:
+ info: info-am
+ dvi-am:
+@@ -1019,20 +572,20 @@
+ mostlyclean-am:  mostlyclean-pkglibLIBRARIES mostlyclean-compile \
+ 		mostlyclean-libtool mostlyclean-binPROGRAMS \
+ 		mostlyclean-noinstPROGRAMS mostlyclean-tags \
+-		mostlyclean-generic
++		mostlyclean-depend mostlyclean-generic
+ 
+ mostlyclean: mostlyclean-am
+ 
+ clean-am:  clean-pkglibLIBRARIES clean-compile clean-libtool \
+ 		clean-binPROGRAMS clean-noinstPROGRAMS clean-tags \
+-		clean-generic mostlyclean-am
++		clean-depend clean-generic mostlyclean-am
+ 
+ clean: clean-am
+ 
+ distclean-am:  distclean-pkglibLIBRARIES distclean-compile \
+ 		distclean-libtool distclean-binPROGRAMS \
+ 		distclean-noinstPROGRAMS distclean-tags \
+-		distclean-generic clean-am
++		distclean-depend distclean-generic clean-am
+ 	-rm -f libtool
+ 
+ distclean: distclean-am
+@@ -1041,7 +594,8 @@
+ 		maintainer-clean-compile maintainer-clean-libtool \
+ 		maintainer-clean-binPROGRAMS \
+ 		maintainer-clean-noinstPROGRAMS maintainer-clean-tags \
+-		maintainer-clean-generic distclean-am
++		maintainer-clean-depend maintainer-clean-generic \
++		distclean-am
+ 	@echo "This command is intended for maintainers to use;"
+ 	@echo "it deletes files that may require special tools to rebuild."
+ 
+@@ -1057,12 +611,14 @@
+ install-binPROGRAMS mostlyclean-noinstPROGRAMS distclean-noinstPROGRAMS \
+ clean-noinstPROGRAMS maintainer-clean-noinstPROGRAMS \
+ uninstall-pkgdataDATA install-pkgdataDATA tags mostlyclean-tags \
+-distclean-tags clean-tags maintainer-clean-tags distdir info-am info \
+-dvi-am dvi check check-am installcheck-am installcheck install-exec-am \
+-install-exec install-data-am install-data install-am install \
+-uninstall-am uninstall all-redirect all-am all installdirs \
+-mostlyclean-generic distclean-generic clean-generic \
+-maintainer-clean-generic clean mostlyclean distclean maintainer-clean
++distclean-tags clean-tags maintainer-clean-tags distdir \
++mostlyclean-depend distclean-depend clean-depend \
++maintainer-clean-depend info-am info dvi-am dvi check check-am \
++installcheck-am installcheck install-exec-am install-exec \
++install-data-am install-data install-am install uninstall-am uninstall \
++all-redirect all-am all installdirs mostlyclean-generic \
++distclean-generic clean-generic maintainer-clean-generic clean \
++mostlyclean distclean maintainer-clean
+ 
+ 
+ # Move to automake rules ?
+diff -r -u mysql-3.23.36.orig/myisammrg/Makefile.in mysql-3.23.36/myisammrg/Makefile.in
+--- mysql-3.23.36.orig/myisammrg/Makefile.in	Tue Mar 27 10:20:23 2001
++++ mysql-3.23.36/myisammrg/Makefile.in	Fri Apr 13 16:23:21 2001
+@@ -206,8 +206,14 @@
+ 
+ DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST)
+ 
+-TAR = gtar
++TAR = tar
+ GZIP_ENV = --best
++DEP_FILES =  .deps/myrg_close.P .deps/myrg_create.P .deps/myrg_delete.P \
++.deps/myrg_extra.P .deps/myrg_info.P .deps/myrg_locking.P \
++.deps/myrg_open.P .deps/myrg_panic.P .deps/myrg_queue.P \
++.deps/myrg_rfirst.P .deps/myrg_rkey.P .deps/myrg_rlast.P \
++.deps/myrg_rnext.P .deps/myrg_rprev.P .deps/myrg_rrnd.P \
++.deps/myrg_rsame.P .deps/myrg_static.P .deps/myrg_update.P
+ SOURCES = $(libmyisammrg_a_SOURCES)
+ OBJECTS = $(libmyisammrg_a_OBJECTS)
+ 
+@@ -215,9 +221,9 @@
+ .SUFFIXES:
+ .SUFFIXES: .S .c .lo .o .s
+ $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) 
+-	cd $(top_srcdir) && $(AUTOMAKE) --gnu --include-deps myisammrg/Makefile
++	cd $(top_srcdir) && $(AUTOMAKE) --gnu myisammrg/Makefile
+ 
+-Makefile: $(srcdir)/Makefile.in  $(top_builddir)/config.status
++Makefile: $(srcdir)/Makefile.in  $(top_builddir)/config.status $(BUILT_SOURCES)
+ 	cd $(top_builddir) \
+ 	  && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status
+ 
+@@ -254,9 +260,6 @@
+ 	  rm -f $(DESTDIR)$(pkglibdir)/$$p; \
+ 	done
+ 
+-.c.o:
+-	$(COMPILE) -c $<
+-
+ .s.o:
+ 	$(COMPILE) -c $<
+ 
+@@ -273,9 +276,6 @@
+ 
+ maintainer-clean-compile:
+ 
+-.c.lo:
+-	$(LIBTOOL) --mode=compile $(COMPILE) -c $<
+-
+ .s.lo:
+ 	$(LIBTOOL) --mode=compile $(COMPILE) -c $<
+ 
+@@ -331,197 +331,53 @@
+ subdir = myisammrg
+ 
+ distdir: $(DISTFILES)
++	here=`cd $(top_builddir) && pwd`; \
++	top_distdir=`cd $(top_distdir) && pwd`; \
++	distdir=`cd $(distdir) && pwd`; \
++	cd $(top_srcdir) \
++	  && $(AUTOMAKE) --include-deps --build-dir=$$here --srcdir-name=$(top_srcdir) --output-dir=$$top_distdir --gnu myisammrg/Makefile
+ 	@for file in $(DISTFILES); do \
+ 	  d=$(srcdir); \
+ 	  if test -d $$d/$$file; then \
+-	    cp -pr $$d/$$file $(distdir)/$$file; \
++	    cp -pr $$/$$file $(distdir)/$$file; \
+ 	  else \
+ 	    test -f $(distdir)/$$file \
+ 	    || ln $$d/$$file $(distdir)/$$file 2> /dev/null \
+ 	    || cp -p $$d/$$file $(distdir)/$$file || :; \
+ 	  fi; \
+ 	done
+-myrg_close.o: myrg_close.c mymrgdef.h ../myisam/myisamdef.h \
+-	../include/myisam.h ../include/my_base.h ../include/global.h \
+-	../include/my_config.h ../mit-pthreads/include/bits/local_lim.h \
+-	../mit-pthreads/include/endian.h ../include/dbug.h \
+-	../include/my_dir.h ../include/my_sys.h ../include/my_pthread.h \
+-	../mit-pthreads/include/pthread/config.h \
+-	../mit-pthreads/include/sched.h ../include/m_ctype.h \
+-	../include/raid.h ../include/m_string.h ../include/my_list.h \
+-	../include/myisampack.h ../include/thr_lock.h \
+-	../include/myisammrg.h ../include/queues.h
+-myrg_create.o: myrg_create.c mymrgdef.h ../myisam/myisamdef.h \
+-	../include/myisam.h ../include/my_base.h ../include/global.h \
+-	../include/my_config.h ../mit-pthreads/include/bits/local_lim.h \
+-	../mit-pthreads/include/endian.h ../include/dbug.h \
+-	../include/my_dir.h ../include/my_sys.h ../include/my_pthread.h \
+-	../mit-pthreads/include/pthread/config.h \
+-	../mit-pthreads/include/sched.h ../include/m_ctype.h \
+-	../include/raid.h ../include/m_string.h ../include/my_list.h \
+-	../include/myisampack.h ../include/thr_lock.h \
+-	../include/myisammrg.h ../include/queues.h
+-myrg_delete.o: myrg_delete.c mymrgdef.h ../myisam/myisamdef.h \
+-	../include/myisam.h ../include/my_base.h ../include/global.h \
+-	../include/my_config.h ../mit-pthreads/include/bits/local_lim.h \
+-	../mit-pthreads/include/endian.h ../include/dbug.h \
+-	../include/my_dir.h ../include/my_sys.h ../include/my_pthread.h \
+-	../mit-pthreads/include/pthread/config.h \
+-	../mit-pthreads/include/sched.h ../include/m_ctype.h \
+-	../include/raid.h ../include/m_string.h ../include/my_list.h \
+-	../include/myisampack.h ../include/thr_lock.h \
+-	../include/myisammrg.h ../include/queues.h
+-myrg_extra.o: myrg_extra.c mymrgdef.h ../myisam/myisamdef.h \
+-	../include/myisam.h ../include/my_base.h ../include/global.h \
+-	../include/my_config.h ../mit-pthreads/include/bits/local_lim.h \
+-	../mit-pthreads/include/endian.h ../include/dbug.h \
+-	../include/my_dir.h ../include/my_sys.h ../include/my_pthread.h \
+-	../mit-pthreads/include/pthread/config.h \
+-	../mit-pthreads/include/sched.h ../include/m_ctype.h \
+-	../include/raid.h ../include/m_string.h ../include/my_list.h \
+-	../include/myisampack.h ../include/thr_lock.h \
+-	../include/myisammrg.h ../include/queues.h
+-myrg_info.o: myrg_info.c mymrgdef.h ../myisam/myisamdef.h \
+-	../include/myisam.h ../include/my_base.h ../include/global.h \
+-	../include/my_config.h ../mit-pthreads/include/bits/local_lim.h \
+-	../mit-pthreads/include/endian.h ../include/dbug.h \
+-	../include/my_dir.h ../include/my_sys.h ../include/my_pthread.h \
+-	../mit-pthreads/include/pthread/config.h \
+-	../mit-pthreads/include/sched.h ../include/m_ctype.h \
+-	../include/raid.h ../include/m_string.h ../include/my_list.h \
+-	../include/myisampack.h ../include/thr_lock.h \
+-	../include/myisammrg.h ../include/queues.h
+-myrg_locking.o: myrg_locking.c mymrgdef.h ../myisam/myisamdef.h \
+-	../include/myisam.h ../include/my_base.h ../include/global.h \
+-	../include/my_config.h ../mit-pthreads/include/bits/local_lim.h \
+-	../mit-pthreads/include/endian.h ../include/dbug.h \
+-	../include/my_dir.h ../include/my_sys.h ../include/my_pthread.h \
+-	../mit-pthreads/include/pthread/config.h \
+-	../mit-pthreads/include/sched.h ../include/m_ctype.h \
+-	../include/raid.h ../include/m_string.h ../include/my_list.h \
+-	../include/myisampack.h ../include/thr_lock.h \
+-	../include/myisammrg.h ../include/queues.h
+-myrg_open.o: myrg_open.c mymrgdef.h ../myisam/myisamdef.h \
+-	../include/myisam.h ../include/my_base.h ../include/global.h \
+-	../include/my_config.h ../mit-pthreads/include/bits/local_lim.h \
+-	../mit-pthreads/include/endian.h ../include/dbug.h \
+-	../include/my_dir.h ../include/my_sys.h ../include/my_pthread.h \
+-	../mit-pthreads/include/pthread/config.h \
+-	../mit-pthreads/include/sched.h ../include/m_ctype.h \
+-	../include/raid.h ../include/m_string.h ../include/my_list.h \
+-	../include/myisampack.h ../include/thr_lock.h \
+-	../include/myisammrg.h ../include/queues.h
+-myrg_panic.o: myrg_panic.c mymrgdef.h ../myisam/myisamdef.h \
+-	../include/myisam.h ../include/my_base.h ../include/global.h \
+-	../include/my_config.h ../mit-pthreads/include/bits/local_lim.h \
+-	../mit-pthreads/include/endian.h ../include/dbug.h \
+-	../include/my_dir.h ../include/my_sys.h ../include/my_pthread.h \
+-	../mit-pthreads/include/pthread/config.h \
+-	../mit-pthreads/include/sched.h ../include/m_ctype.h \
+-	../include/raid.h ../include/m_string.h ../include/my_list.h \
+-	../include/myisampack.h ../include/thr_lock.h \
+-	../include/myisammrg.h ../include/queues.h
+-myrg_queue.o: myrg_queue.c mymrgdef.h ../myisam/myisamdef.h \
+-	../include/myisam.h ../include/my_base.h ../include/global.h \
+-	../include/my_config.h ../mit-pthreads/include/bits/local_lim.h \
+-	../mit-pthreads/include/endian.h ../include/dbug.h \
+-	../include/my_dir.h ../include/my_sys.h ../include/my_pthread.h \
+-	../mit-pthreads/include/pthread/config.h \
+-	../mit-pthreads/include/sched.h ../include/m_ctype.h \
+-	../include/raid.h ../include/m_string.h ../include/my_list.h \
+-	../include/myisampack.h ../include/thr_lock.h \
+-	../include/myisammrg.h ../include/queues.h
+-myrg_rfirst.o: myrg_rfirst.c mymrgdef.h ../myisam/myisamdef.h \
+-	../include/myisam.h ../include/my_base.h ../include/global.h \
+-	../include/my_config.h ../mit-pthreads/include/bits/local_lim.h \
+-	../mit-pthreads/include/endian.h ../include/dbug.h \
+-	../include/my_dir.h ../include/my_sys.h ../include/my_pthread.h \
+-	../mit-pthreads/include/pthread/config.h \
+-	../mit-pthreads/include/sched.h ../include/m_ctype.h \
+-	../include/raid.h ../include/m_string.h ../include/my_list.h \
+-	../include/myisampack.h ../include/thr_lock.h \
+-	../include/myisammrg.h ../include/queues.h
+-myrg_rkey.o: myrg_rkey.c mymrgdef.h ../myisam/myisamdef.h \
+-	../include/myisam.h ../include/my_base.h ../include/global.h \
+-	../include/my_config.h ../mit-pthreads/include/bits/local_lim.h \
+-	../mit-pthreads/include/endian.h ../include/dbug.h \
+-	../include/my_dir.h ../include/my_sys.h ../include/my_pthread.h \
+-	../mit-pthreads/include/pthread/config.h \
+-	../mit-pthreads/include/sched.h ../include/m_ctype.h \
+-	../include/raid.h ../include/m_string.h ../include/my_list.h \
+-	../include/myisampack.h ../include/thr_lock.h \
+-	../include/myisammrg.h ../include/queues.h
+-myrg_rlast.o: myrg_rlast.c mymrgdef.h ../myisam/myisamdef.h \
+-	../include/myisam.h ../include/my_base.h ../include/global.h \
+-	../include/my_config.h ../mit-pthreads/include/bits/local_lim.h \
+-	../mit-pthreads/include/endian.h ../include/dbug.h \
+-	../include/my_dir.h ../include/my_sys.h ../include/my_pthread.h \
+-	../mit-pthreads/include/pthread/config.h \
+-	../mit-pthreads/include/sched.h ../include/m_ctype.h \
+-	../include/raid.h ../include/m_string.h ../include/my_list.h \
+-	../include/myisampack.h ../include/thr_lock.h \
+-	../include/myisammrg.h ../include/queues.h
+-myrg_rnext.o: myrg_rnext.c mymrgdef.h ../myisam/myisamdef.h \
+-	../include/myisam.h ../include/my_base.h ../include/global.h \
+-	../include/my_config.h ../mit-pthreads/include/bits/local_lim.h \
+-	../mit-pthreads/include/endian.h ../include/dbug.h \
+-	../include/my_dir.h ../include/my_sys.h ../include/my_pthread.h \
+-	../mit-pthreads/include/pthread/config.h \
+-	../mit-pthreads/include/sched.h ../include/m_ctype.h \
+-	../include/raid.h ../include/m_string.h ../include/my_list.h \
+-	../include/myisampack.h ../include/thr_lock.h \
+-	../include/myisammrg.h ../include/queues.h
+-myrg_rprev.o: myrg_rprev.c mymrgdef.h ../myisam/myisamdef.h \
+-	../include/myisam.h ../include/my_base.h ../include/global.h \
+-	../include/my_config.h ../mit-pthreads/include/bits/local_lim.h \
+-	../mit-pthreads/include/endian.h ../include/dbug.h \
+-	../include/my_dir.h ../include/my_sys.h ../include/my_pthread.h \
+-	../mit-pthreads/include/pthread/config.h \
+-	../mit-pthreads/include/sched.h ../include/m_ctype.h \
+-	../include/raid.h ../include/m_string.h ../include/my_list.h \
+-	../include/myisampack.h ../include/thr_lock.h \
+-	../include/myisammrg.h ../include/queues.h
+-myrg_rrnd.o: myrg_rrnd.c mymrgdef.h ../myisam/myisamdef.h \
+-	../include/myisam.h ../include/my_base.h ../include/global.h \
+-	../include/my_config.h ../mit-pthreads/include/bits/local_lim.h \
+-	../mit-pthreads/include/endian.h ../include/dbug.h \
+-	../include/my_dir.h ../include/my_sys.h ../include/my_pthread.h \
+-	../mit-pthreads/include/pthread/config.h \
+-	../mit-pthreads/include/sched.h ../include/m_ctype.h \
+-	../include/raid.h ../include/m_string.h ../include/my_list.h \
+-	../include/myisampack.h ../include/thr_lock.h \
+-	../include/myisammrg.h ../include/queues.h
+-myrg_rsame.o: myrg_rsame.c mymrgdef.h ../myisam/myisamdef.h \
+-	../include/myisam.h ../include/my_base.h ../include/global.h \
+-	../include/my_config.h ../mit-pthreads/include/bits/local_lim.h \
+-	../mit-pthreads/include/endian.h ../include/dbug.h \
+-	../include/my_dir.h ../include/my_sys.h ../include/my_pthread.h \
+-	../mit-pthreads/include/pthread/config.h \
+-	../mit-pthreads/include/sched.h ../include/m_ctype.h \
+-	../include/raid.h ../include/m_string.h ../include/my_list.h \
+-	../include/myisampack.h ../include/thr_lock.h \
+-	../include/myisammrg.h ../include/queues.h
+-myrg_static.o: myrg_static.c mymrgdef.h ../myisam/myisamdef.h \
+-	../include/myisam.h ../include/my_base.h ../include/global.h \
+-	../include/my_config.h ../mit-pthreads/include/bits/local_lim.h \
+-	../mit-pthreads/include/endian.h ../include/dbug.h \
+-	../include/my_dir.h ../include/my_sys.h ../include/my_pthread.h \
+-	../mit-pthreads/include/pthread/config.h \
+-	../mit-pthreads/include/sched.h ../include/m_ctype.h \
+-	../include/raid.h ../include/m_string.h ../include/my_list.h \
+-	../include/myisampack.h ../include/thr_lock.h \
+-	../include/myisammrg.h ../include/queues.h
+-myrg_update.o: myrg_update.c mymrgdef.h ../myisam/myisamdef.h \
+-	../include/myisam.h ../include/my_base.h ../include/global.h \
+-	../include/my_config.h ../mit-pthreads/include/bits/local_lim.h \
+-	../mit-pthreads/include/endian.h ../include/dbug.h \
+-	../include/my_dir.h ../include/my_sys.h ../include/my_pthread.h \
+-	../mit-pthreads/include/pthread/config.h \
+-	../mit-pthreads/include/sched.h ../include/m_ctype.h \
+-	../include/raid.h ../include/m_string.h ../include/my_list.h \
+-	../include/myisampack.h ../include/thr_lock.h \
+-	../include/myisammrg.h ../include/queues.h
+ 
++DEPS_MAGIC := $(shell mkdir .deps > /dev/null 2>&1 || :)
++
++-include $(DEP_FILES)
++
++mostlyclean-depend:
++
++clean-depend:
++
++distclean-depend:
++	-rm -rf .deps
++
++maintainer-clean-depend:
++
++%.o: %.c
++	@echo '$(COMPILE) -c $<'; \
++	$(COMPILE) -Wp,-MD,.deps/$(*F).pp -c $<
++	@-cp .deps/$(*F).pp .deps/$(*F).P; \
++	tr ' ' '\012' < .deps/$(*F).pp \
++	  | sed -e 's/^\\$$//' -e '/^$$/ d' -e '/:$$/ d' -e 's/$$/ :/' \
++	    >> .deps/$(*F).P; \
++	rm .deps/$(*F).pp
++
++%.lo: %.c
++	@echo '$(LTCOMPILE) -c $<'; \
++	$(LTCOMPILE) -Wp,-MD,.deps/$(*F).pp -c $<
++	@-sed -e 's/^\([^:]*\)\.o[ 	]*:/\1.lo \1.o :/' \
++	  < .deps/$(*F).pp > .deps/$(*F).P; \
++	tr ' ' '\012' < .deps/$(*F).pp \
++	  | sed -e 's/^\\$$//' -e '/^$$/ d' -e '/:$$/ d' -e 's/$$/ :/' \
++	    >> .deps/$(*F).P; \
++	rm -f .deps/$(*F).pp
+ info-am:
+ info: info-am
+ dvi-am:
+@@ -559,27 +415,27 @@
+ 
+ maintainer-clean-generic:
+ mostlyclean-am:  mostlyclean-pkglibLIBRARIES mostlyclean-compile \
+-		mostlyclean-libtool mostlyclean-tags \
++		mostlyclean-libtool mostlyclean-tags mostlyclean-depend \
+ 		mostlyclean-generic
+ 
+ mostlyclean: mostlyclean-am
+ 
+ clean-am:  clean-pkglibLIBRARIES clean-compile clean-libtool clean-tags \
+-		clean-generic mostlyclean-am
++		clean-depend clean-generic mostlyclean-am
+ 
+ clean: clean-am
+ 
+ distclean-am:  distclean-pkglibLIBRARIES distclean-compile \
+-		distclean-libtool distclean-tags distclean-generic \
+-		clean-am
++		distclean-libtool distclean-tags distclean-depend \
++		distclean-generic clean-am
+ 	-rm -f libtool
+ 
+ distclean: distclean-am
+ 
+ maintainer-clean-am:  maintainer-clean-pkglibLIBRARIES \
+ 		maintainer-clean-compile maintainer-clean-libtool \
+-		maintainer-clean-tags maintainer-clean-generic \
+-		distclean-am
++		maintainer-clean-tags maintainer-clean-depend \
++		maintainer-clean-generic distclean-am
+ 	@echo "This command is intended for maintainers to use;"
+ 	@echo "it deletes files that may require special tools to rebuild."
+ 
+@@ -591,12 +447,13 @@
+ distclean-compile clean-compile maintainer-clean-compile \
+ mostlyclean-libtool distclean-libtool clean-libtool \
+ maintainer-clean-libtool tags mostlyclean-tags distclean-tags \
+-clean-tags maintainer-clean-tags distdir info-am info dvi-am dvi check \
+-check-am installcheck-am installcheck install-exec-am install-exec \
+-install-data-am install-data install-am install uninstall-am uninstall \
+-all-redirect all-am all installdirs mostlyclean-generic \
+-distclean-generic clean-generic maintainer-clean-generic clean \
+-mostlyclean distclean maintainer-clean
++clean-tags maintainer-clean-tags distdir mostlyclean-depend \
++distclean-depend clean-depend maintainer-clean-depend info-am info \
++dvi-am dvi check check-am installcheck-am installcheck install-exec-am \
++install-exec install-data-am install-data install-am install \
++uninstall-am uninstall all-redirect all-am all installdirs \
++mostlyclean-generic distclean-generic clean-generic \
++maintainer-clean-generic clean mostlyclean distclean maintainer-clean
+ 
+ 
+ # Don't update the files from bitkeeper
+diff -r -u mysql-3.23.36.orig/mysql-test/Makefile.in mysql-3.23.36/mysql-test/Makefile.in
+--- mysql-3.23.36.orig/mysql-test/Makefile.in	Tue Mar 27 10:20:32 2001
++++ mysql-3.23.36/mysql-test/Makefile.in	Fri Apr 13 16:23:24 2001
+@@ -191,15 +191,15 @@
+ 
+ DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST)
+ 
+-TAR = gtar
++TAR = tar
+ GZIP_ENV = --best
+ all: all-redirect
+ .SUFFIXES:
+ .SUFFIXES: .sh
+ $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) 
+-	cd $(top_srcdir) && $(AUTOMAKE) --gnu --include-deps mysql-test/Makefile
++	cd $(top_srcdir) && $(AUTOMAKE) --gnu mysql-test/Makefile
+ 
+-Makefile: $(srcdir)/Makefile.in  $(top_builddir)/config.status
++Makefile: $(srcdir)/Makefile.in  $(top_builddir)/config.status $(BUILT_SOURCES)
+ 	cd $(top_builddir) \
+ 	  && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status
+ 
+@@ -231,10 +231,15 @@
+ subdir = mysql-test
+ 
+ distdir: $(DISTFILES)
++	here=`cd $(top_builddir) && pwd`; \
++	top_distdir=`cd $(top_distdir) && pwd`; \
++	distdir=`cd $(distdir) && pwd`; \
++	cd $(top_srcdir) \
++	  && $(AUTOMAKE) --include-deps --build-dir=$$here --srcdir-name=$(top_srcdir) --output-dir=$$top_distdir --gnu mysql-test/Makefile
+ 	@for file in $(DISTFILES); do \
+ 	  d=$(srcdir); \
+ 	  if test -d $$d/$$file; then \
+-	    cp -pr $$d/$$file $(distdir)/$$file; \
++	    cp -pr $$/$$file $(distdir)/$$file; \
+ 	  else \
+ 	    test -f $(distdir)/$$file \
+ 	    || ln $$d/$$file $(distdir)/$$file 2> /dev/null \
+diff -r -u mysql-3.23.36.orig/mysys/Makefile.in mysql-3.23.36/mysys/Makefile.in
+--- mysql-3.23.36.orig/mysys/Makefile.in	Tue Mar 27 10:20:16 2001
++++ mysql-3.23.36/mysys/Makefile.in	Fri Apr 13 16:23:19 2001
+@@ -249,8 +249,31 @@
+ 
+ DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST)
+ 
+-TAR = gtar
++TAR = tar
+ GZIP_ENV = --best
++DEP_FILES =  .deps/array.P .deps/charset.P .deps/checksum.P \
++.deps/default.P .deps/errors.P .deps/getopt.P .deps/getopt1.P \
++.deps/getvar.P .deps/hash.P .deps/list.P .deps/mf_brkhant.P \
++.deps/mf_cache.P .deps/mf_casecnv.P .deps/mf_dirname.P \
++.deps/mf_fn_ext.P .deps/mf_format.P .deps/mf_getdate.P \
++.deps/mf_iocache.P .deps/mf_iocache2.P .deps/mf_keycache.P \
++.deps/mf_loadpath.P .deps/mf_pack.P .deps/mf_pack2.P .deps/mf_path.P \
++.deps/mf_qsort.P .deps/mf_qsort2.P .deps/mf_radix.P .deps/mf_same.P \
++.deps/mf_sort.P .deps/mf_soundex.P .deps/mf_stripp.P \
++.deps/mf_tempfile.P .deps/mf_unixpath.P .deps/mf_wcomp.P \
++.deps/mf_wfile.P .deps/mulalloc.P .deps/my_alarm.P .deps/my_alloc.P \
++.deps/my_append.P .deps/my_bitmap.P .deps/my_chsize.P .deps/my_clock.P \
++.deps/my_compress.P .deps/my_copy.P .deps/my_create.P .deps/my_delete.P \
++.deps/my_div.P .deps/my_error.P .deps/my_fopen.P .deps/my_fstream.P \
++.deps/my_getwd.P .deps/my_init.P .deps/my_lib.P .deps/my_lock.P \
++.deps/my_lockmem.P .deps/my_lread.P .deps/my_lwrite.P .deps/my_malloc.P \
++.deps/my_messnc.P .deps/my_mkdir.P .deps/my_net.P .deps/my_once.P \
++.deps/my_open.P .deps/my_pread.P .deps/my_quick.P .deps/my_read.P \
++.deps/my_realloc.P .deps/my_redel.P .deps/my_rename.P .deps/my_seek.P \
++.deps/my_static.P .deps/my_tempnam.P .deps/my_vsnprintf.P \
++.deps/my_write.P .deps/ptr_cmp.P .deps/queues.P .deps/raid.P \
++.deps/safemalloc.P .deps/string.P .deps/test_charset.P .deps/testhash.P \
++.deps/tree.P .deps/typelib.P
+ SOURCES = $(libmysys_a_SOURCES) testhash.c test_charset.c
+ OBJECTS = $(libmysys_a_OBJECTS) testhash.o test_charset.o
+ 
+@@ -258,9 +281,9 @@
+ .SUFFIXES:
+ .SUFFIXES: .S .c .cc .lo .o .s
+ $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) 
+-	cd $(top_srcdir) && $(AUTOMAKE) --gnu --include-deps mysys/Makefile
++	cd $(top_srcdir) && $(AUTOMAKE) --gnu mysys/Makefile
+ 
+-Makefile: $(srcdir)/Makefile.in  $(top_builddir)/config.status
++Makefile: $(srcdir)/Makefile.in  $(top_builddir)/config.status $(BUILT_SOURCES)
+ 	cd $(top_builddir) \
+ 	  && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status
+ 
+@@ -297,9 +320,6 @@
+ 	  rm -f $(DESTDIR)$(pkglibdir)/$$p; \
+ 	done
+ 
+-.c.o:
+-	$(COMPILE) -c $<
+-
+ .s.o:
+ 	$(COMPILE) -c $<
+ 
+@@ -316,9 +336,6 @@
+ 
+ maintainer-clean-compile:
+ 
+-.c.lo:
+-	$(LIBTOOL) --mode=compile $(COMPILE) -c $<
+-
+ .s.lo:
+ 	$(LIBTOOL) --mode=compile $(COMPILE) -c $<
+ 
+@@ -391,634 +408,72 @@
+ subdir = mysys
+ 
+ distdir: $(DISTFILES)
++	here=`cd $(top_builddir) && pwd`; \
++	top_distdir=`cd $(top_distdir) && pwd`; \
++	distdir=`cd $(distdir) && pwd`; \
++	cd $(top_srcdir) \
++	  && $(AUTOMAKE) --include-deps --build-dir=$$here --srcdir-name=$(top_srcdir) --output-dir=$$top_distdir --gnu mysys/Makefile
+ 	@for file in $(DISTFILES); do \
+ 	  d=$(srcdir); \
+ 	  if test -d $$d/$$file; then \
+-	    cp -pr $$d/$$file $(distdir)/$$file; \
++	    cp -pr $$/$$file $(distdir)/$$file; \
+ 	  else \
+ 	    test -f $(distdir)/$$file \
+ 	    || ln $$d/$$file $(distdir)/$$file 2> /dev/null \
+ 	    || cp -p $$d/$$file $(distdir)/$$file || :; \
+ 	  fi; \
+ 	done
+-array.o: array.c mysys_priv.h ../include/global.h ../include/my_config.h \
+-	../mit-pthreads/include/bits/local_lim.h \
+-	../mit-pthreads/include/endian.h ../include/dbug.h \
+-	../include/my_sys.h ../include/my_pthread.h \
+-	../mit-pthreads/include/pthread/config.h \
+-	../mit-pthreads/include/sched.h ../include/m_ctype.h \
+-	../include/raid.h ../include/m_string.h
+-charset.o: charset.c mysys_priv.h ../include/global.h \
+-	../include/my_config.h ../mit-pthreads/include/bits/local_lim.h \
+-	../mit-pthreads/include/endian.h ../include/dbug.h \
+-	../include/my_sys.h ../include/my_pthread.h \
+-	../mit-pthreads/include/pthread/config.h \
+-	../mit-pthreads/include/sched.h ../include/m_ctype.h \
+-	../include/raid.h ../include/mysys_err.h ../include/m_string.h \
+-	../include/my_dir.h
+-checksum.o: checksum.c ../include/global.h ../include/my_config.h \
+-	../mit-pthreads/include/bits/local_lim.h \
+-	../mit-pthreads/include/endian.h ../include/dbug.h \
+-	../include/my_sys.h ../include/my_pthread.h \
+-	../mit-pthreads/include/pthread/config.h \
+-	../mit-pthreads/include/sched.h ../include/m_ctype.h \
+-	../include/raid.h
+-default.o: default.c mysys_priv.h ../include/global.h \
+-	../include/my_config.h ../mit-pthreads/include/bits/local_lim.h \
+-	../mit-pthreads/include/endian.h ../include/dbug.h \
+-	../include/my_sys.h ../include/my_pthread.h \
+-	../mit-pthreads/include/pthread/config.h \
+-	../mit-pthreads/include/sched.h ../include/m_ctype.h \
+-	../include/raid.h ../include/m_string.h
+-errors.o: errors.c mysys_priv.h ../include/global.h \
+-	../include/my_config.h ../mit-pthreads/include/bits/local_lim.h \
+-	../mit-pthreads/include/endian.h ../include/dbug.h \
+-	../include/my_sys.h ../include/my_pthread.h \
+-	../mit-pthreads/include/pthread/config.h \
+-	../mit-pthreads/include/sched.h ../include/m_ctype.h \
+-	../include/raid.h ../include/mysys_err.h
+-getopt.o: getopt.c ../config.h ../include/global.h \
+-	../include/my_config.h ../mit-pthreads/include/bits/local_lim.h \
+-	../mit-pthreads/include/endian.h ../include/dbug.h \
+-	../include/m_string.h
+-getopt1.o: getopt1.c ../config.h ../include/global.h \
+-	../include/my_config.h ../mit-pthreads/include/bits/local_lim.h \
+-	../mit-pthreads/include/endian.h ../include/dbug.h \
+-	../include/getopt.h
+-getvar.o: getvar.c mysys_priv.h ../include/global.h \
+-	../include/my_config.h ../mit-pthreads/include/bits/local_lim.h \
+-	../mit-pthreads/include/endian.h ../include/dbug.h \
+-	../include/my_sys.h ../include/my_pthread.h \
+-	../mit-pthreads/include/pthread/config.h \
+-	../mit-pthreads/include/sched.h ../include/m_ctype.h \
+-	../include/raid.h ../include/m_string.h
+-hash.o: hash.c mysys_priv.h ../include/global.h ../include/my_config.h \
+-	../mit-pthreads/include/bits/local_lim.h \
+-	../mit-pthreads/include/endian.h ../include/dbug.h \
+-	../include/my_sys.h ../include/my_pthread.h \
+-	../mit-pthreads/include/pthread/config.h \
+-	../mit-pthreads/include/sched.h ../include/m_ctype.h \
+-	../include/raid.h ../include/m_string.h ../include/hash.h
+-list.o: list.c mysys_priv.h ../include/global.h ../include/my_config.h \
+-	../mit-pthreads/include/bits/local_lim.h \
+-	../mit-pthreads/include/endian.h ../include/dbug.h \
+-	../include/my_sys.h ../include/my_pthread.h \
+-	../mit-pthreads/include/pthread/config.h \
+-	../mit-pthreads/include/sched.h ../include/m_ctype.h \
+-	../include/raid.h ../include/my_list.h
+-mf_brkhant.o: mf_brkhant.c mysys_priv.h ../include/global.h \
+-	../include/my_config.h ../mit-pthreads/include/bits/local_lim.h \
+-	../mit-pthreads/include/endian.h ../include/dbug.h \
+-	../include/my_sys.h ../include/my_pthread.h \
+-	../mit-pthreads/include/pthread/config.h \
+-	../mit-pthreads/include/sched.h ../include/m_ctype.h \
+-	../include/raid.h my_static.h
+-mf_cache.o: mf_cache.c mysys_priv.h ../include/global.h \
+-	../include/my_config.h ../mit-pthreads/include/bits/local_lim.h \
+-	../mit-pthreads/include/endian.h ../include/dbug.h \
+-	../include/my_sys.h ../include/my_pthread.h \
+-	../mit-pthreads/include/pthread/config.h \
+-	../mit-pthreads/include/sched.h ../include/m_ctype.h \
+-	../include/raid.h ../include/m_string.h my_static.h \
+-	../include/mysys_err.h
+-mf_casecnv.o: mf_casecnv.c mysys_priv.h ../include/global.h \
+-	../include/my_config.h ../mit-pthreads/include/bits/local_lim.h \
+-	../mit-pthreads/include/endian.h ../include/dbug.h \
+-	../include/my_sys.h ../include/my_pthread.h \
+-	../mit-pthreads/include/pthread/config.h \
+-	../mit-pthreads/include/sched.h ../include/m_ctype.h \
+-	../include/raid.h
+-mf_dirname.o: mf_dirname.c mysys_priv.h ../include/global.h \
+-	../include/my_config.h ../mit-pthreads/include/bits/local_lim.h \
+-	../mit-pthreads/include/endian.h ../include/dbug.h \
+-	../include/my_sys.h ../include/my_pthread.h \
+-	../mit-pthreads/include/pthread/config.h \
+-	../mit-pthreads/include/sched.h ../include/m_ctype.h \
+-	../include/raid.h ../include/m_string.h
+-mf_fn_ext.o: mf_fn_ext.c mysys_priv.h ../include/global.h \
+-	../include/my_config.h ../mit-pthreads/include/bits/local_lim.h \
+-	../mit-pthreads/include/endian.h ../include/dbug.h \
+-	../include/my_sys.h ../include/my_pthread.h \
+-	../mit-pthreads/include/pthread/config.h \
+-	../mit-pthreads/include/sched.h ../include/m_ctype.h \
+-	../include/raid.h ../include/m_string.h
+-mf_format.o: mf_format.c mysys_priv.h ../include/global.h \
+-	../include/my_config.h ../mit-pthreads/include/bits/local_lim.h \
+-	../mit-pthreads/include/endian.h ../include/dbug.h \
+-	../include/my_sys.h ../include/my_pthread.h \
+-	../mit-pthreads/include/pthread/config.h \
+-	../mit-pthreads/include/sched.h ../include/m_ctype.h \
+-	../include/raid.h ../include/m_string.h
+-mf_getdate.o: mf_getdate.c mysys_priv.h ../include/global.h \
+-	../include/my_config.h ../mit-pthreads/include/bits/local_lim.h \
+-	../mit-pthreads/include/endian.h ../include/dbug.h \
+-	../include/my_sys.h ../include/my_pthread.h \
+-	../mit-pthreads/include/pthread/config.h \
+-	../mit-pthreads/include/sched.h ../include/m_ctype.h \
+-	../include/raid.h ../include/m_string.h
+-mf_iocache.o: mf_iocache.c mysys_priv.h ../include/global.h \
+-	../include/my_config.h ../mit-pthreads/include/bits/local_lim.h \
+-	../mit-pthreads/include/endian.h ../include/dbug.h \
+-	../include/my_sys.h ../include/my_pthread.h \
+-	../mit-pthreads/include/pthread/config.h \
+-	../mit-pthreads/include/sched.h ../include/m_ctype.h \
+-	../include/raid.h ../include/m_string.h
+-mf_iocache2.o: mf_iocache2.c mysys_priv.h ../include/global.h \
+-	../include/my_config.h ../mit-pthreads/include/bits/local_lim.h \
+-	../mit-pthreads/include/endian.h ../include/dbug.h \
+-	../include/my_sys.h ../include/my_pthread.h \
+-	../mit-pthreads/include/pthread/config.h \
+-	../mit-pthreads/include/sched.h ../include/m_ctype.h \
+-	../include/raid.h ../include/m_string.h
+-mf_keycache.o: mf_keycache.c mysys_priv.h ../include/global.h \
+-	../include/my_config.h ../mit-pthreads/include/bits/local_lim.h \
+-	../mit-pthreads/include/endian.h ../include/dbug.h \
+-	../include/my_sys.h ../include/my_pthread.h \
+-	../mit-pthreads/include/pthread/config.h \
+-	../mit-pthreads/include/sched.h ../include/m_ctype.h \
+-	../include/raid.h my_static.h ../include/m_string.h
+-mf_loadpath.o: mf_loadpath.c mysys_priv.h ../include/global.h \
+-	../include/my_config.h ../mit-pthreads/include/bits/local_lim.h \
+-	../mit-pthreads/include/endian.h ../include/dbug.h \
+-	../include/my_sys.h ../include/my_pthread.h \
+-	../mit-pthreads/include/pthread/config.h \
+-	../mit-pthreads/include/sched.h ../include/m_ctype.h \
+-	../include/raid.h ../include/m_string.h
+-mf_pack.o: mf_pack.c mysys_priv.h ../include/global.h \
+-	../include/my_config.h ../mit-pthreads/include/bits/local_lim.h \
+-	../mit-pthreads/include/endian.h ../include/dbug.h \
+-	../include/my_sys.h ../include/my_pthread.h \
+-	../mit-pthreads/include/pthread/config.h \
+-	../mit-pthreads/include/sched.h ../include/m_ctype.h \
+-	../include/raid.h ../include/m_string.h
+-mf_pack2.o: mf_pack2.c mysys_priv.h ../include/global.h \
+-	../include/my_config.h ../mit-pthreads/include/bits/local_lim.h \
+-	../mit-pthreads/include/endian.h ../include/dbug.h \
+-	../include/my_sys.h ../include/my_pthread.h \
+-	../mit-pthreads/include/pthread/config.h \
+-	../mit-pthreads/include/sched.h ../include/m_ctype.h \
+-	../include/raid.h ../include/m_string.h
+-mf_path.o: mf_path.c mysys_priv.h ../include/global.h \
+-	../include/my_config.h ../mit-pthreads/include/bits/local_lim.h \
+-	../mit-pthreads/include/endian.h ../include/dbug.h \
+-	../include/my_sys.h ../include/my_pthread.h \
+-	../mit-pthreads/include/pthread/config.h \
+-	../mit-pthreads/include/sched.h ../include/m_ctype.h \
+-	../include/raid.h ../include/m_string.h
+-mf_qsort.o: mf_qsort.c mysys_priv.h ../include/global.h \
+-	../include/my_config.h ../mit-pthreads/include/bits/local_lim.h \
+-	../mit-pthreads/include/endian.h ../include/dbug.h \
+-	../include/my_sys.h ../include/my_pthread.h \
+-	../mit-pthreads/include/pthread/config.h \
+-	../mit-pthreads/include/sched.h ../include/m_ctype.h \
+-	../include/raid.h
+-mf_qsort2.o: mf_qsort2.c mf_qsort.c mysys_priv.h ../include/global.h \
+-	../include/my_config.h ../mit-pthreads/include/bits/local_lim.h \
+-	../mit-pthreads/include/endian.h ../include/dbug.h \
+-	../include/my_sys.h ../include/my_pthread.h \
+-	../mit-pthreads/include/pthread/config.h \
+-	../mit-pthreads/include/sched.h ../include/m_ctype.h \
+-	../include/raid.h
+-mf_radix.o: mf_radix.c mysys_priv.h ../include/global.h \
+-	../include/my_config.h ../mit-pthreads/include/bits/local_lim.h \
+-	../mit-pthreads/include/endian.h ../include/dbug.h \
+-	../include/my_sys.h ../include/my_pthread.h \
+-	../mit-pthreads/include/pthread/config.h \
+-	../mit-pthreads/include/sched.h ../include/m_ctype.h \
+-	../include/raid.h ../include/m_string.h
+-mf_same.o: mf_same.c mysys_priv.h ../include/global.h \
+-	../include/my_config.h ../mit-pthreads/include/bits/local_lim.h \
+-	../mit-pthreads/include/endian.h ../include/dbug.h \
+-	../include/my_sys.h ../include/my_pthread.h \
+-	../mit-pthreads/include/pthread/config.h \
+-	../mit-pthreads/include/sched.h ../include/m_ctype.h \
+-	../include/raid.h ../include/m_string.h
+-mf_sort.o: mf_sort.c mysys_priv.h ../include/global.h \
+-	../include/my_config.h ../mit-pthreads/include/bits/local_lim.h \
+-	../mit-pthreads/include/endian.h ../include/dbug.h \
+-	../include/my_sys.h ../include/my_pthread.h \
+-	../mit-pthreads/include/pthread/config.h \
+-	../mit-pthreads/include/sched.h ../include/m_ctype.h \
+-	../include/raid.h ../include/m_string.h
+-mf_soundex.o: mf_soundex.c mysys_priv.h ../include/global.h \
+-	../include/my_config.h ../mit-pthreads/include/bits/local_lim.h \
+-	../mit-pthreads/include/endian.h ../include/dbug.h \
+-	../include/my_sys.h ../include/my_pthread.h \
+-	../mit-pthreads/include/pthread/config.h \
+-	../mit-pthreads/include/sched.h ../include/m_ctype.h \
+-	../include/raid.h my_static.h
+-mf_stripp.o: mf_stripp.c mysys_priv.h ../include/global.h \
+-	../include/my_config.h ../mit-pthreads/include/bits/local_lim.h \
+-	../mit-pthreads/include/endian.h ../include/dbug.h \
+-	../include/my_sys.h ../include/my_pthread.h \
+-	../mit-pthreads/include/pthread/config.h \
+-	../mit-pthreads/include/sched.h ../include/m_ctype.h \
+-	../include/raid.h
+-mf_tempfile.o: mf_tempfile.c mysys_priv.h ../include/global.h \
+-	../include/my_config.h ../mit-pthreads/include/bits/local_lim.h \
+-	../mit-pthreads/include/endian.h ../include/dbug.h \
+-	../include/my_sys.h ../include/my_pthread.h \
+-	../mit-pthreads/include/pthread/config.h \
+-	../mit-pthreads/include/sched.h ../include/m_ctype.h \
+-	../include/raid.h ../include/m_string.h my_static.h \
+-	../include/mysys_err.h
+-mf_unixpath.o: mf_unixpath.c mysys_priv.h ../include/global.h \
+-	../include/my_config.h ../mit-pthreads/include/bits/local_lim.h \
+-	../mit-pthreads/include/endian.h ../include/dbug.h \
+-	../include/my_sys.h ../include/my_pthread.h \
+-	../mit-pthreads/include/pthread/config.h \
+-	../mit-pthreads/include/sched.h ../include/m_ctype.h \
+-	../include/raid.h ../include/m_string.h
+-mf_wcomp.o: mf_wcomp.c mysys_priv.h ../include/global.h \
+-	../include/my_config.h ../mit-pthreads/include/bits/local_lim.h \
+-	../mit-pthreads/include/endian.h ../include/dbug.h \
+-	../include/my_sys.h ../include/my_pthread.h \
+-	../mit-pthreads/include/pthread/config.h \
+-	../mit-pthreads/include/sched.h ../include/m_ctype.h \
+-	../include/raid.h
+-mf_wfile.o: mf_wfile.c mysys_priv.h ../include/global.h \
+-	../include/my_config.h ../mit-pthreads/include/bits/local_lim.h \
+-	../mit-pthreads/include/endian.h ../include/dbug.h \
+-	../include/my_sys.h ../include/my_pthread.h \
+-	../mit-pthreads/include/pthread/config.h \
+-	../mit-pthreads/include/sched.h ../include/m_ctype.h \
+-	../include/raid.h ../include/m_string.h
+-mulalloc.o: mulalloc.c mysys_priv.h ../include/global.h \
+-	../include/my_config.h ../mit-pthreads/include/bits/local_lim.h \
+-	../mit-pthreads/include/endian.h ../include/dbug.h \
+-	../include/my_sys.h ../include/my_pthread.h \
+-	../mit-pthreads/include/pthread/config.h \
+-	../mit-pthreads/include/sched.h ../include/m_ctype.h \
+-	../include/raid.h
+-my_alarm.o: my_alarm.c mysys_priv.h ../include/global.h \
+-	../include/my_config.h ../mit-pthreads/include/bits/local_lim.h \
+-	../mit-pthreads/include/endian.h ../include/dbug.h \
+-	../include/my_sys.h ../include/my_pthread.h \
+-	../mit-pthreads/include/pthread/config.h \
+-	../mit-pthreads/include/sched.h ../include/m_ctype.h \
+-	../include/raid.h ../include/my_alarm.h
+-my_alloc.o: my_alloc.c ../include/global.h ../include/my_config.h \
+-	../mit-pthreads/include/bits/local_lim.h \
+-	../mit-pthreads/include/endian.h ../include/dbug.h \
+-	../include/my_sys.h ../include/my_pthread.h \
+-	../mit-pthreads/include/pthread/config.h \
+-	../mit-pthreads/include/sched.h ../include/m_ctype.h \
+-	../include/raid.h ../include/m_string.h
+-my_append.o: my_append.c mysys_priv.h ../include/global.h \
+-	../include/my_config.h ../mit-pthreads/include/bits/local_lim.h \
+-	../mit-pthreads/include/endian.h ../include/dbug.h \
+-	../include/my_sys.h ../include/my_pthread.h \
+-	../mit-pthreads/include/pthread/config.h \
+-	../mit-pthreads/include/sched.h ../include/m_ctype.h \
+-	../include/raid.h ../include/m_string.h
+-my_bitmap.o: my_bitmap.c mysys_priv.h ../include/global.h \
+-	../include/my_config.h ../mit-pthreads/include/bits/local_lim.h \
+-	../mit-pthreads/include/endian.h ../include/dbug.h \
+-	../include/my_sys.h ../include/my_pthread.h \
+-	../mit-pthreads/include/pthread/config.h \
+-	../mit-pthreads/include/sched.h ../include/m_ctype.h \
+-	../include/raid.h ../include/my_bitmap.h
+-my_chsize.o: my_chsize.c mysys_priv.h ../include/global.h \
+-	../include/my_config.h ../mit-pthreads/include/bits/local_lim.h \
+-	../mit-pthreads/include/endian.h ../include/dbug.h \
+-	../include/my_sys.h ../include/my_pthread.h \
+-	../mit-pthreads/include/pthread/config.h \
+-	../mit-pthreads/include/sched.h ../include/m_ctype.h \
+-	../include/raid.h ../include/mysys_err.h ../include/m_string.h
+-my_clock.o: my_clock.c ../include/global.h ../include/my_config.h \
+-	../mit-pthreads/include/bits/local_lim.h \
+-	../mit-pthreads/include/endian.h ../include/dbug.h mysys_priv.h \
+-	../include/my_sys.h ../include/my_pthread.h \
+-	../mit-pthreads/include/pthread/config.h \
+-	../mit-pthreads/include/sched.h ../include/m_ctype.h \
+-	../include/raid.h
+-my_compress.o: my_compress.c ../include/global.h ../include/my_config.h \
+-	../mit-pthreads/include/bits/local_lim.h \
+-	../mit-pthreads/include/endian.h ../include/dbug.h \
+-	../include/my_sys.h ../include/my_pthread.h \
+-	../mit-pthreads/include/pthread/config.h \
+-	../mit-pthreads/include/sched.h ../include/m_ctype.h \
+-	../include/raid.h
+-my_copy.o: my_copy.c mysys_priv.h ../include/global.h \
+-	../include/my_config.h ../mit-pthreads/include/bits/local_lim.h \
+-	../mit-pthreads/include/endian.h ../include/dbug.h \
+-	../include/my_sys.h ../include/my_pthread.h \
+-	../mit-pthreads/include/pthread/config.h \
+-	../mit-pthreads/include/sched.h ../include/m_ctype.h \
+-	../include/raid.h ../include/m_string.h
+-my_create.o: my_create.c mysys_priv.h ../include/global.h \
+-	../include/my_config.h ../mit-pthreads/include/bits/local_lim.h \
+-	../mit-pthreads/include/endian.h ../include/dbug.h \
+-	../include/my_sys.h ../include/my_pthread.h \
+-	../mit-pthreads/include/pthread/config.h \
+-	../mit-pthreads/include/sched.h ../include/m_ctype.h \
+-	../include/raid.h ../include/my_dir.h ../include/mysys_err.h
+-my_delete.o: my_delete.c mysys_priv.h ../include/global.h \
+-	../include/my_config.h ../mit-pthreads/include/bits/local_lim.h \
+-	../mit-pthreads/include/endian.h ../include/dbug.h \
+-	../include/my_sys.h ../include/my_pthread.h \
+-	../mit-pthreads/include/pthread/config.h \
+-	../mit-pthreads/include/sched.h ../include/m_ctype.h \
+-	../include/raid.h ../include/mysys_err.h
+-my_div.o: my_div.c mysys_priv.h ../include/global.h \
+-	../include/my_config.h ../mit-pthreads/include/bits/local_lim.h \
+-	../mit-pthreads/include/endian.h ../include/dbug.h \
+-	../include/my_sys.h ../include/my_pthread.h \
+-	../mit-pthreads/include/pthread/config.h \
+-	../mit-pthreads/include/sched.h ../include/m_ctype.h \
+-	../include/raid.h
+-my_error.o: my_error.c mysys_priv.h ../include/global.h \
+-	../include/my_config.h ../mit-pthreads/include/bits/local_lim.h \
+-	../mit-pthreads/include/endian.h ../include/dbug.h \
+-	../include/my_sys.h ../include/my_pthread.h \
+-	../mit-pthreads/include/pthread/config.h \
+-	../mit-pthreads/include/sched.h ../include/m_ctype.h \
+-	../include/raid.h ../include/mysys_err.h ../include/m_string.h
+-my_fopen.o: my_fopen.c mysys_priv.h ../include/global.h \
+-	../include/my_config.h ../mit-pthreads/include/bits/local_lim.h \
+-	../mit-pthreads/include/endian.h ../include/dbug.h \
+-	../include/my_sys.h ../include/my_pthread.h \
+-	../mit-pthreads/include/pthread/config.h \
+-	../mit-pthreads/include/sched.h ../include/m_ctype.h \
+-	../include/raid.h my_static.h ../include/mysys_err.h
+-my_fstream.o: my_fstream.c mysys_priv.h ../include/global.h \
+-	../include/my_config.h ../mit-pthreads/include/bits/local_lim.h \
+-	../mit-pthreads/include/endian.h ../include/dbug.h \
+-	../include/my_sys.h ../include/my_pthread.h \
+-	../mit-pthreads/include/pthread/config.h \
+-	../mit-pthreads/include/sched.h ../include/m_ctype.h \
+-	../include/raid.h ../include/mysys_err.h
+-my_getwd.o: my_getwd.c mysys_priv.h ../include/global.h \
+-	../include/my_config.h ../mit-pthreads/include/bits/local_lim.h \
+-	../mit-pthreads/include/endian.h ../include/dbug.h \
+-	../include/my_sys.h ../include/my_pthread.h \
+-	../mit-pthreads/include/pthread/config.h \
+-	../mit-pthreads/include/sched.h ../include/m_ctype.h \
+-	../include/raid.h ../include/m_string.h ../include/mysys_err.h
+-my_init.o: my_init.c mysys_priv.h ../include/global.h \
+-	../include/my_config.h ../mit-pthreads/include/bits/local_lim.h \
+-	../mit-pthreads/include/endian.h ../include/dbug.h \
+-	../include/my_sys.h ../include/my_pthread.h \
+-	../mit-pthreads/include/pthread/config.h \
+-	../mit-pthreads/include/sched.h ../include/m_ctype.h \
+-	../include/raid.h my_static.h ../include/mysys_err.h \
+-	../include/m_string.h
+-my_lib.o: my_lib.c mysys_priv.h ../include/global.h \
+-	../include/my_config.h ../mit-pthreads/include/bits/local_lim.h \
+-	../mit-pthreads/include/endian.h ../include/dbug.h \
+-	../include/my_sys.h ../include/my_pthread.h \
+-	../mit-pthreads/include/pthread/config.h \
+-	../mit-pthreads/include/sched.h ../include/m_ctype.h \
+-	../include/raid.h ../include/m_string.h ../include/my_dir.h \
+-	../include/mysys_err.h
+-my_lock.o: my_lock.c mysys_priv.h ../include/global.h \
+-	../include/my_config.h ../mit-pthreads/include/bits/local_lim.h \
+-	../mit-pthreads/include/endian.h ../include/dbug.h \
+-	../include/my_sys.h ../include/my_pthread.h \
+-	../mit-pthreads/include/pthread/config.h \
+-	../mit-pthreads/include/sched.h ../include/m_ctype.h \
+-	../include/raid.h ../include/mysys_err.h ../include/my_alarm.h
+-my_lockmem.o: my_lockmem.c mysys_priv.h ../include/global.h \
+-	../include/my_config.h ../mit-pthreads/include/bits/local_lim.h \
+-	../mit-pthreads/include/endian.h ../include/dbug.h \
+-	../include/my_sys.h ../include/my_pthread.h \
+-	../mit-pthreads/include/pthread/config.h \
+-	../mit-pthreads/include/sched.h ../include/m_ctype.h \
+-	../include/raid.h ../include/mysys_err.h ../include/my_list.h
+-my_lread.o: my_lread.c mysys_priv.h ../include/global.h \
+-	../include/my_config.h ../mit-pthreads/include/bits/local_lim.h \
+-	../mit-pthreads/include/endian.h ../include/dbug.h \
+-	../include/my_sys.h ../include/my_pthread.h \
+-	../mit-pthreads/include/pthread/config.h \
+-	../mit-pthreads/include/sched.h ../include/m_ctype.h \
+-	../include/raid.h ../include/mysys_err.h
+-my_lwrite.o: my_lwrite.c mysys_priv.h ../include/global.h \
+-	../include/my_config.h ../mit-pthreads/include/bits/local_lim.h \
+-	../mit-pthreads/include/endian.h ../include/dbug.h \
+-	../include/my_sys.h ../include/my_pthread.h \
+-	../mit-pthreads/include/pthread/config.h \
+-	../mit-pthreads/include/sched.h ../include/m_ctype.h \
+-	../include/raid.h ../include/mysys_err.h
+-my_malloc.o: my_malloc.c mysys_priv.h ../include/global.h \
+-	../include/my_config.h ../mit-pthreads/include/bits/local_lim.h \
+-	../mit-pthreads/include/endian.h ../include/dbug.h \
+-	../include/my_sys.h ../include/my_pthread.h \
+-	../mit-pthreads/include/pthread/config.h \
+-	../mit-pthreads/include/sched.h ../include/m_ctype.h \
+-	../include/raid.h ../include/mysys_err.h ../include/m_string.h
+-my_messnc.o: my_messnc.c mysys_priv.h ../include/global.h \
+-	../include/my_config.h ../mit-pthreads/include/bits/local_lim.h \
+-	../mit-pthreads/include/endian.h ../include/dbug.h \
+-	../include/my_sys.h ../include/my_pthread.h \
+-	../mit-pthreads/include/pthread/config.h \
+-	../mit-pthreads/include/sched.h ../include/m_ctype.h \
+-	../include/raid.h
+-my_mkdir.o: my_mkdir.c mysys_priv.h ../include/global.h \
+-	../include/my_config.h ../mit-pthreads/include/bits/local_lim.h \
+-	../mit-pthreads/include/endian.h ../include/dbug.h \
+-	../include/my_sys.h ../include/my_pthread.h \
+-	../mit-pthreads/include/pthread/config.h \
+-	../mit-pthreads/include/sched.h ../include/m_ctype.h \
+-	../include/raid.h ../include/mysys_err.h
+-my_net.o: my_net.c mysys_priv.h ../include/global.h \
+-	../include/my_config.h ../mit-pthreads/include/bits/local_lim.h \
+-	../mit-pthreads/include/endian.h ../include/dbug.h \
+-	../include/my_sys.h ../include/my_pthread.h \
+-	../mit-pthreads/include/pthread/config.h \
+-	../mit-pthreads/include/sched.h ../include/m_ctype.h \
+-	../include/raid.h ../include/m_string.h
+-my_once.o: my_once.c mysys_priv.h ../include/global.h \
+-	../include/my_config.h ../mit-pthreads/include/bits/local_lim.h \
+-	../mit-pthreads/include/endian.h ../include/dbug.h \
+-	../include/my_sys.h ../include/my_pthread.h \
+-	../mit-pthreads/include/pthread/config.h \
+-	../mit-pthreads/include/sched.h ../include/m_ctype.h \
+-	../include/raid.h my_static.h ../include/mysys_err.h
+-my_open.o: my_open.c mysys_priv.h ../include/global.h \
+-	../include/my_config.h ../mit-pthreads/include/bits/local_lim.h \
+-	../mit-pthreads/include/endian.h ../include/dbug.h \
+-	../include/my_sys.h ../include/my_pthread.h \
+-	../mit-pthreads/include/pthread/config.h \
+-	../mit-pthreads/include/sched.h ../include/m_ctype.h \
+-	../include/raid.h ../include/mysys_err.h ../include/my_dir.h
+-my_pread.o: my_pread.c mysys_priv.h ../include/global.h \
+-	../include/my_config.h ../mit-pthreads/include/bits/local_lim.h \
+-	../mit-pthreads/include/endian.h ../include/dbug.h \
+-	../include/my_sys.h ../include/my_pthread.h \
+-	../mit-pthreads/include/pthread/config.h \
+-	../mit-pthreads/include/sched.h ../include/m_ctype.h \
+-	../include/raid.h ../include/mysys_err.h
+-my_pthread.o: my_pthread.c mysys_priv.h ../include/global.h \
+-	../include/my_config.h ../mit-pthreads/include/bits/local_lim.h \
+-	../mit-pthreads/include/endian.h ../include/dbug.h \
+-	../include/my_sys.h ../include/my_pthread.h \
+-	../mit-pthreads/include/pthread/config.h \
+-	../mit-pthreads/include/sched.h ../include/m_ctype.h \
+-	../include/raid.h ../include/m_string.h ../include/thr_alarm.h
+-my_quick.o: my_quick.c mysys_priv.h ../include/global.h \
+-	../include/my_config.h ../mit-pthreads/include/bits/local_lim.h \
+-	../mit-pthreads/include/endian.h ../include/dbug.h \
+-	../include/my_sys.h ../include/my_pthread.h \
+-	../mit-pthreads/include/pthread/config.h \
+-	../mit-pthreads/include/sched.h ../include/m_ctype.h \
+-	../include/raid.h ../include/my_nosys.h
+-my_read.o: my_read.c mysys_priv.h ../include/global.h \
+-	../include/my_config.h ../mit-pthreads/include/bits/local_lim.h \
+-	../mit-pthreads/include/endian.h ../include/dbug.h \
+-	../include/my_sys.h ../include/my_pthread.h \
+-	../mit-pthreads/include/pthread/config.h \
+-	../mit-pthreads/include/sched.h ../include/m_ctype.h \
+-	../include/raid.h ../include/mysys_err.h
+-my_realloc.o: my_realloc.c mysys_priv.h ../include/global.h \
+-	../include/my_config.h ../mit-pthreads/include/bits/local_lim.h \
+-	../mit-pthreads/include/endian.h ../include/dbug.h \
+-	../include/my_sys.h ../include/my_pthread.h \
+-	../mit-pthreads/include/pthread/config.h \
+-	../mit-pthreads/include/sched.h ../include/m_ctype.h \
+-	../include/raid.h ../include/mysys_err.h
+-my_redel.o: my_redel.c mysys_priv.h ../include/global.h \
+-	../include/my_config.h ../mit-pthreads/include/bits/local_lim.h \
+-	../mit-pthreads/include/endian.h ../include/dbug.h \
+-	../include/my_sys.h ../include/my_pthread.h \
+-	../mit-pthreads/include/pthread/config.h \
+-	../mit-pthreads/include/sched.h ../include/m_ctype.h \
+-	../include/raid.h ../include/my_dir.h ../include/m_string.h \
+-	../include/mysys_err.h
+-my_rename.o: my_rename.c mysys_priv.h ../include/global.h \
+-	../include/my_config.h ../mit-pthreads/include/bits/local_lim.h \
+-	../mit-pthreads/include/endian.h ../include/dbug.h \
+-	../include/my_sys.h ../include/my_pthread.h \
+-	../mit-pthreads/include/pthread/config.h \
+-	../mit-pthreads/include/sched.h ../include/m_ctype.h \
+-	../include/raid.h ../include/my_dir.h ../include/mysys_err.h
+-my_seek.o: my_seek.c mysys_priv.h ../include/global.h \
+-	../include/my_config.h ../mit-pthreads/include/bits/local_lim.h \
+-	../mit-pthreads/include/endian.h ../include/dbug.h \
+-	../include/my_sys.h ../include/my_pthread.h \
+-	../mit-pthreads/include/pthread/config.h \
+-	../mit-pthreads/include/sched.h ../include/m_ctype.h \
+-	../include/raid.h
+-my_static.o: my_static.c mysys_priv.h ../include/global.h \
+-	../include/my_config.h ../mit-pthreads/include/bits/local_lim.h \
+-	../mit-pthreads/include/endian.h ../include/dbug.h \
+-	../include/my_sys.h ../include/my_pthread.h \
+-	../mit-pthreads/include/pthread/config.h \
+-	../mit-pthreads/include/sched.h ../include/m_ctype.h \
+-	../include/raid.h my_static.h ../include/my_alarm.h
+-my_tempnam.o: my_tempnam.c mysys_priv.h ../include/global.h \
+-	../include/my_config.h ../mit-pthreads/include/bits/local_lim.h \
+-	../mit-pthreads/include/endian.h ../include/dbug.h \
+-	../include/my_sys.h ../include/my_pthread.h \
+-	../mit-pthreads/include/pthread/config.h \
+-	../mit-pthreads/include/sched.h ../include/m_ctype.h \
+-	../include/raid.h ../include/m_string.h my_static.h \
+-	../include/mysys_err.h
+-my_thr_init.o: my_thr_init.c mysys_priv.h ../include/global.h \
+-	../include/my_config.h ../mit-pthreads/include/bits/local_lim.h \
+-	../mit-pthreads/include/endian.h ../include/dbug.h \
+-	../include/my_sys.h ../include/my_pthread.h \
+-	../mit-pthreads/include/pthread/config.h \
+-	../mit-pthreads/include/sched.h ../include/m_ctype.h \
+-	../include/raid.h ../include/m_string.h
+-my_vsnprintf.o: my_vsnprintf.c mysys_priv.h ../include/global.h \
+-	../include/my_config.h ../mit-pthreads/include/bits/local_lim.h \
+-	../mit-pthreads/include/endian.h ../include/dbug.h \
+-	../include/my_sys.h ../include/my_pthread.h \
+-	../mit-pthreads/include/pthread/config.h \
+-	../mit-pthreads/include/sched.h ../include/m_ctype.h \
+-	../include/raid.h ../include/mysys_err.h ../include/m_string.h
+-my_write.o: my_write.c mysys_priv.h ../include/global.h \
+-	../include/my_config.h ../mit-pthreads/include/bits/local_lim.h \
+-	../mit-pthreads/include/endian.h ../include/dbug.h \
+-	../include/my_sys.h ../include/my_pthread.h \
+-	../mit-pthreads/include/pthread/config.h \
+-	../mit-pthreads/include/sched.h ../include/m_ctype.h \
+-	../include/raid.h ../include/mysys_err.h
+-ptr_cmp.o: ptr_cmp.c mysys_priv.h ../include/global.h \
+-	../include/my_config.h ../mit-pthreads/include/bits/local_lim.h \
+-	../mit-pthreads/include/endian.h ../include/dbug.h \
+-	../include/my_sys.h ../include/my_pthread.h \
+-	../mit-pthreads/include/pthread/config.h \
+-	../mit-pthreads/include/sched.h ../include/m_ctype.h \
+-	../include/raid.h
+-queues.o: queues.c mysys_priv.h ../include/global.h \
+-	../include/my_config.h ../mit-pthreads/include/bits/local_lim.h \
+-	../mit-pthreads/include/endian.h ../include/dbug.h \
+-	../include/my_sys.h ../include/my_pthread.h \
+-	../mit-pthreads/include/pthread/config.h \
+-	../mit-pthreads/include/sched.h ../include/m_ctype.h \
+-	../include/raid.h ../include/mysys_err.h ../include/queues.h
+-raid.o: raid.cc mysys_priv.h ../include/global.h ../include/my_config.h \
+-	../mit-pthreads/include/bits/local_lim.h \
+-	../mit-pthreads/include/endian.h ../include/dbug.h \
+-	../include/my_sys.h ../include/my_pthread.h \
+-	../mit-pthreads/include/pthread/config.h \
+-	../mit-pthreads/include/sched.h ../include/m_ctype.h \
+-	../include/raid.h ../include/my_dir.h ../include/m_string.h
+-safemalloc.o: safemalloc.c mysys_priv.h ../include/global.h \
+-	../include/my_config.h ../mit-pthreads/include/bits/local_lim.h \
+-	../mit-pthreads/include/endian.h ../include/dbug.h \
+-	../include/my_sys.h ../include/my_pthread.h \
+-	../mit-pthreads/include/pthread/config.h \
+-	../mit-pthreads/include/sched.h ../include/m_ctype.h \
+-	../include/raid.h ../include/m_string.h my_static.h \
+-	../include/mysys_err.h
+-string.o: string.c mysys_priv.h ../include/global.h \
+-	../include/my_config.h ../mit-pthreads/include/bits/local_lim.h \
+-	../mit-pthreads/include/endian.h ../include/dbug.h \
+-	../include/my_sys.h ../include/my_pthread.h \
+-	../mit-pthreads/include/pthread/config.h \
+-	../mit-pthreads/include/sched.h ../include/m_ctype.h \
+-	../include/raid.h ../include/m_string.h
+-testhash.o: testhash.c ../include/global.h ../include/my_config.h \
+-	../mit-pthreads/include/bits/local_lim.h \
+-	../mit-pthreads/include/endian.h ../include/dbug.h \
+-	../include/my_sys.h ../include/my_pthread.h \
+-	../mit-pthreads/include/pthread/config.h \
+-	../mit-pthreads/include/sched.h ../include/m_ctype.h \
+-	../include/raid.h ../include/hash.h ../include/m_string.h
+-thr_alarm.o: thr_alarm.c ../include/global.h ../include/my_config.h \
+-	../mit-pthreads/include/bits/local_lim.h \
+-	../mit-pthreads/include/endian.h ../include/dbug.h \
+-	../include/my_pthread.h \
+-	../mit-pthreads/include/pthread/config.h \
+-	../mit-pthreads/include/sched.h ../include/my_sys.h \
+-	../include/m_ctype.h ../include/raid.h ../include/m_string.h \
+-	../include/queues.h ../include/thr_alarm.h
+-thr_lock.o: thr_lock.c mysys_priv.h ../include/global.h \
+-	../include/my_config.h ../mit-pthreads/include/bits/local_lim.h \
+-	../mit-pthreads/include/endian.h ../include/dbug.h \
+-	../include/my_sys.h ../include/my_pthread.h \
+-	../mit-pthreads/include/pthread/config.h \
+-	../mit-pthreads/include/sched.h ../include/m_ctype.h \
+-	../include/raid.h ../include/thr_lock.h ../include/my_list.h \
+-	../include/m_string.h
+-thr_mutex.o: thr_mutex.c ../include/global.h ../include/my_config.h \
+-	../mit-pthreads/include/bits/local_lim.h \
+-	../mit-pthreads/include/endian.h ../include/dbug.h \
+-	../include/m_string.h
+-thr_rwlock.o: thr_rwlock.c mysys_priv.h ../include/global.h \
+-	../include/my_config.h ../mit-pthreads/include/bits/local_lim.h \
+-	../mit-pthreads/include/endian.h ../include/dbug.h \
+-	../include/my_sys.h ../include/my_pthread.h \
+-	../mit-pthreads/include/pthread/config.h \
+-	../mit-pthreads/include/sched.h ../include/m_ctype.h \
+-	../include/raid.h
+-tree.o: tree.c mysys_priv.h ../include/global.h ../include/my_config.h \
+-	../mit-pthreads/include/bits/local_lim.h \
+-	../mit-pthreads/include/endian.h ../include/dbug.h \
+-	../include/my_sys.h ../include/my_pthread.h \
+-	../mit-pthreads/include/pthread/config.h \
+-	../mit-pthreads/include/sched.h ../include/m_ctype.h \
+-	../include/raid.h ../include/m_string.h ../include/my_tree.h
+-typelib.o: typelib.c mysys_priv.h ../include/global.h \
+-	../include/my_config.h ../mit-pthreads/include/bits/local_lim.h \
+-	../mit-pthreads/include/endian.h ../include/dbug.h \
+-	../include/my_sys.h ../include/my_pthread.h \
+-	../mit-pthreads/include/pthread/config.h \
+-	../mit-pthreads/include/sched.h ../include/m_ctype.h \
+-	../include/raid.h ../include/m_string.h
+ 
++DEPS_MAGIC := $(shell mkdir .deps > /dev/null 2>&1 || :)
++
++-include $(DEP_FILES)
++
++mostlyclean-depend:
++
++clean-depend:
++
++distclean-depend:
++	-rm -rf .deps
++
++maintainer-clean-depend:
++
++%.o: %.c
++	@echo '$(COMPILE) -c $<'; \
++	$(COMPILE) -Wp,-MD,.deps/$(*F).pp -c $<
++	@-cp .deps/$(*F).pp .deps/$(*F).P; \
++	tr ' ' '\012' < .deps/$(*F).pp \
++	  | sed -e 's/^\\$$//' -e '/^$$/ d' -e '/:$$/ d' -e 's/$$/ :/' \
++	    >> .deps/$(*F).P; \
++	rm .deps/$(*F).pp
++
++%.lo: %.c
++	@echo '$(LTCOMPILE) -c $<'; \
++	$(LTCOMPILE) -Wp,-MD,.deps/$(*F).pp -c $<
++	@-sed -e 's/^\([^:]*\)\.o[ 	]*:/\1.lo \1.o :/' \
++	  < .deps/$(*F).pp > .deps/$(*F).P; \
++	tr ' ' '\012' < .deps/$(*F).pp \
++	  | sed -e 's/^\\$$//' -e '/^$$/ d' -e '/:$$/ d' -e 's/$$/ :/' \
++	    >> .deps/$(*F).P; \
++	rm -f .deps/$(*F).pp
++
++%.o: %.cc
++	@echo '$(CXXCOMPILE) -c $<'; \
++	$(CXXCOMPILE) -Wp,-MD,.deps/$(*F).pp -c $<
++	@-cp .deps/$(*F).pp .deps/$(*F).P; \
++	tr ' ' '\012' < .deps/$(*F).pp \
++	  | sed -e 's/^\\$$//' -e '/^$$/ d' -e '/:$$/ d' -e 's/$$/ :/' \
++	    >> .deps/$(*F).P; \
++	rm .deps/$(*F).pp
++
++%.lo: %.cc
++	@echo '$(LTCXXCOMPILE) -c $<'; \
++	$(LTCXXCOMPILE) -Wp,-MD,.deps/$(*F).pp -c $<
++	@-sed -e 's/^\([^:]*\)\.o[ 	]*:/\1.lo \1.o :/' \
++	  < .deps/$(*F).pp > .deps/$(*F).P; \
++	tr ' ' '\012' < .deps/$(*F).pp \
++	  | sed -e 's/^\\$$//' -e '/^$$/ d' -e '/:$$/ d' -e 's/$$/ :/' \
++	    >> .deps/$(*F).P; \
++	rm -f .deps/$(*F).pp
+ info-am:
+ info: info-am
+ dvi-am:
+@@ -1057,19 +512,20 @@
+ maintainer-clean-generic:
+ mostlyclean-am:  mostlyclean-pkglibLIBRARIES mostlyclean-compile \
+ 		mostlyclean-libtool mostlyclean-noinstPROGRAMS \
+-		mostlyclean-tags mostlyclean-generic
++		mostlyclean-tags mostlyclean-depend mostlyclean-generic
+ 
+ mostlyclean: mostlyclean-am
+ 
+ clean-am:  clean-pkglibLIBRARIES clean-compile clean-libtool \
+-		clean-noinstPROGRAMS clean-tags clean-generic \
+-		mostlyclean-am
++		clean-noinstPROGRAMS clean-tags clean-depend \
++		clean-generic mostlyclean-am
+ 
+ clean: clean-am
+ 
+ distclean-am:  distclean-pkglibLIBRARIES distclean-compile \
+ 		distclean-libtool distclean-noinstPROGRAMS \
+-		distclean-tags distclean-generic clean-am
++		distclean-tags distclean-depend distclean-generic \
++		clean-am
+ 	-rm -f libtool
+ 
+ distclean: distclean-am
+@@ -1077,7 +533,8 @@
+ maintainer-clean-am:  maintainer-clean-pkglibLIBRARIES \
+ 		maintainer-clean-compile maintainer-clean-libtool \
+ 		maintainer-clean-noinstPROGRAMS maintainer-clean-tags \
+-		maintainer-clean-generic distclean-am
++		maintainer-clean-depend maintainer-clean-generic \
++		distclean-am
+ 	@echo "This command is intended for maintainers to use;"
+ 	@echo "it deletes files that may require special tools to rebuild."
+ 
+@@ -1091,12 +548,13 @@
+ maintainer-clean-libtool mostlyclean-noinstPROGRAMS \
+ distclean-noinstPROGRAMS clean-noinstPROGRAMS \
+ maintainer-clean-noinstPROGRAMS tags mostlyclean-tags distclean-tags \
+-clean-tags maintainer-clean-tags distdir info-am info dvi-am dvi check \
+-check-am installcheck-am installcheck install-exec-am install-exec \
+-install-data-am install-data install-am install uninstall-am uninstall \
+-all-redirect all-am all installdirs mostlyclean-generic \
+-distclean-generic clean-generic maintainer-clean-generic clean \
+-mostlyclean distclean maintainer-clean
++clean-tags maintainer-clean-tags distdir mostlyclean-depend \
++distclean-depend clean-depend maintainer-clean-depend info-am info \
++dvi-am dvi check check-am installcheck-am installcheck install-exec-am \
++install-exec install-data-am install-data install-am install \
++uninstall-am uninstall all-redirect all-am all installdirs \
++mostlyclean-generic distclean-generic clean-generic \
++maintainer-clean-generic clean mostlyclean distclean maintainer-clean
+ 
+ 
+ #
+diff -r -u mysql-3.23.36.orig/readline/Makefile.in mysql-3.23.36/readline/Makefile.in
+--- mysql-3.23.36.orig/readline/Makefile.in	Tue Mar 27 10:19:50 2001
++++ mysql-3.23.36/readline/Makefile.in	Fri Apr 13 16:23:21 2001
+@@ -200,8 +200,15 @@
+ 
+ DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST)
+ 
+-TAR = gtar
++TAR = tar
+ GZIP_ENV = --best
++DEP_FILES =  .deps/bind.P .deps/callback.P .deps/complete.P \
++.deps/display.P .deps/funmap.P .deps/histexpand.P .deps/histfile.P \
++.deps/history.P .deps/histsearch.P .deps/input.P .deps/isearch.P \
++.deps/keymaps.P .deps/kill.P .deps/macro.P .deps/nls.P .deps/parens.P \
++.deps/readline.P .deps/rltty.P .deps/search.P .deps/shell.P \
++.deps/signals.P .deps/terminal.P .deps/tilde.P .deps/undo.P \
++.deps/util.P .deps/vi_mode.P .deps/xmalloc.P
+ SOURCES = $(libreadline_a_SOURCES)
+ OBJECTS = $(libreadline_a_OBJECTS)
+ 
+@@ -209,9 +216,9 @@
+ .SUFFIXES:
+ .SUFFIXES: .S .c .lo .o .s
+ $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) 
+-	cd $(top_srcdir) && $(AUTOMAKE) --gnu --include-deps readline/Makefile
++	cd $(top_srcdir) && $(AUTOMAKE) --gnu readline/Makefile
+ 
+-Makefile: $(srcdir)/Makefile.in  $(top_builddir)/config.status
++Makefile: $(srcdir)/Makefile.in  $(top_builddir)/config.status $(BUILT_SOURCES)
+ 	cd $(top_builddir) \
+ 	  && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status
+ 
+@@ -225,9 +232,6 @@
+ 
+ maintainer-clean-noinstLIBRARIES:
+ 
+-.c.o:
+-	$(COMPILE) -c $<
+-
+ .s.o:
+ 	$(COMPILE) -c $<
+ 
+@@ -244,9 +248,6 @@
+ 
+ maintainer-clean-compile:
+ 
+-.c.lo:
+-	$(LIBTOOL) --mode=compile $(COMPILE) -c $<
+-
+ .s.lo:
+ 	$(LIBTOOL) --mode=compile $(COMPILE) -c $<
+ 
+@@ -317,72 +318,53 @@
+ subdir = readline
+ 
+ distdir: $(DISTFILES)
++	here=`cd $(top_builddir) && pwd`; \
++	top_distdir=`cd $(top_distdir) && pwd`; \
++	distdir=`cd $(distdir) && pwd`; \
++	cd $(top_srcdir) \
++	  && $(AUTOMAKE) --include-deps --build-dir=$$here --srcdir-name=$(top_srcdir) --output-dir=$$top_distdir --gnu readline/Makefile
+ 	@for file in $(DISTFILES); do \
+ 	  d=$(srcdir); \
+ 	  if test -d $$d/$$file; then \
+-	    cp -pr $$d/$$file $(distdir)/$$file; \
++	    cp -pr $$/$$file $(distdir)/$$file; \
+ 	  else \
+ 	    test -f $(distdir)/$$file \
+ 	    || ln $$d/$$file $(distdir)/$$file 2> /dev/null \
+ 	    || cp -p $$d/$$file $(distdir)/$$file || :; \
+ 	  fi; \
+ 	done
+-bind.o: bind.c ../config.h ../include/getopt.h posixstat.h rldefs.h \
+-	rlconf.h readline.h rlstdc.h keymaps.h chardefs.h tilde.h \
+-	history.h
+-callback.o: callback.c ../config.h rlconf.h rldefs.h readline.h rlstdc.h \
+-	keymaps.h chardefs.h tilde.h
+-complete.o: complete.c ../config.h ../include/getopt.h posixdir.h \
+-	posixstat.h rldefs.h rlconf.h readline.h rlstdc.h keymaps.h \
+-	chardefs.h tilde.h
+-display.o: display.c ../config.h ../include/getopt.h posixstat.h \
+-	rldefs.h rlconf.h tcap.h rltty.h rlwinsize.h readline.h \
+-	rlstdc.h keymaps.h chardefs.h tilde.h history.h
+-funmap.o: funmap.c ../config.h rlconf.h readline.h rlstdc.h keymaps.h \
+-	chardefs.h tilde.h
+-histexpand.o: histexpand.c ../config.h ../include/getopt.h history.h \
+-	rlstdc.h histlib.h
+-histfile.o: histfile.c ../config.h ../include/getopt.h history.h \
+-	rlstdc.h histlib.h
+-history.o: history.c ../config.h ../include/getopt.h history.h rlstdc.h \
+-	histlib.h
+-histsearch.o: histsearch.c ../config.h ../include/getopt.h history.h \
+-	rlstdc.h histlib.h
+-input.o: input.c ../config.h ../include/getopt.h rldefs.h rlconf.h \
+-	readline.h rlstdc.h keymaps.h chardefs.h tilde.h
+-isearch.o: isearch.c ../config.h ../include/getopt.h rldefs.h rlconf.h \
+-	readline.h rlstdc.h keymaps.h chardefs.h tilde.h history.h
+-keymaps.o: keymaps.c ../config.h rlconf.h keymaps.h rlstdc.h chardefs.h \
+-	emacs_keymap.c readline.h tilde.h vi_keymap.c
+-kill.o: kill.c ../config.h ../include/getopt.h rldefs.h rlconf.h \
+-	readline.h rlstdc.h keymaps.h chardefs.h tilde.h history.h
+-macro.o: macro.c ../config.h ../include/getopt.h rldefs.h rlconf.h \
+-	readline.h rlstdc.h keymaps.h chardefs.h tilde.h history.h
+-nls.o: nls.c ../config.h ../include/getopt.h rldefs.h rlconf.h
+-parens.o: parens.c rlconf.h
+-readline.o: readline.c ../config.h posixstat.h ../include/getopt.h \
+-	posixjmp.h rldefs.h rlconf.h readline.h rlstdc.h keymaps.h \
+-	chardefs.h tilde.h history.h
+-rltty.o: rltty.c ../config.h ../include/getopt.h rldefs.h rlconf.h \
+-	rltty.h rlwinsize.h readline.h rlstdc.h keymaps.h chardefs.h \
+-	tilde.h
+-search.o: search.c ../config.h ../include/getopt.h rldefs.h rlconf.h \
+-	readline.h rlstdc.h keymaps.h chardefs.h tilde.h history.h
+-shell.o: shell.c ../config.h ../include/getopt.h
+-signals.o: signals.c ../config.h ../include/getopt.h rldefs.h rlconf.h \
+-	readline.h rlstdc.h keymaps.h chardefs.h tilde.h history.h
+-terminal.o: terminal.c ../config.h posixstat.h ../include/getopt.h \
+-	rldefs.h rlconf.h rltty.h rlwinsize.h tcap.h readline.h \
+-	rlstdc.h keymaps.h chardefs.h tilde.h history.h
+-tilde.o: tilde.c ../config.h ../include/getopt.h tilde.h
+-undo.o: undo.c ../config.h ../include/getopt.h rldefs.h rlconf.h \
+-	readline.h rlstdc.h keymaps.h chardefs.h tilde.h history.h
+-util.o: util.c ../config.h posixjmp.h ../include/getopt.h rldefs.h \
+-	rlconf.h readline.h rlstdc.h keymaps.h chardefs.h tilde.h
+-vi_mode.o: vi_mode.c rlconf.h ../config.h ../include/getopt.h rldefs.h \
+-	readline.h rlstdc.h keymaps.h chardefs.h tilde.h history.h
+-xmalloc.o: xmalloc.c ../config.h
+ 
++DEPS_MAGIC := $(shell mkdir .deps > /dev/null 2>&1 || :)
++
++-include $(DEP_FILES)
++
++mostlyclean-depend:
++
++clean-depend:
++
++distclean-depend:
++	-rm -rf .deps
++
++maintainer-clean-depend:
++
++%.o: %.c
++	@echo '$(COMPILE) -c $<'; \
++	$(COMPILE) -Wp,-MD,.deps/$(*F).pp -c $<
++	@-cp .deps/$(*F).pp .deps/$(*F).P; \
++	tr ' ' '\012' < .deps/$(*F).pp \
++	  | sed -e 's/^\\$$//' -e '/^$$/ d' -e '/:$$/ d' -e 's/$$/ :/' \
++	    >> .deps/$(*F).P; \
++	rm .deps/$(*F).pp
++
++%.lo: %.c
++	@echo '$(LTCOMPILE) -c $<'; \
++	$(LTCOMPILE) -Wp,-MD,.deps/$(*F).pp -c $<
++	@-sed -e 's/^\([^:]*\)\.o[ 	]*:/\1.lo \1.o :/' \
++	  < .deps/$(*F).pp > .deps/$(*F).P; \
++	tr ' ' '\012' < .deps/$(*F).pp \
++	  | sed -e 's/^\\$$//' -e '/^$$/ d' -e '/:$$/ d' -e 's/$$/ :/' \
++	    >> .deps/$(*F).P; \
++	rm -f .deps/$(*F).pp
+ info-am:
+ info: info-am
+ dvi-am:
+@@ -420,27 +402,27 @@
+ 
+ maintainer-clean-generic:
+ mostlyclean-am:  mostlyclean-noinstLIBRARIES mostlyclean-compile \
+-		mostlyclean-libtool mostlyclean-tags \
++		mostlyclean-libtool mostlyclean-tags mostlyclean-depend \
+ 		mostlyclean-generic
+ 
+ mostlyclean: mostlyclean-am
+ 
+ clean-am:  clean-noinstLIBRARIES clean-compile clean-libtool clean-tags \
+-		clean-generic mostlyclean-am
++		clean-depend clean-generic mostlyclean-am
+ 
+ clean: clean-am
+ 
+ distclean-am:  distclean-noinstLIBRARIES distclean-compile \
+-		distclean-libtool distclean-tags distclean-generic \
+-		clean-am
++		distclean-libtool distclean-tags distclean-depend \
++		distclean-generic clean-am
+ 	-rm -f libtool
+ 
+ distclean: distclean-am
+ 
+ maintainer-clean-am:  maintainer-clean-noinstLIBRARIES \
+ 		maintainer-clean-compile maintainer-clean-libtool \
+-		maintainer-clean-tags maintainer-clean-generic \
+-		distclean-am
++		maintainer-clean-tags maintainer-clean-depend \
++		maintainer-clean-generic distclean-am
+ 	@echo "This command is intended for maintainers to use;"
+ 	@echo "it deletes files that may require special tools to rebuild."
+ 
+@@ -452,12 +434,13 @@
+ maintainer-clean-compile mostlyclean-libtool distclean-libtool \
+ clean-libtool maintainer-clean-libtool uninstall-pkgincludeHEADERS \
+ install-pkgincludeHEADERS tags mostlyclean-tags distclean-tags \
+-clean-tags maintainer-clean-tags distdir info-am info dvi-am dvi check \
+-check-am installcheck-am installcheck install-exec-am install-exec \
+-install-data-am install-data install-am install uninstall-am uninstall \
+-all-redirect all-am all installdirs mostlyclean-generic \
+-distclean-generic clean-generic maintainer-clean-generic clean \
+-mostlyclean distclean maintainer-clean
++clean-tags maintainer-clean-tags distdir mostlyclean-depend \
++distclean-depend clean-depend maintainer-clean-depend info-am info \
++dvi-am dvi check check-am installcheck-am installcheck install-exec-am \
++install-exec install-data-am install-data install-am install \
++uninstall-am uninstall all-redirect all-am all installdirs \
++mostlyclean-generic distclean-generic clean-generic \
++maintainer-clean-generic clean mostlyclean distclean maintainer-clean
+ 
+ 
+ # Don't update the files from bitkeeper
+diff -r -u mysql-3.23.36.orig/regex/Makefile.in mysql-3.23.36/regex/Makefile.in
+--- mysql-3.23.36.orig/regex/Makefile.in	Tue Mar 27 10:20:18 2001
++++ mysql-3.23.36/regex/Makefile.in	Fri Apr 13 16:23:20 2001
+@@ -215,8 +215,10 @@
+ 
+ DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST)
+ 
+-TAR = gtar
++TAR = tar
+ GZIP_ENV = --best
++DEP_FILES =  .deps/debug.P .deps/main.P .deps/regcomp.P .deps/regerror.P \
++.deps/regexec.P .deps/regfree.P .deps/reginit.P .deps/split.P
+ SOURCES = $(libregex_a_SOURCES) $(re_SOURCES)
+ OBJECTS = $(libregex_a_OBJECTS) $(re_OBJECTS)
+ 
+@@ -224,9 +226,9 @@
+ .SUFFIXES:
+ .SUFFIXES: .S .c .lo .o .s
+ $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) 
+-	cd $(top_srcdir) && $(AUTOMAKE) --gnu --include-deps regex/Makefile
++	cd $(top_srcdir) && $(AUTOMAKE) --gnu regex/Makefile
+ 
+-Makefile: $(srcdir)/Makefile.in  $(top_builddir)/config.status
++Makefile: $(srcdir)/Makefile.in  $(top_builddir)/config.status $(BUILT_SOURCES)
+ 	cd $(top_builddir) \
+ 	  && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status
+ 
+@@ -240,9 +242,6 @@
+ 
+ maintainer-clean-noinstLIBRARIES:
+ 
+-.c.o:
+-	$(COMPILE) -c $<
+-
+ .s.o:
+ 	$(COMPILE) -c $<
+ 
+@@ -259,9 +258,6 @@
+ 
+ maintainer-clean-compile:
+ 
+-.c.lo:
+-	$(LIBTOOL) --mode=compile $(COMPILE) -c $<
+-
+ .s.lo:
+ 	$(LIBTOOL) --mode=compile $(COMPILE) -c $<
+ 
+@@ -330,50 +326,53 @@
+ subdir = regex
+ 
+ distdir: $(DISTFILES)
++	here=`cd $(top_builddir) && pwd`; \
++	top_distdir=`cd $(top_distdir) && pwd`; \
++	distdir=`cd $(distdir) && pwd`; \
++	cd $(top_srcdir) \
++	  && $(AUTOMAKE) --include-deps --build-dir=$$here --srcdir-name=$(top_srcdir) --output-dir=$$top_distdir --gnu regex/Makefile
+ 	@for file in $(DISTFILES); do \
+ 	  d=$(srcdir); \
+ 	  if test -d $$d/$$file; then \
+-	    cp -pr $$d/$$file $(distdir)/$$file; \
++	    cp -pr $$/$$file $(distdir)/$$file; \
+ 	  else \
+ 	    test -f $(distdir)/$$file \
+ 	    || ln $$d/$$file $(distdir)/$$file 2> /dev/null \
+ 	    || cp -p $$d/$$file $(distdir)/$$file || :; \
+ 	  fi; \
+ 	done
+-debug.o: debug.c ../include/global.h ../include/my_config.h \
+-	../mit-pthreads/include/bits/local_lim.h \
+-	../mit-pthreads/include/endian.h ../include/dbug.h \
+-	../include/m_ctype.h ../include/m_string.h regex.h utils.h \
+-	regex2.h debug.ih
+-main.o: main.c ../include/global.h ../include/my_config.h \
+-	../mit-pthreads/include/bits/local_lim.h \
+-	../mit-pthreads/include/endian.h ../include/dbug.h \
+-	../include/m_string.h regex.h main.ih
+-regcomp.o: regcomp.c ../include/global.h ../include/my_config.h \
+-	../mit-pthreads/include/bits/local_lim.h \
+-	../mit-pthreads/include/endian.h ../include/dbug.h \
+-	../include/m_string.h ../include/m_ctype.h regex.h utils.h \
+-	regex2.h cclass.h cname.h regcomp.ih
+-regerror.o: regerror.c ../include/global.h ../include/my_config.h \
+-	../mit-pthreads/include/bits/local_lim.h \
+-	../mit-pthreads/include/endian.h ../include/dbug.h \
+-	../include/m_string.h ../include/m_ctype.h regex.h utils.h \
+-	regerror.ih
+-regexec.o: regexec.c ../include/global.h ../include/my_config.h \
+-	../mit-pthreads/include/bits/local_lim.h \
+-	../mit-pthreads/include/endian.h ../include/dbug.h \
+-	../include/m_string.h ../include/m_ctype.h regex.h utils.h \
+-	regex2.h engine.c engine.ih
+-regfree.o: regfree.c ../include/global.h ../include/my_config.h \
+-	../mit-pthreads/include/bits/local_lim.h \
+-	../mit-pthreads/include/endian.h ../include/dbug.h regex.h \
+-	utils.h regex2.h
+-reginit.o: reginit.c ../include/global.h ../include/my_config.h \
+-	../mit-pthreads/include/bits/local_lim.h \
+-	../mit-pthreads/include/endian.h ../include/dbug.h \
+-	../include/m_ctype.h ../include/m_string.h cclass.h
+-split.o: split.c
+ 
++DEPS_MAGIC := $(shell mkdir .deps > /dev/null 2>&1 || :)
++
++-include $(DEP_FILES)
++
++mostlyclean-depend:
++
++clean-depend:
++
++distclean-depend:
++	-rm -rf .deps
++
++maintainer-clean-depend:
++
++%.o: %.c
++	@echo '$(COMPILE) -c $<'; \
++	$(COMPILE) -Wp,-MD,.deps/$(*F).pp -c $<
++	@-cp .deps/$(*F).pp .deps/$(*F).P; \
++	tr ' ' '\012' < .deps/$(*F).pp \
++	  | sed -e 's/^\\$$//' -e '/^$$/ d' -e '/:$$/ d' -e 's/$$/ :/' \
++	    >> .deps/$(*F).P; \
++	rm .deps/$(*F).pp
++
++%.lo: %.c
++	@echo '$(LTCOMPILE) -c $<'; \
++	$(LTCOMPILE) -Wp,-MD,.deps/$(*F).pp -c $<
++	@-sed -e 's/^\([^:]*\)\.o[ 	]*:/\1.lo \1.o :/' \
++	  < .deps/$(*F).pp > .deps/$(*F).P; \
++	tr ' ' '\012' < .deps/$(*F).pp \
++	  | sed -e 's/^\\$$//' -e '/^$$/ d' -e '/:$$/ d' -e 's/$$/ :/' \
++	    >> .deps/$(*F).P; \
++	rm -f .deps/$(*F).pp
+ info-am:
+ info: info-am
+ dvi-am:
+@@ -411,19 +410,20 @@
+ maintainer-clean-generic:
+ mostlyclean-am:  mostlyclean-noinstLIBRARIES mostlyclean-compile \
+ 		mostlyclean-libtool mostlyclean-noinstPROGRAMS \
+-		mostlyclean-tags mostlyclean-generic
++		mostlyclean-tags mostlyclean-depend mostlyclean-generic
+ 
+ mostlyclean: mostlyclean-am
+ 
+ clean-am:  clean-noinstLIBRARIES clean-compile clean-libtool \
+-		clean-noinstPROGRAMS clean-tags clean-generic \
+-		mostlyclean-am
++		clean-noinstPROGRAMS clean-tags clean-depend \
++		clean-generic mostlyclean-am
+ 
+ clean: clean-am
+ 
+ distclean-am:  distclean-noinstLIBRARIES distclean-compile \
+ 		distclean-libtool distclean-noinstPROGRAMS \
+-		distclean-tags distclean-generic clean-am
++		distclean-tags distclean-depend distclean-generic \
++		clean-am
+ 	-rm -f libtool
+ 
+ distclean: distclean-am
+@@ -431,7 +431,8 @@
+ maintainer-clean-am:  maintainer-clean-noinstLIBRARIES \
+ 		maintainer-clean-compile maintainer-clean-libtool \
+ 		maintainer-clean-noinstPROGRAMS maintainer-clean-tags \
+-		maintainer-clean-generic distclean-am
++		maintainer-clean-depend maintainer-clean-generic \
++		distclean-am
+ 	@echo "This command is intended for maintainers to use;"
+ 	@echo "it deletes files that may require special tools to rebuild."
+ 
+@@ -444,12 +445,13 @@
+ clean-libtool maintainer-clean-libtool mostlyclean-noinstPROGRAMS \
+ distclean-noinstPROGRAMS clean-noinstPROGRAMS \
+ maintainer-clean-noinstPROGRAMS tags mostlyclean-tags distclean-tags \
+-clean-tags maintainer-clean-tags distdir info-am info dvi-am dvi check \
+-check-am installcheck-am installcheck install-exec-am install-exec \
+-install-data-am install-data install-am install uninstall-am uninstall \
+-all-redirect all-am all installdirs mostlyclean-generic \
+-distclean-generic clean-generic maintainer-clean-generic clean \
+-mostlyclean distclean maintainer-clean
++clean-tags maintainer-clean-tags distdir mostlyclean-depend \
++distclean-depend clean-depend maintainer-clean-depend info-am info \
++dvi-am dvi check check-am installcheck-am installcheck install-exec-am \
++install-exec install-data-am install-data install-am install \
++uninstall-am uninstall all-redirect all-am all installdirs \
++mostlyclean-generic distclean-generic clean-generic \
++maintainer-clean-generic clean mostlyclean distclean maintainer-clean
+ 
+ 
+ test: re tests
+diff -r -u mysql-3.23.36.orig/scripts/Makefile.in mysql-3.23.36/scripts/Makefile.in
+--- mysql-3.23.36.orig/scripts/Makefile.in	Tue Mar 27 10:20:29 2001
++++ mysql-3.23.36/scripts/Makefile.in	Fri Apr 13 16:23:23 2001
+@@ -203,15 +203,15 @@
+ 
+ DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST)
+ 
+-TAR = gtar
++TAR = tar
+ GZIP_ENV = --best
+ all: all-redirect
+ .SUFFIXES:
+ .SUFFIXES: .sh
+ $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) 
+-	cd $(top_srcdir) && $(AUTOMAKE) --gnu --include-deps scripts/Makefile
++	cd $(top_srcdir) && $(AUTOMAKE) --gnu scripts/Makefile
+ 
+-Makefile: $(srcdir)/Makefile.in  $(top_builddir)/config.status
++Makefile: $(srcdir)/Makefile.in  $(top_builddir)/config.status $(BUILT_SOURCES)
+ 	cd $(top_builddir) \
+ 	  && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status
+ 
+@@ -262,10 +262,15 @@
+ subdir = scripts
+ 
+ distdir: $(DISTFILES)
++	here=`cd $(top_builddir) && pwd`; \
++	top_distdir=`cd $(top_distdir) && pwd`; \
++	distdir=`cd $(distdir) && pwd`; \
++	cd $(top_srcdir) \
++	  && $(AUTOMAKE) --include-deps --build-dir=$$here --srcdir-name=$(top_srcdir) --output-dir=$$top_distdir --gnu scripts/Makefile
+ 	@for file in $(DISTFILES); do \
+ 	  d=$(srcdir); \
+ 	  if test -d $$d/$$file; then \
+-	    cp -pr $$d/$$file $(distdir)/$$file; \
++	    cp -pr $$/$$file $(distdir)/$$file; \
+ 	  else \
+ 	    test -f $(distdir)/$$file \
+ 	    || ln $$d/$$file $(distdir)/$$file 2> /dev/null \
+diff -r -u mysql-3.23.36.orig/sql/Makefile.in mysql-3.23.36/sql/Makefile.in
+--- mysql-3.23.36.orig/sql/Makefile.in	Tue Mar 27 10:20:27 2001
++++ mysql-3.23.36/sql/Makefile.in	Fri Apr 13 16:23:22 2001
+@@ -260,8 +260,30 @@
+ 
+ DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST)
+ 
+-TAR = gtar
++TAR = tar
+ GZIP_ENV = --best
++DEP_FILES =  .deps/convert.P .deps/derror.P .deps/field.P \
++.deps/field_conv.P .deps/filesort.P .deps/gen_lex_hash.P \
++.deps/ha_berkeley.P .deps/ha_gemini.P .deps/ha_heap.P \
++.deps/ha_innobase.P .deps/ha_isam.P .deps/ha_isammrg.P \
++.deps/ha_myisam.P .deps/ha_myisammrg.P .deps/handler.P \
++.deps/hash_filo.P .deps/hostname.P .deps/init.P .deps/item.P \
++.deps/item_buff.P .deps/item_cmpfunc.P .deps/item_create.P \
++.deps/item_func.P .deps/item_strfunc.P .deps/item_sum.P \
++.deps/item_timefunc.P .deps/item_uniq.P .deps/key.P .deps/lock.P \
++.deps/log.P .deps/log_event.P .deps/md5.P .deps/mf_iocache.P \
++.deps/mini_client.P .deps/mini_client_errors.P .deps/my_lock.P \
++.deps/mysqlbinlog.P .deps/mysqld.P .deps/net_pkg.P .deps/net_serv.P \
++.deps/opt_ft.P .deps/opt_range.P .deps/opt_sum.P .deps/password.P \
++.deps/procedure.P .deps/records.P .deps/slave.P .deps/sql_acl.P \
++.deps/sql_analyse.P .deps/sql_base.P .deps/sql_cache.P \
++.deps/sql_class.P .deps/sql_crypt.P .deps/sql_db.P .deps/sql_delete.P \
++.deps/sql_insert.P .deps/sql_lex.P .deps/sql_list.P .deps/sql_load.P \
++.deps/sql_manager.P .deps/sql_map.P .deps/sql_parse.P \
++.deps/sql_rename.P .deps/sql_repl.P .deps/sql_select.P .deps/sql_show.P \
++.deps/sql_string.P .deps/sql_table.P .deps/sql_test.P .deps/sql_udf.P \
++.deps/sql_update.P .deps/sql_yacc.P .deps/table.P .deps/thr_malloc.P \
++.deps/time.P .deps/unireg.P .deps/violite.P
+ SOURCES = $(mysqlbinlog_SOURCES) $(mysqld_SOURCES) $(gen_lex_hash_SOURCES)
+ OBJECTS = $(mysqlbinlog_OBJECTS) $(mysqld_OBJECTS) $(gen_lex_hash_OBJECTS)
+ 
+@@ -269,9 +291,9 @@
+ .SUFFIXES:
+ .SUFFIXES: .S .c .cc .lo .o .s .yy
+ $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) 
+-	cd $(top_srcdir) && $(AUTOMAKE) --gnu --include-deps sql/Makefile
++	cd $(top_srcdir) && $(AUTOMAKE) --gnu sql/Makefile
+ 
+-Makefile: $(srcdir)/Makefile.in  $(top_builddir)/config.status
++Makefile: $(srcdir)/Makefile.in  $(top_builddir)/config.status $(BUILT_SOURCES)
+ 	cd $(top_builddir) \
+ 	  && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status
+ 
+@@ -335,9 +357,6 @@
+ 
+ maintainer-clean-noinstPROGRAMS:
+ 
+-.c.o:
+-	$(COMPILE) -c $<
+-
+ .s.o:
+ 	$(COMPILE) -c $<
+ 
+@@ -354,9 +373,6 @@
+ 
+ maintainer-clean-compile:
+ 
+-.c.lo:
+-	$(LIBTOOL) --mode=compile $(COMPILE) -c $<
+-
+ .s.lo:
+ 	$(LIBTOOL) --mode=compile $(COMPILE) -c $<
+ 
+@@ -490,10 +506,15 @@
+ subdir = sql
+ 
+ distdir: $(DISTFILES)
++	here=`cd $(top_builddir) && pwd`; \
++	top_distdir=`cd $(top_distdir) && pwd`; \
++	distdir=`cd $(distdir) && pwd`; \
++	cd $(top_srcdir) \
++	  && $(AUTOMAKE) --include-deps --build-dir=$$here --srcdir-name=$(top_srcdir) --output-dir=$$top_distdir --gnu sql/Makefile
+ 	@for file in $(DISTFILES); do \
+ 	  d=$(srcdir); \
+ 	  if test -d $$d/$$file; then \
+-	    cp -pr $$d/$$file $(distdir)/$$file; \
++	    cp -pr $$/$$file $(distdir)/$$file; \
+ 	  else \
+ 	    test -f $(distdir)/$$file \
+ 	    || ln $$d/$$file $(distdir)/$$file 2> /dev/null \
+@@ -510,1277 +531,57 @@
+ 	      || exit 1; \
+ 	  fi; \
+ 	done
+-convert.o: convert.cc mysql_priv.h ../include/global.h \
+-	../include/my_config.h ../mit-pthreads/include/bits/local_lim.h \
+-	../mit-pthreads/include/endian.h ../include/dbug.h \
+-	../include/my_sys.h ../include/my_pthread.h \
+-	../mit-pthreads/include/pthread/config.h \
+-	../mit-pthreads/include/sched.h ../include/m_ctype.h \
+-	../include/raid.h ../include/m_string.h \
+-	../include/mysql_version.h ../include/hash.h \
+-	../include/thr_lock.h ../include/my_list.h ../include/my_base.h \
+-	../include/my_bitmap.h ../include/violite.h ../include/my_net.h \
+-	../include/mysql_com.h unireg.h ../include/mysqld_error.h \
+-	structs.h sql_string.h sql_list.h sql_map.h handler.h table.h \
+-	field.h sql_udf.h item.h item_sum.h item_func.h \
+-	../include/ft_global.h item_cmpfunc.h ../regex/regex.h \
+-	item_strfunc.h sql_crypt.h item_timefunc.h item_uniq.h \
+-	../include/queues.h sql_class.h sql_lex.h lex_symbol.h \
+-	sql_yacc.h log_event.h opt_range.h
+-derror.o: derror.cc mysql_priv.h ../include/global.h \
+-	../include/my_config.h ../mit-pthreads/include/bits/local_lim.h \
+-	../mit-pthreads/include/endian.h ../include/dbug.h \
+-	../include/my_sys.h ../include/my_pthread.h \
+-	../mit-pthreads/include/pthread/config.h \
+-	../mit-pthreads/include/sched.h ../include/m_ctype.h \
+-	../include/raid.h ../include/m_string.h \
+-	../include/mysql_version.h ../include/hash.h \
+-	../include/thr_lock.h ../include/my_list.h ../include/my_base.h \
+-	../include/my_bitmap.h ../include/violite.h ../include/my_net.h \
+-	../include/mysql_com.h unireg.h ../include/mysqld_error.h \
+-	structs.h sql_string.h sql_list.h sql_map.h handler.h table.h \
+-	field.h sql_udf.h item.h item_sum.h item_func.h \
+-	../include/ft_global.h item_cmpfunc.h ../regex/regex.h \
+-	item_strfunc.h sql_crypt.h item_timefunc.h item_uniq.h \
+-	../include/queues.h sql_class.h sql_lex.h lex_symbol.h \
+-	sql_yacc.h log_event.h opt_range.h ../include/mysys_err.h
+-field.o: field.cc mysql_priv.h ../include/global.h \
+-	../include/my_config.h ../mit-pthreads/include/bits/local_lim.h \
+-	../mit-pthreads/include/endian.h ../include/dbug.h \
+-	../include/my_sys.h ../include/my_pthread.h \
+-	../mit-pthreads/include/pthread/config.h \
+-	../mit-pthreads/include/sched.h ../include/m_ctype.h \
+-	../include/raid.h ../include/m_string.h \
+-	../include/mysql_version.h ../include/hash.h \
+-	../include/thr_lock.h ../include/my_list.h ../include/my_base.h \
+-	../include/my_bitmap.h ../include/violite.h ../include/my_net.h \
+-	../include/mysql_com.h unireg.h ../include/mysqld_error.h \
+-	structs.h sql_string.h sql_list.h sql_map.h handler.h table.h \
+-	field.h sql_udf.h item.h item_sum.h item_func.h \
+-	../include/ft_global.h item_cmpfunc.h ../regex/regex.h \
+-	item_strfunc.h sql_crypt.h item_timefunc.h item_uniq.h \
+-	../include/queues.h sql_class.h sql_lex.h lex_symbol.h \
+-	sql_yacc.h log_event.h opt_range.h sql_select.h procedure.h \
+-	../include/myisam.h
+-field_conv.o: field_conv.cc mysql_priv.h ../include/global.h \
+-	../include/my_config.h ../mit-pthreads/include/bits/local_lim.h \
+-	../mit-pthreads/include/endian.h ../include/dbug.h \
+-	../include/my_sys.h ../include/my_pthread.h \
+-	../mit-pthreads/include/pthread/config.h \
+-	../mit-pthreads/include/sched.h ../include/m_ctype.h \
+-	../include/raid.h ../include/m_string.h \
+-	../include/mysql_version.h ../include/hash.h \
+-	../include/thr_lock.h ../include/my_list.h ../include/my_base.h \
+-	../include/my_bitmap.h ../include/violite.h ../include/my_net.h \
+-	../include/mysql_com.h unireg.h ../include/mysqld_error.h \
+-	structs.h sql_string.h sql_list.h sql_map.h handler.h table.h \
+-	field.h sql_udf.h item.h item_sum.h item_func.h \
+-	../include/ft_global.h item_cmpfunc.h ../regex/regex.h \
+-	item_strfunc.h sql_crypt.h item_timefunc.h item_uniq.h \
+-	../include/queues.h sql_class.h sql_lex.h lex_symbol.h \
+-	sql_yacc.h log_event.h opt_range.h
+-filesort.o: filesort.cc mysql_priv.h ../include/global.h \
+-	../include/my_config.h ../mit-pthreads/include/bits/local_lim.h \
+-	../mit-pthreads/include/endian.h ../include/dbug.h \
+-	../include/my_sys.h ../include/my_pthread.h \
+-	../mit-pthreads/include/pthread/config.h \
+-	../mit-pthreads/include/sched.h ../include/m_ctype.h \
+-	../include/raid.h ../include/m_string.h \
+-	../include/mysql_version.h ../include/hash.h \
+-	../include/thr_lock.h ../include/my_list.h ../include/my_base.h \
+-	../include/my_bitmap.h ../include/violite.h ../include/my_net.h \
+-	../include/mysql_com.h unireg.h ../include/mysqld_error.h \
+-	structs.h sql_string.h sql_list.h sql_map.h handler.h table.h \
+-	field.h sql_udf.h item.h item_sum.h item_func.h \
+-	../include/ft_global.h item_cmpfunc.h ../regex/regex.h \
+-	item_strfunc.h sql_crypt.h item_timefunc.h item_uniq.h \
+-	../include/queues.h sql_class.h sql_lex.h lex_symbol.h \
+-	sql_yacc.h log_event.h opt_range.h
+-ha_berkeley.o: ha_berkeley.cc mysql_priv.h ../include/global.h \
+-	../include/my_config.h ../mit-pthreads/include/bits/local_lim.h \
+-	../mit-pthreads/include/endian.h ../include/dbug.h \
+-	../include/my_sys.h ../include/my_pthread.h \
+-	../mit-pthreads/include/pthread/config.h \
+-	../mit-pthreads/include/sched.h ../include/m_ctype.h \
+-	../include/raid.h ../include/m_string.h \
+-	../include/mysql_version.h ../include/hash.h \
+-	../include/thr_lock.h ../include/my_list.h ../include/my_base.h \
+-	../include/my_bitmap.h ../include/violite.h ../include/my_net.h \
+-	../include/mysql_com.h unireg.h ../include/mysqld_error.h \
+-	structs.h sql_string.h sql_list.h sql_map.h handler.h table.h \
+-	field.h sql_udf.h item.h item_sum.h item_func.h \
+-	../include/ft_global.h item_cmpfunc.h ../regex/regex.h \
+-	item_strfunc.h sql_crypt.h item_timefunc.h item_uniq.h \
+-	../include/queues.h sql_class.h sql_lex.h lex_symbol.h \
+-	sql_yacc.h log_event.h opt_range.h ../include/myisampack.h \
+-	ha_berkeley.h ../bdb/build_unix/db.h sql_manager.h
+-ha_gemini.o: ha_gemini.cc mysql_priv.h ../include/global.h \
+-	../include/my_config.h ../mit-pthreads/include/bits/local_lim.h \
+-	../mit-pthreads/include/endian.h ../include/dbug.h \
+-	../include/my_sys.h ../include/my_pthread.h \
+-	../mit-pthreads/include/pthread/config.h \
+-	../mit-pthreads/include/sched.h ../include/m_ctype.h \
+-	../include/raid.h ../include/m_string.h \
+-	../include/mysql_version.h ../include/hash.h \
+-	../include/thr_lock.h ../include/my_list.h ../include/my_base.h \
+-	../include/my_bitmap.h ../include/violite.h ../include/my_net.h \
+-	../include/mysql_com.h unireg.h ../include/mysqld_error.h \
+-	structs.h sql_string.h sql_list.h sql_map.h handler.h table.h \
+-	field.h sql_udf.h item.h item_sum.h item_func.h \
+-	../include/ft_global.h item_cmpfunc.h ../regex/regex.h \
+-	item_strfunc.h sql_crypt.h item_timefunc.h item_uniq.h \
+-	../include/queues.h sql_class.h sql_lex.h lex_symbol.h \
+-	sql_yacc.h log_event.h opt_range.h
+-ha_heap.o: ha_heap.cc mysql_priv.h ../include/global.h \
+-	../include/my_config.h ../mit-pthreads/include/bits/local_lim.h \
+-	../mit-pthreads/include/endian.h ../include/dbug.h \
+-	../include/my_sys.h ../include/my_pthread.h \
+-	../mit-pthreads/include/pthread/config.h \
+-	../mit-pthreads/include/sched.h ../include/m_ctype.h \
+-	../include/raid.h ../include/m_string.h \
+-	../include/mysql_version.h ../include/hash.h \
+-	../include/thr_lock.h ../include/my_list.h ../include/my_base.h \
+-	../include/my_bitmap.h ../include/violite.h ../include/my_net.h \
+-	../include/mysql_com.h unireg.h ../include/mysqld_error.h \
+-	structs.h sql_string.h sql_list.h sql_map.h handler.h table.h \
+-	field.h sql_udf.h item.h item_sum.h item_func.h \
+-	../include/ft_global.h item_cmpfunc.h ../regex/regex.h \
+-	item_strfunc.h sql_crypt.h item_timefunc.h item_uniq.h \
+-	../include/queues.h sql_class.h sql_lex.h lex_symbol.h \
+-	sql_yacc.h log_event.h opt_range.h ../include/myisampack.h \
+-	ha_heap.h ../include/heap.h
+-ha_innobase.o: ha_innobase.cc mysql_priv.h ../include/global.h \
+-	../include/my_config.h ../mit-pthreads/include/bits/local_lim.h \
+-	../mit-pthreads/include/endian.h ../include/dbug.h \
+-	../include/my_sys.h ../include/my_pthread.h \
+-	../mit-pthreads/include/pthread/config.h \
+-	../mit-pthreads/include/sched.h ../include/m_ctype.h \
+-	../include/raid.h ../include/m_string.h \
+-	../include/mysql_version.h ../include/hash.h \
+-	../include/thr_lock.h ../include/my_list.h ../include/my_base.h \
+-	../include/my_bitmap.h ../include/violite.h ../include/my_net.h \
+-	../include/mysql_com.h unireg.h ../include/mysqld_error.h \
+-	structs.h sql_string.h sql_list.h sql_map.h handler.h table.h \
+-	field.h sql_udf.h item.h item_sum.h item_func.h \
+-	../include/ft_global.h item_cmpfunc.h ../regex/regex.h \
+-	item_strfunc.h sql_crypt.h item_timefunc.h item_uniq.h \
+-	../include/queues.h sql_class.h sql_lex.h lex_symbol.h \
+-	sql_yacc.h log_event.h opt_range.h ../include/myisampack.h \
+-	ha_innobase.h ../innobase/include/univ.i \
+-	../innobase/include/../ib_config.h ../innobase/include/ut0dbg.h \
+-	../innobase/include/os0thread.h ../innobase/include/ut0ut.h \
+-	../innobase/include/db0err.h ../innobase/include/srv0start.h \
+-	../innobase/include/srv0srv.h ../innobase/include/sync0sync.h \
+-	../innobase/include/sync0types.h ../innobase/include/ut0lst.h \
+-	../innobase/include/ut0mem.h ../innobase/include/os0sync.h \
+-	../innobase/include/sync0arr.h ../innobase/include/com0com.h \
+-	../innobase/include/que0types.h ../innobase/include/data0data.h \
+-	../innobase/include/data0types.h \
+-	../innobase/include/data0type.h ../innobase/include/mem0mem.h \
+-	../innobase/include/ut0byte.h ../innobase/include/ut0rnd.h \
+-	../innobase/include/mach0data.h ../innobase/include/mem0dbg.h \
+-	../innobase/include/dict0types.h ../innobase/include/trx0roll.h \
+-	../innobase/include/trx0trx.h ../innobase/include/trx0types.h \
+-	../innobase/include/lock0types.h \
+-	../innobase/include/usr0types.h \
+-	../innobase/include/read0types.h ../innobase/include/mtr0mtr.h \
+-	../innobase/include/dyn0dyn.h ../innobase/include/buf0types.h \
+-	../innobase/include/sync0rw.h ../innobase/include/mtr0types.h \
+-	../innobase/include/page0types.h ../innobase/include/trx0sys.h \
+-	../innobase/include/mtr0log.h ../innobase/include/buf0buf.h \
+-	../innobase/include/fil0fil.h ../innobase/include/ibuf0types.h \
+-	../innobase/include/os0file.h ../innobase/include/hash0hash.h \
+-	../innobase/include/fut0lst.h ../innobase/include/fsp0fsp.h \
+-	../innobase/include/row0ins.h ../innobase/include/row0types.h \
+-	../innobase/include/row0mysql.h ../innobase/include/btr0pcur.h \
+-	../innobase/include/dict0dict.h ../innobase/include/dict0mem.h \
+-	../innobase/include/rem0types.h ../innobase/include/btr0types.h \
+-	../innobase/include/page0cur.h ../innobase/include/page0page.h \
+-	../innobase/include/rem0rec.h ../innobase/include/btr0cur.h \
+-	../innobase/include/ha0ha.h ../innobase/include/btr0btr.h \
+-	../innobase/include/row0sel.h ../innobase/include/pars0sym.h \
+-	../innobase/include/pars0types.h \
+-	../innobase/include/read0read.h ../innobase/include/row0upd.h \
+-	../innobase/include/log0log.h ../innobase/include/lock0lock.h \
+-	../innobase/include/dict0crea.h
+-ha_isam.o: ha_isam.cc mysql_priv.h ../include/global.h \
+-	../include/my_config.h ../mit-pthreads/include/bits/local_lim.h \
+-	../mit-pthreads/include/endian.h ../include/dbug.h \
+-	../include/my_sys.h ../include/my_pthread.h \
+-	../mit-pthreads/include/pthread/config.h \
+-	../mit-pthreads/include/sched.h ../include/m_ctype.h \
+-	../include/raid.h ../include/m_string.h \
+-	../include/mysql_version.h ../include/hash.h \
+-	../include/thr_lock.h ../include/my_list.h ../include/my_base.h \
+-	../include/my_bitmap.h ../include/violite.h ../include/my_net.h \
+-	../include/mysql_com.h unireg.h ../include/mysqld_error.h \
+-	structs.h sql_string.h sql_list.h sql_map.h handler.h table.h \
+-	field.h sql_udf.h item.h item_sum.h item_func.h \
+-	../include/ft_global.h item_cmpfunc.h ../regex/regex.h \
+-	item_strfunc.h sql_crypt.h item_timefunc.h item_uniq.h \
+-	../include/queues.h sql_class.h sql_lex.h lex_symbol.h \
+-	sql_yacc.h log_event.h opt_range.h ../include/myisampack.h \
+-	ha_isam.h ../include/nisam.h ../isam/isamdef.h
+-ha_isammrg.o: ha_isammrg.cc mysql_priv.h ../include/global.h \
+-	../include/my_config.h ../mit-pthreads/include/bits/local_lim.h \
+-	../mit-pthreads/include/endian.h ../include/dbug.h \
+-	../include/my_sys.h ../include/my_pthread.h \
+-	../mit-pthreads/include/pthread/config.h \
+-	../mit-pthreads/include/sched.h ../include/m_ctype.h \
+-	../include/raid.h ../include/m_string.h \
+-	../include/mysql_version.h ../include/hash.h \
+-	../include/thr_lock.h ../include/my_list.h ../include/my_base.h \
+-	../include/my_bitmap.h ../include/violite.h ../include/my_net.h \
+-	../include/mysql_com.h unireg.h ../include/mysqld_error.h \
+-	structs.h sql_string.h sql_list.h sql_map.h handler.h table.h \
+-	field.h sql_udf.h item.h item_sum.h item_func.h \
+-	../include/ft_global.h item_cmpfunc.h ../regex/regex.h \
+-	item_strfunc.h sql_crypt.h item_timefunc.h item_uniq.h \
+-	../include/queues.h sql_class.h sql_lex.h lex_symbol.h \
+-	sql_yacc.h log_event.h opt_range.h ../merge/mrgdef.h \
+-	../merge/../isam/isamdef.h ../include/nisam.h \
+-	../include/merge.h ha_isammrg.h
+-ha_myisam.o: ha_myisam.cc mysql_priv.h ../include/global.h \
+-	../include/my_config.h ../mit-pthreads/include/bits/local_lim.h \
+-	../mit-pthreads/include/endian.h ../include/dbug.h \
+-	../include/my_sys.h ../include/my_pthread.h \
+-	../mit-pthreads/include/pthread/config.h \
+-	../mit-pthreads/include/sched.h ../include/m_ctype.h \
+-	../include/raid.h ../include/m_string.h \
+-	../include/mysql_version.h ../include/hash.h \
+-	../include/thr_lock.h ../include/my_list.h ../include/my_base.h \
+-	../include/my_bitmap.h ../include/violite.h ../include/my_net.h \
+-	../include/mysql_com.h unireg.h ../include/mysqld_error.h \
+-	structs.h sql_string.h sql_list.h sql_map.h handler.h table.h \
+-	field.h sql_udf.h item.h item_sum.h item_func.h \
+-	../include/ft_global.h item_cmpfunc.h ../regex/regex.h \
+-	item_strfunc.h sql_crypt.h item_timefunc.h item_uniq.h \
+-	../include/queues.h sql_class.h sql_lex.h lex_symbol.h \
+-	sql_yacc.h log_event.h opt_range.h ../include/myisampack.h \
+-	ha_myisam.h ../include/myisam.h ../myisam/myisamdef.h
+-ha_myisammrg.o: ha_myisammrg.cc mysql_priv.h ../include/global.h \
+-	../include/my_config.h ../mit-pthreads/include/bits/local_lim.h \
+-	../mit-pthreads/include/endian.h ../include/dbug.h \
+-	../include/my_sys.h ../include/my_pthread.h \
+-	../mit-pthreads/include/pthread/config.h \
+-	../mit-pthreads/include/sched.h ../include/m_ctype.h \
+-	../include/raid.h ../include/m_string.h \
+-	../include/mysql_version.h ../include/hash.h \
+-	../include/thr_lock.h ../include/my_list.h ../include/my_base.h \
+-	../include/my_bitmap.h ../include/violite.h ../include/my_net.h \
+-	../include/mysql_com.h unireg.h ../include/mysqld_error.h \
+-	structs.h sql_string.h sql_list.h sql_map.h handler.h table.h \
+-	field.h sql_udf.h item.h item_sum.h item_func.h \
+-	../include/ft_global.h item_cmpfunc.h ../regex/regex.h \
+-	item_strfunc.h sql_crypt.h item_timefunc.h item_uniq.h \
+-	../include/queues.h sql_class.h sql_lex.h lex_symbol.h \
+-	sql_yacc.h log_event.h opt_range.h ha_myisammrg.h \
+-	../include/myisammrg.h ../include/myisam.h \
+-	../myisammrg/mymrgdef.h ../myisammrg/../myisam/myisamdef.h \
+-	../include/myisampack.h
+-handler.o: handler.cc mysql_priv.h ../include/global.h \
+-	../include/my_config.h ../mit-pthreads/include/bits/local_lim.h \
+-	../mit-pthreads/include/endian.h ../include/dbug.h \
+-	../include/my_sys.h ../include/my_pthread.h \
+-	../mit-pthreads/include/pthread/config.h \
+-	../mit-pthreads/include/sched.h ../include/m_ctype.h \
+-	../include/raid.h ../include/m_string.h \
+-	../include/mysql_version.h ../include/hash.h \
+-	../include/thr_lock.h ../include/my_list.h ../include/my_base.h \
+-	../include/my_bitmap.h ../include/violite.h ../include/my_net.h \
+-	../include/mysql_com.h unireg.h ../include/mysqld_error.h \
+-	structs.h sql_string.h sql_list.h sql_map.h handler.h table.h \
+-	field.h sql_udf.h item.h item_sum.h item_func.h \
+-	../include/ft_global.h item_cmpfunc.h ../regex/regex.h \
+-	item_strfunc.h sql_crypt.h item_timefunc.h item_uniq.h \
+-	../include/queues.h sql_class.h sql_lex.h lex_symbol.h \
+-	sql_yacc.h log_event.h opt_range.h ha_heap.h ../include/heap.h \
+-	ha_myisam.h ../include/myisam.h ha_myisammrg.h \
+-	../include/myisammrg.h ha_isam.h ../include/nisam.h \
+-	ha_isammrg.h ../include/merge.h ha_berkeley.h \
+-	../bdb/build_unix/db.h ha_innobase.h ../include/myisampack.h
+-hash_filo.o: hash_filo.cc mysql_priv.h ../include/global.h \
+-	../include/my_config.h ../mit-pthreads/include/bits/local_lim.h \
+-	../mit-pthreads/include/endian.h ../include/dbug.h \
+-	../include/my_sys.h ../include/my_pthread.h \
+-	../mit-pthreads/include/pthread/config.h \
+-	../mit-pthreads/include/sched.h ../include/m_ctype.h \
+-	../include/raid.h ../include/m_string.h \
+-	../include/mysql_version.h ../include/hash.h \
+-	../include/thr_lock.h ../include/my_list.h ../include/my_base.h \
+-	../include/my_bitmap.h ../include/violite.h ../include/my_net.h \
+-	../include/mysql_com.h unireg.h ../include/mysqld_error.h \
+-	structs.h sql_string.h sql_list.h sql_map.h handler.h table.h \
+-	field.h sql_udf.h item.h item_sum.h item_func.h \
+-	../include/ft_global.h item_cmpfunc.h ../regex/regex.h \
+-	item_strfunc.h sql_crypt.h item_timefunc.h item_uniq.h \
+-	../include/queues.h sql_class.h sql_lex.h lex_symbol.h \
+-	sql_yacc.h log_event.h opt_range.h hash_filo.h
+-hostname.o: hostname.cc mysql_priv.h ../include/global.h \
+-	../include/my_config.h ../mit-pthreads/include/bits/local_lim.h \
+-	../mit-pthreads/include/endian.h ../include/dbug.h \
+-	../include/my_sys.h ../include/my_pthread.h \
+-	../mit-pthreads/include/pthread/config.h \
+-	../mit-pthreads/include/sched.h ../include/m_ctype.h \
+-	../include/raid.h ../include/m_string.h \
+-	../include/mysql_version.h ../include/hash.h \
+-	../include/thr_lock.h ../include/my_list.h ../include/my_base.h \
+-	../include/my_bitmap.h ../include/violite.h ../include/my_net.h \
+-	../include/mysql_com.h unireg.h ../include/mysqld_error.h \
+-	structs.h sql_string.h sql_list.h sql_map.h handler.h table.h \
+-	field.h sql_udf.h item.h item_sum.h item_func.h \
+-	../include/ft_global.h item_cmpfunc.h ../regex/regex.h \
+-	item_strfunc.h sql_crypt.h item_timefunc.h item_uniq.h \
+-	../include/queues.h sql_class.h sql_lex.h lex_symbol.h \
+-	sql_yacc.h log_event.h opt_range.h hash_filo.h
+-init.o: init.cc mysql_priv.h ../include/global.h ../include/my_config.h \
+-	../mit-pthreads/include/bits/local_lim.h \
+-	../mit-pthreads/include/endian.h ../include/dbug.h \
+-	../include/my_sys.h ../include/my_pthread.h \
+-	../mit-pthreads/include/pthread/config.h \
+-	../mit-pthreads/include/sched.h ../include/m_ctype.h \
+-	../include/raid.h ../include/m_string.h \
+-	../include/mysql_version.h ../include/hash.h \
+-	../include/thr_lock.h ../include/my_list.h ../include/my_base.h \
+-	../include/my_bitmap.h ../include/violite.h ../include/my_net.h \
+-	../include/mysql_com.h unireg.h ../include/mysqld_error.h \
+-	structs.h sql_string.h sql_list.h sql_map.h handler.h table.h \
+-	field.h sql_udf.h item.h item_sum.h item_func.h \
+-	../include/ft_global.h item_cmpfunc.h ../regex/regex.h \
+-	item_strfunc.h sql_crypt.h item_timefunc.h item_uniq.h \
+-	../include/queues.h sql_class.h sql_lex.h lex_symbol.h \
+-	sql_yacc.h log_event.h opt_range.h
+-item.o: item.cc mysql_priv.h ../include/global.h ../include/my_config.h \
+-	../mit-pthreads/include/bits/local_lim.h \
+-	../mit-pthreads/include/endian.h ../include/dbug.h \
+-	../include/my_sys.h ../include/my_pthread.h \
+-	../mit-pthreads/include/pthread/config.h \
+-	../mit-pthreads/include/sched.h ../include/m_ctype.h \
+-	../include/raid.h ../include/m_string.h \
+-	../include/mysql_version.h ../include/hash.h \
+-	../include/thr_lock.h ../include/my_list.h ../include/my_base.h \
+-	../include/my_bitmap.h ../include/violite.h ../include/my_net.h \
+-	../include/mysql_com.h unireg.h ../include/mysqld_error.h \
+-	structs.h sql_string.h sql_list.h sql_map.h handler.h table.h \
+-	field.h sql_udf.h item.h item_sum.h item_func.h \
+-	../include/ft_global.h item_cmpfunc.h ../regex/regex.h \
+-	item_strfunc.h sql_crypt.h item_timefunc.h item_uniq.h \
+-	../include/queues.h sql_class.h sql_lex.h lex_symbol.h \
+-	sql_yacc.h log_event.h opt_range.h ../include/my_dir.h
+-item_buff.o: item_buff.cc mysql_priv.h ../include/global.h \
+-	../include/my_config.h ../mit-pthreads/include/bits/local_lim.h \
+-	../mit-pthreads/include/endian.h ../include/dbug.h \
+-	../include/my_sys.h ../include/my_pthread.h \
+-	../mit-pthreads/include/pthread/config.h \
+-	../mit-pthreads/include/sched.h ../include/m_ctype.h \
+-	../include/raid.h ../include/m_string.h \
+-	../include/mysql_version.h ../include/hash.h \
+-	../include/thr_lock.h ../include/my_list.h ../include/my_base.h \
+-	../include/my_bitmap.h ../include/violite.h ../include/my_net.h \
+-	../include/mysql_com.h unireg.h ../include/mysqld_error.h \
+-	structs.h sql_string.h sql_list.h sql_map.h handler.h table.h \
+-	field.h sql_udf.h item.h item_sum.h item_func.h \
+-	../include/ft_global.h item_cmpfunc.h ../regex/regex.h \
+-	item_strfunc.h sql_crypt.h item_timefunc.h item_uniq.h \
+-	../include/queues.h sql_class.h sql_lex.h lex_symbol.h \
+-	sql_yacc.h log_event.h opt_range.h
+-item_cmpfunc.o: item_cmpfunc.cc mysql_priv.h ../include/global.h \
+-	../include/my_config.h ../mit-pthreads/include/bits/local_lim.h \
+-	../mit-pthreads/include/endian.h ../include/dbug.h \
+-	../include/my_sys.h ../include/my_pthread.h \
+-	../mit-pthreads/include/pthread/config.h \
+-	../mit-pthreads/include/sched.h ../include/m_ctype.h \
+-	../include/raid.h ../include/m_string.h \
+-	../include/mysql_version.h ../include/hash.h \
+-	../include/thr_lock.h ../include/my_list.h ../include/my_base.h \
+-	../include/my_bitmap.h ../include/violite.h ../include/my_net.h \
+-	../include/mysql_com.h unireg.h ../include/mysqld_error.h \
+-	structs.h sql_string.h sql_list.h sql_map.h handler.h table.h \
+-	field.h sql_udf.h item.h item_sum.h item_func.h \
+-	../include/ft_global.h item_cmpfunc.h ../regex/regex.h \
+-	item_strfunc.h sql_crypt.h item_timefunc.h item_uniq.h \
+-	../include/queues.h sql_class.h sql_lex.h lex_symbol.h \
+-	sql_yacc.h log_event.h opt_range.h
+-item_create.o: item_create.cc mysql_priv.h ../include/global.h \
+-	../include/my_config.h ../mit-pthreads/include/bits/local_lim.h \
+-	../mit-pthreads/include/endian.h ../include/dbug.h \
+-	../include/my_sys.h ../include/my_pthread.h \
+-	../mit-pthreads/include/pthread/config.h \
+-	../mit-pthreads/include/sched.h ../include/m_ctype.h \
+-	../include/raid.h ../include/m_string.h \
+-	../include/mysql_version.h ../include/hash.h \
+-	../include/thr_lock.h ../include/my_list.h ../include/my_base.h \
+-	../include/my_bitmap.h ../include/violite.h ../include/my_net.h \
+-	../include/mysql_com.h unireg.h ../include/mysqld_error.h \
+-	structs.h sql_string.h sql_list.h sql_map.h handler.h table.h \
+-	field.h sql_udf.h item.h item_sum.h item_func.h \
+-	../include/ft_global.h item_cmpfunc.h ../regex/regex.h \
+-	item_strfunc.h sql_crypt.h item_timefunc.h item_uniq.h \
+-	../include/queues.h sql_class.h sql_lex.h lex_symbol.h \
+-	sql_yacc.h log_event.h opt_range.h
+-item_func.o: item_func.cc mysql_priv.h ../include/global.h \
+-	../include/my_config.h ../mit-pthreads/include/bits/local_lim.h \
+-	../mit-pthreads/include/endian.h ../include/dbug.h \
+-	../include/my_sys.h ../include/my_pthread.h \
+-	../mit-pthreads/include/pthread/config.h \
+-	../mit-pthreads/include/sched.h ../include/m_ctype.h \
+-	../include/raid.h ../include/m_string.h \
+-	../include/mysql_version.h ../include/hash.h \
+-	../include/thr_lock.h ../include/my_list.h ../include/my_base.h \
+-	../include/my_bitmap.h ../include/violite.h ../include/my_net.h \
+-	../include/mysql_com.h unireg.h ../include/mysqld_error.h \
+-	structs.h sql_string.h sql_list.h sql_map.h handler.h table.h \
+-	field.h sql_udf.h item.h item_sum.h item_func.h \
+-	../include/ft_global.h item_cmpfunc.h ../regex/regex.h \
+-	item_strfunc.h sql_crypt.h item_timefunc.h item_uniq.h \
+-	../include/queues.h sql_class.h sql_lex.h lex_symbol.h \
+-	sql_yacc.h log_event.h opt_range.h slave.h
+-item_strfunc.o: item_strfunc.cc mysql_priv.h ../include/global.h \
+-	../include/my_config.h ../mit-pthreads/include/bits/local_lim.h \
+-	../mit-pthreads/include/endian.h ../include/dbug.h \
+-	../include/my_sys.h ../include/my_pthread.h \
+-	../mit-pthreads/include/pthread/config.h \
+-	../mit-pthreads/include/sched.h ../include/m_ctype.h \
+-	../include/raid.h ../include/m_string.h \
+-	../include/mysql_version.h ../include/hash.h \
+-	../include/thr_lock.h ../include/my_list.h ../include/my_base.h \
+-	../include/my_bitmap.h ../include/violite.h ../include/my_net.h \
+-	../include/mysql_com.h unireg.h ../include/mysqld_error.h \
+-	structs.h sql_string.h sql_list.h sql_map.h handler.h table.h \
+-	field.h sql_udf.h item.h item_sum.h item_func.h \
+-	../include/ft_global.h item_cmpfunc.h ../regex/regex.h \
+-	item_strfunc.h sql_crypt.h item_timefunc.h item_uniq.h \
+-	../include/queues.h sql_class.h sql_lex.h lex_symbol.h \
+-	sql_yacc.h log_event.h opt_range.h sql_acl.h md5.h \
+-	../include/my_dir.h
+-item_sum.o: item_sum.cc mysql_priv.h ../include/global.h \
+-	../include/my_config.h ../mit-pthreads/include/bits/local_lim.h \
+-	../mit-pthreads/include/endian.h ../include/dbug.h \
+-	../include/my_sys.h ../include/my_pthread.h \
+-	../mit-pthreads/include/pthread/config.h \
+-	../mit-pthreads/include/sched.h ../include/m_ctype.h \
+-	../include/raid.h ../include/m_string.h \
+-	../include/mysql_version.h ../include/hash.h \
+-	../include/thr_lock.h ../include/my_list.h ../include/my_base.h \
+-	../include/my_bitmap.h ../include/violite.h ../include/my_net.h \
+-	../include/mysql_com.h unireg.h ../include/mysqld_error.h \
+-	structs.h sql_string.h sql_list.h sql_map.h handler.h table.h \
+-	field.h sql_udf.h item.h item_sum.h item_func.h \
+-	../include/ft_global.h item_cmpfunc.h ../regex/regex.h \
+-	item_strfunc.h sql_crypt.h item_timefunc.h item_uniq.h \
+-	../include/queues.h sql_class.h sql_lex.h lex_symbol.h \
+-	sql_yacc.h log_event.h opt_range.h sql_select.h procedure.h \
+-	../include/myisam.h
+-item_timefunc.o: item_timefunc.cc mysql_priv.h ../include/global.h \
+-	../include/my_config.h ../mit-pthreads/include/bits/local_lim.h \
+-	../mit-pthreads/include/endian.h ../include/dbug.h \
+-	../include/my_sys.h ../include/my_pthread.h \
+-	../mit-pthreads/include/pthread/config.h \
+-	../mit-pthreads/include/sched.h ../include/m_ctype.h \
+-	../include/raid.h ../include/m_string.h \
+-	../include/mysql_version.h ../include/hash.h \
+-	../include/thr_lock.h ../include/my_list.h ../include/my_base.h \
+-	../include/my_bitmap.h ../include/violite.h ../include/my_net.h \
+-	../include/mysql_com.h unireg.h ../include/mysqld_error.h \
+-	structs.h sql_string.h sql_list.h sql_map.h handler.h table.h \
+-	field.h sql_udf.h item.h item_sum.h item_func.h \
+-	../include/ft_global.h item_cmpfunc.h ../regex/regex.h \
+-	item_strfunc.h sql_crypt.h item_timefunc.h item_uniq.h \
+-	../include/queues.h sql_class.h sql_lex.h lex_symbol.h \
+-	sql_yacc.h log_event.h opt_range.h
+-item_uniq.o: item_uniq.cc mysql_priv.h ../include/global.h \
+-	../include/my_config.h ../mit-pthreads/include/bits/local_lim.h \
+-	../mit-pthreads/include/endian.h ../include/dbug.h \
+-	../include/my_sys.h ../include/my_pthread.h \
+-	../mit-pthreads/include/pthread/config.h \
+-	../mit-pthreads/include/sched.h ../include/m_ctype.h \
+-	../include/raid.h ../include/m_string.h \
+-	../include/mysql_version.h ../include/hash.h \
+-	../include/thr_lock.h ../include/my_list.h ../include/my_base.h \
+-	../include/my_bitmap.h ../include/violite.h ../include/my_net.h \
+-	../include/mysql_com.h unireg.h ../include/mysqld_error.h \
+-	structs.h sql_string.h sql_list.h sql_map.h handler.h table.h \
+-	field.h sql_udf.h item.h item_sum.h item_func.h \
+-	../include/ft_global.h item_cmpfunc.h ../regex/regex.h \
+-	item_strfunc.h sql_crypt.h item_timefunc.h item_uniq.h \
+-	../include/queues.h sql_class.h sql_lex.h lex_symbol.h \
+-	sql_yacc.h log_event.h opt_range.h
+-key.o: key.cc mysql_priv.h ../include/global.h ../include/my_config.h \
+-	../mit-pthreads/include/bits/local_lim.h \
+-	../mit-pthreads/include/endian.h ../include/dbug.h \
+-	../include/my_sys.h ../include/my_pthread.h \
+-	../mit-pthreads/include/pthread/config.h \
+-	../mit-pthreads/include/sched.h ../include/m_ctype.h \
+-	../include/raid.h ../include/m_string.h \
+-	../include/mysql_version.h ../include/hash.h \
+-	../include/thr_lock.h ../include/my_list.h ../include/my_base.h \
+-	../include/my_bitmap.h ../include/violite.h ../include/my_net.h \
+-	../include/mysql_com.h unireg.h ../include/mysqld_error.h \
+-	structs.h sql_string.h sql_list.h sql_map.h handler.h table.h \
+-	field.h sql_udf.h item.h item_sum.h item_func.h \
+-	../include/ft_global.h item_cmpfunc.h ../regex/regex.h \
+-	item_strfunc.h sql_crypt.h item_timefunc.h item_uniq.h \
+-	../include/queues.h sql_class.h sql_lex.h lex_symbol.h \
+-	sql_yacc.h log_event.h opt_range.h
+-lock.o: lock.cc mysql_priv.h ../include/global.h ../include/my_config.h \
+-	../mit-pthreads/include/bits/local_lim.h \
+-	../mit-pthreads/include/endian.h ../include/dbug.h \
+-	../include/my_sys.h ../include/my_pthread.h \
+-	../mit-pthreads/include/pthread/config.h \
+-	../mit-pthreads/include/sched.h ../include/m_ctype.h \
+-	../include/raid.h ../include/m_string.h \
+-	../include/mysql_version.h ../include/hash.h \
+-	../include/thr_lock.h ../include/my_list.h ../include/my_base.h \
+-	../include/my_bitmap.h ../include/violite.h ../include/my_net.h \
+-	../include/mysql_com.h unireg.h ../include/mysqld_error.h \
+-	structs.h sql_string.h sql_list.h sql_map.h handler.h table.h \
+-	field.h sql_udf.h item.h item_sum.h item_func.h \
+-	../include/ft_global.h item_cmpfunc.h ../regex/regex.h \
+-	item_strfunc.h sql_crypt.h item_timefunc.h item_uniq.h \
+-	../include/queues.h sql_class.h sql_lex.h lex_symbol.h \
+-	sql_yacc.h log_event.h opt_range.h
+-log.o: log.cc mysql_priv.h ../include/global.h ../include/my_config.h \
+-	../mit-pthreads/include/bits/local_lim.h \
+-	../mit-pthreads/include/endian.h ../include/dbug.h \
+-	../include/my_sys.h ../include/my_pthread.h \
+-	../mit-pthreads/include/pthread/config.h \
+-	../mit-pthreads/include/sched.h ../include/m_ctype.h \
+-	../include/raid.h ../include/m_string.h \
+-	../include/mysql_version.h ../include/hash.h \
+-	../include/thr_lock.h ../include/my_list.h ../include/my_base.h \
+-	../include/my_bitmap.h ../include/violite.h ../include/my_net.h \
+-	../include/mysql_com.h unireg.h ../include/mysqld_error.h \
+-	structs.h sql_string.h sql_list.h sql_map.h handler.h table.h \
+-	field.h sql_udf.h item.h item_sum.h item_func.h \
+-	../include/ft_global.h item_cmpfunc.h ../regex/regex.h \
+-	item_strfunc.h sql_crypt.h item_timefunc.h item_uniq.h \
+-	../include/queues.h sql_class.h sql_lex.h lex_symbol.h \
+-	sql_yacc.h log_event.h opt_range.h sql_acl.h sql_repl.h slave.h \
+-	../include/my_dir.h
+-log_event.o: log_event.cc mysql_priv.h ../include/global.h \
+-	../include/my_config.h ../mit-pthreads/include/bits/local_lim.h \
+-	../mit-pthreads/include/endian.h ../include/dbug.h \
+-	../include/my_sys.h ../include/my_pthread.h \
+-	../mit-pthreads/include/pthread/config.h \
+-	../mit-pthreads/include/sched.h ../include/m_ctype.h \
+-	../include/raid.h ../include/m_string.h \
+-	../include/mysql_version.h ../include/hash.h \
+-	../include/thr_lock.h ../include/my_list.h ../include/my_base.h \
+-	../include/my_bitmap.h ../include/violite.h ../include/my_net.h \
+-	../include/mysql_com.h unireg.h ../include/mysqld_error.h \
+-	structs.h sql_string.h sql_list.h sql_map.h handler.h table.h \
+-	field.h sql_udf.h item.h item_sum.h item_func.h \
+-	../include/ft_global.h item_cmpfunc.h ../regex/regex.h \
+-	item_strfunc.h sql_crypt.h item_timefunc.h item_uniq.h \
+-	../include/queues.h sql_class.h sql_lex.h lex_symbol.h \
+-	sql_yacc.h log_event.h opt_range.h
+-md5.o: md5.c ../include/global.h ../include/my_config.h \
+-	../mit-pthreads/include/bits/local_lim.h \
+-	../mit-pthreads/include/endian.h ../include/dbug.h \
+-	../include/m_string.h md5.h
+-mf_iocache.o: mf_iocache.cc mysql_priv.h ../include/global.h \
+-	../include/my_config.h ../mit-pthreads/include/bits/local_lim.h \
+-	../mit-pthreads/include/endian.h ../include/dbug.h \
+-	../include/my_sys.h ../include/my_pthread.h \
+-	../mit-pthreads/include/pthread/config.h \
+-	../mit-pthreads/include/sched.h ../include/m_ctype.h \
+-	../include/raid.h ../include/m_string.h \
+-	../include/mysql_version.h ../include/hash.h \
+-	../include/thr_lock.h ../include/my_list.h ../include/my_base.h \
+-	../include/my_bitmap.h ../include/violite.h ../include/my_net.h \
+-	../include/mysql_com.h unireg.h ../include/mysqld_error.h \
+-	structs.h sql_string.h sql_list.h sql_map.h handler.h table.h \
+-	field.h sql_udf.h item.h item_sum.h item_func.h \
+-	../include/ft_global.h item_cmpfunc.h ../regex/regex.h \
+-	item_strfunc.h sql_crypt.h item_timefunc.h item_uniq.h \
+-	../include/queues.h sql_class.h sql_lex.h lex_symbol.h \
+-	sql_yacc.h log_event.h opt_range.h
+-mini_client.o: mini_client.cc ../include/global.h ../include/my_config.h \
+-	../mit-pthreads/include/bits/local_lim.h \
+-	../mit-pthreads/include/endian.h ../include/dbug.h \
+-	../include/my_sys.h ../include/my_pthread.h \
+-	../mit-pthreads/include/pthread/config.h \
+-	../mit-pthreads/include/sched.h ../include/m_ctype.h \
+-	../include/raid.h ../include/mysys_err.h ../include/m_string.h \
+-	../include/mysql.h ../include/mysql_com.h \
+-	../include/mysql_version.h mini_client.h \
+-	../include/mysqld_error.h ../include/errmsg.h \
+-	../include/violite.h ../include/my_net.h
+-mini_client_errors.o: mini_client_errors.c ../include/global.h \
+-	../include/my_config.h ../mit-pthreads/include/bits/local_lim.h \
+-	../mit-pthreads/include/endian.h ../include/dbug.h \
+-	../include/my_sys.h ../include/my_pthread.h \
+-	../mit-pthreads/include/pthread/config.h \
+-	../mit-pthreads/include/sched.h ../include/m_ctype.h \
+-	../include/raid.h ../include/errmsg.h
+-my_lock.o: my_lock.c ../include/global.h ../include/my_config.h \
+-	../mit-pthreads/include/bits/local_lim.h \
+-	../mit-pthreads/include/endian.h ../include/dbug.h \
+-	../include/my_sys.h ../include/my_pthread.h \
+-	../mit-pthreads/include/pthread/config.h \
+-	../mit-pthreads/include/sched.h ../include/m_ctype.h \
+-	../include/raid.h ../include/mysys_err.h ../include/thr_alarm.h
+-mysqlbinlog.o: mysqlbinlog.cc ../include/global.h ../include/my_config.h \
+-	../mit-pthreads/include/bits/local_lim.h \
+-	../mit-pthreads/include/endian.h ../include/dbug.h \
+-	../include/m_string.h ../include/my_sys.h \
+-	../include/my_pthread.h \
+-	../mit-pthreads/include/pthread/config.h \
+-	../mit-pthreads/include/sched.h ../include/m_ctype.h \
+-	../include/raid.h ../include/getopt.h ../include/thr_alarm.h \
+-	../include/mysql.h ../include/mysql_com.h \
+-	../include/mysql_version.h log_event.h mini_client.h \
+-	log_event.cc
+-mysqld.o: mysqld.cc mysql_priv.h ../include/global.h \
+-	../include/my_config.h ../mit-pthreads/include/bits/local_lim.h \
+-	../mit-pthreads/include/endian.h ../include/dbug.h \
+-	../include/my_sys.h ../include/my_pthread.h \
+-	../mit-pthreads/include/pthread/config.h \
+-	../mit-pthreads/include/sched.h ../include/m_ctype.h \
+-	../include/raid.h ../include/m_string.h \
+-	../include/mysql_version.h ../include/hash.h \
+-	../include/thr_lock.h ../include/my_list.h ../include/my_base.h \
+-	../include/my_bitmap.h ../include/violite.h ../include/my_net.h \
+-	../include/mysql_com.h unireg.h ../include/mysqld_error.h \
+-	structs.h sql_string.h sql_list.h sql_map.h handler.h table.h \
+-	field.h sql_udf.h item.h item_sum.h item_func.h \
+-	../include/ft_global.h item_cmpfunc.h ../regex/regex.h \
+-	item_strfunc.h sql_crypt.h item_timefunc.h item_uniq.h \
+-	../include/queues.h sql_class.h sql_lex.h lex_symbol.h \
+-	sql_yacc.h log_event.h opt_range.h ../include/mysql.h sql_acl.h \
+-	slave.h ha_berkeley.h ../bdb/build_unix/db.h ha_innobase.h \
+-	ha_myisam.h ../include/myisam.h ../include/nisam.h \
+-	../include/thr_alarm.h ../include/getopt.h \
+-	../include/sslopt-longopts.h ../include/sslopt-usage.h \
+-	../include/sslopt-case.h
+-net_pkg.o: net_pkg.cc mysql_priv.h ../include/global.h \
+-	../include/my_config.h ../mit-pthreads/include/bits/local_lim.h \
+-	../mit-pthreads/include/endian.h ../include/dbug.h \
+-	../include/my_sys.h ../include/my_pthread.h \
+-	../mit-pthreads/include/pthread/config.h \
+-	../mit-pthreads/include/sched.h ../include/m_ctype.h \
+-	../include/raid.h ../include/m_string.h \
+-	../include/mysql_version.h ../include/hash.h \
+-	../include/thr_lock.h ../include/my_list.h ../include/my_base.h \
+-	../include/my_bitmap.h ../include/violite.h ../include/my_net.h \
+-	../include/mysql_com.h unireg.h ../include/mysqld_error.h \
+-	structs.h sql_string.h sql_list.h sql_map.h handler.h table.h \
+-	field.h sql_udf.h item.h item_sum.h item_func.h \
+-	../include/ft_global.h item_cmpfunc.h ../regex/regex.h \
+-	item_strfunc.h sql_crypt.h item_timefunc.h item_uniq.h \
+-	../include/queues.h sql_class.h sql_lex.h lex_symbol.h \
+-	sql_yacc.h log_event.h opt_range.h
+-net_serv.o: net_serv.cc ../include/global.h ../include/my_config.h \
+-	../mit-pthreads/include/bits/local_lim.h \
+-	../mit-pthreads/include/endian.h ../include/dbug.h \
+-	../include/violite.h ../include/my_net.h ../include/my_sys.h \
+-	../include/my_pthread.h \
+-	../mit-pthreads/include/pthread/config.h \
+-	../mit-pthreads/include/sched.h ../include/m_ctype.h \
+-	../include/raid.h ../include/m_string.h ../include/mysql.h \
+-	../include/mysql_com.h ../include/mysql_version.h \
+-	../include/mysqld_error.h ../include/thr_alarm.h
+-opt_ft.o: opt_ft.cc mysql_priv.h ../include/global.h \
+-	../include/my_config.h ../mit-pthreads/include/bits/local_lim.h \
+-	../mit-pthreads/include/endian.h ../include/dbug.h \
+-	../include/my_sys.h ../include/my_pthread.h \
+-	../mit-pthreads/include/pthread/config.h \
+-	../mit-pthreads/include/sched.h ../include/m_ctype.h \
+-	../include/raid.h ../include/m_string.h \
+-	../include/mysql_version.h ../include/hash.h \
+-	../include/thr_lock.h ../include/my_list.h ../include/my_base.h \
+-	../include/my_bitmap.h ../include/violite.h ../include/my_net.h \
+-	../include/mysql_com.h unireg.h ../include/mysqld_error.h \
+-	structs.h sql_string.h sql_list.h sql_map.h handler.h table.h \
+-	field.h sql_udf.h item.h item_sum.h item_func.h \
+-	../include/ft_global.h item_cmpfunc.h ../regex/regex.h \
+-	item_strfunc.h sql_crypt.h item_timefunc.h item_uniq.h \
+-	../include/queues.h sql_class.h sql_lex.h lex_symbol.h \
+-	sql_yacc.h log_event.h opt_range.h sql_select.h procedure.h \
+-	../include/myisam.h opt_ft.h
+-opt_range.o: opt_range.cc mysql_priv.h ../include/global.h \
+-	../include/my_config.h ../mit-pthreads/include/bits/local_lim.h \
+-	../mit-pthreads/include/endian.h ../include/dbug.h \
+-	../include/my_sys.h ../include/my_pthread.h \
+-	../mit-pthreads/include/pthread/config.h \
+-	../mit-pthreads/include/sched.h ../include/m_ctype.h \
+-	../include/raid.h ../include/m_string.h \
+-	../include/mysql_version.h ../include/hash.h \
+-	../include/thr_lock.h ../include/my_list.h ../include/my_base.h \
+-	../include/my_bitmap.h ../include/violite.h ../include/my_net.h \
+-	../include/mysql_com.h unireg.h ../include/mysqld_error.h \
+-	structs.h sql_string.h sql_list.h sql_map.h handler.h table.h \
+-	field.h sql_udf.h item.h item_sum.h item_func.h \
+-	../include/ft_global.h item_cmpfunc.h ../regex/regex.h \
+-	item_strfunc.h sql_crypt.h item_timefunc.h item_uniq.h \
+-	../include/queues.h sql_class.h sql_lex.h lex_symbol.h \
+-	sql_yacc.h log_event.h opt_range.h ../include/nisam.h \
+-	sql_select.h procedure.h ../include/myisam.h
+-opt_sum.o: opt_sum.cc mysql_priv.h ../include/global.h \
+-	../include/my_config.h ../mit-pthreads/include/bits/local_lim.h \
+-	../mit-pthreads/include/endian.h ../include/dbug.h \
+-	../include/my_sys.h ../include/my_pthread.h \
+-	../mit-pthreads/include/pthread/config.h \
+-	../mit-pthreads/include/sched.h ../include/m_ctype.h \
+-	../include/raid.h ../include/m_string.h \
+-	../include/mysql_version.h ../include/hash.h \
+-	../include/thr_lock.h ../include/my_list.h ../include/my_base.h \
+-	../include/my_bitmap.h ../include/violite.h ../include/my_net.h \
+-	../include/mysql_com.h unireg.h ../include/mysqld_error.h \
+-	structs.h sql_string.h sql_list.h sql_map.h handler.h table.h \
+-	field.h sql_udf.h item.h item_sum.h item_func.h \
+-	../include/ft_global.h item_cmpfunc.h ../regex/regex.h \
+-	item_strfunc.h sql_crypt.h item_timefunc.h item_uniq.h \
+-	../include/queues.h sql_class.h sql_lex.h lex_symbol.h \
+-	sql_yacc.h log_event.h opt_range.h sql_select.h procedure.h \
+-	../include/myisam.h
+-password.o: password.c ../include/global.h ../include/my_config.h \
+-	../mit-pthreads/include/bits/local_lim.h \
+-	../mit-pthreads/include/endian.h ../include/dbug.h \
+-	../include/my_sys.h ../include/my_pthread.h \
+-	../mit-pthreads/include/pthread/config.h \
+-	../mit-pthreads/include/sched.h ../include/m_ctype.h \
+-	../include/raid.h ../include/m_string.h ../include/mysql.h \
+-	../include/mysql_com.h ../include/mysql_version.h
+-procedure.o: procedure.cc mysql_priv.h ../include/global.h \
+-	../include/my_config.h ../mit-pthreads/include/bits/local_lim.h \
+-	../mit-pthreads/include/endian.h ../include/dbug.h \
+-	../include/my_sys.h ../include/my_pthread.h \
+-	../mit-pthreads/include/pthread/config.h \
+-	../mit-pthreads/include/sched.h ../include/m_ctype.h \
+-	../include/raid.h ../include/m_string.h \
+-	../include/mysql_version.h ../include/hash.h \
+-	../include/thr_lock.h ../include/my_list.h ../include/my_base.h \
+-	../include/my_bitmap.h ../include/violite.h ../include/my_net.h \
+-	../include/mysql_com.h unireg.h ../include/mysqld_error.h \
+-	structs.h sql_string.h sql_list.h sql_map.h handler.h table.h \
+-	field.h sql_udf.h item.h item_sum.h item_func.h \
+-	../include/ft_global.h item_cmpfunc.h ../regex/regex.h \
+-	item_strfunc.h sql_crypt.h item_timefunc.h item_uniq.h \
+-	../include/queues.h sql_class.h sql_lex.h lex_symbol.h \
+-	sql_yacc.h log_event.h opt_range.h procedure.h sql_analyse.h \
+-	../include/my_tree.h
+-records.o: records.cc mysql_priv.h ../include/global.h \
+-	../include/my_config.h ../mit-pthreads/include/bits/local_lim.h \
+-	../mit-pthreads/include/endian.h ../include/dbug.h \
+-	../include/my_sys.h ../include/my_pthread.h \
+-	../mit-pthreads/include/pthread/config.h \
+-	../mit-pthreads/include/sched.h ../include/m_ctype.h \
+-	../include/raid.h ../include/m_string.h \
+-	../include/mysql_version.h ../include/hash.h \
+-	../include/thr_lock.h ../include/my_list.h ../include/my_base.h \
+-	../include/my_bitmap.h ../include/violite.h ../include/my_net.h \
+-	../include/mysql_com.h unireg.h ../include/mysqld_error.h \
+-	structs.h sql_string.h sql_list.h sql_map.h handler.h table.h \
+-	field.h sql_udf.h item.h item_sum.h item_func.h \
+-	../include/ft_global.h item_cmpfunc.h ../regex/regex.h \
+-	item_strfunc.h sql_crypt.h item_timefunc.h item_uniq.h \
+-	../include/queues.h sql_class.h sql_lex.h lex_symbol.h \
+-	sql_yacc.h log_event.h opt_range.h
+-slave.o: slave.cc mysql_priv.h ../include/global.h \
+-	../include/my_config.h ../mit-pthreads/include/bits/local_lim.h \
+-	../mit-pthreads/include/endian.h ../include/dbug.h \
+-	../include/my_sys.h ../include/my_pthread.h \
+-	../mit-pthreads/include/pthread/config.h \
+-	../mit-pthreads/include/sched.h ../include/m_ctype.h \
+-	../include/raid.h ../include/m_string.h \
+-	../include/mysql_version.h ../include/hash.h \
+-	../include/thr_lock.h ../include/my_list.h ../include/my_base.h \
+-	../include/my_bitmap.h ../include/violite.h ../include/my_net.h \
+-	../include/mysql_com.h unireg.h ../include/mysqld_error.h \
+-	structs.h sql_string.h sql_list.h sql_map.h handler.h table.h \
+-	field.h sql_udf.h item.h item_sum.h item_func.h \
+-	../include/ft_global.h item_cmpfunc.h ../regex/regex.h \
+-	item_strfunc.h sql_crypt.h item_timefunc.h item_uniq.h \
+-	../include/queues.h sql_class.h sql_lex.h lex_symbol.h \
+-	sql_yacc.h log_event.h opt_range.h ../include/mysql.h \
+-	../include/myisam.h mini_client.h slave.h \
+-	../include/thr_alarm.h ../include/my_dir.h
+-sql_acl.o: sql_acl.cc mysql_priv.h ../include/global.h \
+-	../include/my_config.h ../mit-pthreads/include/bits/local_lim.h \
+-	../mit-pthreads/include/endian.h ../include/dbug.h \
+-	../include/my_sys.h ../include/my_pthread.h \
+-	../mit-pthreads/include/pthread/config.h \
+-	../mit-pthreads/include/sched.h ../include/m_ctype.h \
+-	../include/raid.h ../include/m_string.h \
+-	../include/mysql_version.h ../include/hash.h \
+-	../include/thr_lock.h ../include/my_list.h ../include/my_base.h \
+-	../include/my_bitmap.h ../include/violite.h ../include/my_net.h \
+-	../include/mysql_com.h unireg.h ../include/mysqld_error.h \
+-	structs.h sql_string.h sql_list.h sql_map.h handler.h table.h \
+-	field.h sql_udf.h item.h item_sum.h item_func.h \
+-	../include/ft_global.h item_cmpfunc.h ../regex/regex.h \
+-	item_strfunc.h sql_crypt.h item_timefunc.h item_uniq.h \
+-	../include/queues.h sql_class.h sql_lex.h lex_symbol.h \
+-	sql_yacc.h log_event.h opt_range.h sql_acl.h hash_filo.h
+-sql_analyse.o: sql_analyse.cc mysql_priv.h ../include/global.h \
+-	../include/my_config.h ../mit-pthreads/include/bits/local_lim.h \
+-	../mit-pthreads/include/endian.h ../include/dbug.h \
+-	../include/my_sys.h ../include/my_pthread.h \
+-	../mit-pthreads/include/pthread/config.h \
+-	../mit-pthreads/include/sched.h ../include/m_ctype.h \
+-	../include/raid.h ../include/m_string.h \
+-	../include/mysql_version.h ../include/hash.h \
+-	../include/thr_lock.h ../include/my_list.h ../include/my_base.h \
+-	../include/my_bitmap.h ../include/violite.h ../include/my_net.h \
+-	../include/mysql_com.h unireg.h ../include/mysqld_error.h \
+-	structs.h sql_string.h sql_list.h sql_map.h handler.h table.h \
+-	field.h sql_udf.h item.h item_sum.h item_func.h \
+-	../include/ft_global.h item_cmpfunc.h ../regex/regex.h \
+-	item_strfunc.h sql_crypt.h item_timefunc.h item_uniq.h \
+-	../include/queues.h sql_class.h sql_lex.h lex_symbol.h \
+-	sql_yacc.h log_event.h opt_range.h procedure.h sql_analyse.h \
+-	../include/my_tree.h
+-sql_base.o: sql_base.cc mysql_priv.h ../include/global.h \
+-	../include/my_config.h ../mit-pthreads/include/bits/local_lim.h \
+-	../mit-pthreads/include/endian.h ../include/dbug.h \
+-	../include/my_sys.h ../include/my_pthread.h \
+-	../mit-pthreads/include/pthread/config.h \
+-	../mit-pthreads/include/sched.h ../include/m_ctype.h \
+-	../include/raid.h ../include/m_string.h \
+-	../include/mysql_version.h ../include/hash.h \
+-	../include/thr_lock.h ../include/my_list.h ../include/my_base.h \
+-	../include/my_bitmap.h ../include/violite.h ../include/my_net.h \
+-	../include/mysql_com.h unireg.h ../include/mysqld_error.h \
+-	structs.h sql_string.h sql_list.h sql_map.h handler.h table.h \
+-	field.h sql_udf.h item.h item_sum.h item_func.h \
+-	../include/ft_global.h item_cmpfunc.h ../regex/regex.h \
+-	item_strfunc.h sql_crypt.h item_timefunc.h item_uniq.h \
+-	../include/queues.h sql_class.h sql_lex.h lex_symbol.h \
+-	sql_yacc.h log_event.h opt_range.h sql_acl.h \
+-	../include/thr_alarm.h ../include/my_dir.h ../include/nisam.h
+-sql_cache.o: sql_cache.cc mysql_priv.h ../include/global.h \
+-	../include/my_config.h ../mit-pthreads/include/bits/local_lim.h \
+-	../mit-pthreads/include/endian.h ../include/dbug.h \
+-	../include/my_sys.h ../include/my_pthread.h \
+-	../mit-pthreads/include/pthread/config.h \
+-	../mit-pthreads/include/sched.h ../include/m_ctype.h \
+-	../include/raid.h ../include/m_string.h \
+-	../include/mysql_version.h ../include/hash.h \
+-	../include/thr_lock.h ../include/my_list.h ../include/my_base.h \
+-	../include/my_bitmap.h ../include/violite.h ../include/my_net.h \
+-	../include/mysql_com.h unireg.h ../include/mysqld_error.h \
+-	structs.h sql_string.h sql_list.h sql_map.h handler.h table.h \
+-	field.h sql_udf.h item.h item_sum.h item_func.h \
+-	../include/ft_global.h item_cmpfunc.h ../regex/regex.h \
+-	item_strfunc.h sql_crypt.h item_timefunc.h item_uniq.h \
+-	../include/queues.h sql_class.h sql_lex.h lex_symbol.h \
+-	sql_yacc.h log_event.h opt_range.h ../include/my_dir.h
+-sql_class.o: sql_class.cc mysql_priv.h ../include/global.h \
+-	../include/my_config.h ../mit-pthreads/include/bits/local_lim.h \
+-	../mit-pthreads/include/endian.h ../include/dbug.h \
+-	../include/my_sys.h ../include/my_pthread.h \
+-	../mit-pthreads/include/pthread/config.h \
+-	../mit-pthreads/include/sched.h ../include/m_ctype.h \
+-	../include/raid.h ../include/m_string.h \
+-	../include/mysql_version.h ../include/hash.h \
+-	../include/thr_lock.h ../include/my_list.h ../include/my_base.h \
+-	../include/my_bitmap.h ../include/violite.h ../include/my_net.h \
+-	../include/mysql_com.h unireg.h ../include/mysqld_error.h \
+-	structs.h sql_string.h sql_list.h sql_map.h handler.h table.h \
+-	field.h sql_udf.h item.h item_sum.h item_func.h \
+-	../include/ft_global.h item_cmpfunc.h ../regex/regex.h \
+-	item_strfunc.h sql_crypt.h item_timefunc.h item_uniq.h \
+-	../include/queues.h sql_class.h sql_lex.h lex_symbol.h \
+-	sql_yacc.h log_event.h opt_range.h sql_acl.h \
+-	../include/thr_alarm.h
+-sql_crypt.o: sql_crypt.cc mysql_priv.h ../include/global.h \
+-	../include/my_config.h ../mit-pthreads/include/bits/local_lim.h \
+-	../mit-pthreads/include/endian.h ../include/dbug.h \
+-	../include/my_sys.h ../include/my_pthread.h \
+-	../mit-pthreads/include/pthread/config.h \
+-	../mit-pthreads/include/sched.h ../include/m_ctype.h \
+-	../include/raid.h ../include/m_string.h \
+-	../include/mysql_version.h ../include/hash.h \
+-	../include/thr_lock.h ../include/my_list.h ../include/my_base.h \
+-	../include/my_bitmap.h ../include/violite.h ../include/my_net.h \
+-	../include/mysql_com.h unireg.h ../include/mysqld_error.h \
+-	structs.h sql_string.h sql_list.h sql_map.h handler.h table.h \
+-	field.h sql_udf.h item.h item_sum.h item_func.h \
+-	../include/ft_global.h item_cmpfunc.h ../regex/regex.h \
+-	item_strfunc.h sql_crypt.h item_timefunc.h item_uniq.h \
+-	../include/queues.h sql_class.h sql_lex.h lex_symbol.h \
+-	sql_yacc.h log_event.h opt_range.h
+-sql_db.o: sql_db.cc mysql_priv.h ../include/global.h \
+-	../include/my_config.h ../mit-pthreads/include/bits/local_lim.h \
+-	../mit-pthreads/include/endian.h ../include/dbug.h \
+-	../include/my_sys.h ../include/my_pthread.h \
+-	../mit-pthreads/include/pthread/config.h \
+-	../mit-pthreads/include/sched.h ../include/m_ctype.h \
+-	../include/raid.h ../include/m_string.h \
+-	../include/mysql_version.h ../include/hash.h \
+-	../include/thr_lock.h ../include/my_list.h ../include/my_base.h \
+-	../include/my_bitmap.h ../include/violite.h ../include/my_net.h \
+-	../include/mysql_com.h unireg.h ../include/mysqld_error.h \
+-	structs.h sql_string.h sql_list.h sql_map.h handler.h table.h \
+-	field.h sql_udf.h item.h item_sum.h item_func.h \
+-	../include/ft_global.h item_cmpfunc.h ../regex/regex.h \
+-	item_strfunc.h sql_crypt.h item_timefunc.h item_uniq.h \
+-	../include/queues.h sql_class.h sql_lex.h lex_symbol.h \
+-	sql_yacc.h log_event.h opt_range.h sql_acl.h \
+-	../include/my_dir.h
+-sql_delete.o: sql_delete.cc mysql_priv.h ../include/global.h \
+-	../include/my_config.h ../mit-pthreads/include/bits/local_lim.h \
+-	../mit-pthreads/include/endian.h ../include/dbug.h \
+-	../include/my_sys.h ../include/my_pthread.h \
+-	../mit-pthreads/include/pthread/config.h \
+-	../mit-pthreads/include/sched.h ../include/m_ctype.h \
+-	../include/raid.h ../include/m_string.h \
+-	../include/mysql_version.h ../include/hash.h \
+-	../include/thr_lock.h ../include/my_list.h ../include/my_base.h \
+-	../include/my_bitmap.h ../include/violite.h ../include/my_net.h \
+-	../include/mysql_com.h unireg.h ../include/mysqld_error.h \
+-	structs.h sql_string.h sql_list.h sql_map.h handler.h table.h \
+-	field.h sql_udf.h item.h item_sum.h item_func.h \
+-	../include/ft_global.h item_cmpfunc.h ../regex/regex.h \
+-	item_strfunc.h sql_crypt.h item_timefunc.h item_uniq.h \
+-	../include/queues.h sql_class.h sql_lex.h lex_symbol.h \
+-	sql_yacc.h log_event.h opt_range.h ha_innobase.h
+-sql_insert.o: sql_insert.cc mysql_priv.h ../include/global.h \
+-	../include/my_config.h ../mit-pthreads/include/bits/local_lim.h \
+-	../mit-pthreads/include/endian.h ../include/dbug.h \
+-	../include/my_sys.h ../include/my_pthread.h \
+-	../mit-pthreads/include/pthread/config.h \
+-	../mit-pthreads/include/sched.h ../include/m_ctype.h \
+-	../include/raid.h ../include/m_string.h \
+-	../include/mysql_version.h ../include/hash.h \
+-	../include/thr_lock.h ../include/my_list.h ../include/my_base.h \
+-	../include/my_bitmap.h ../include/violite.h ../include/my_net.h \
+-	../include/mysql_com.h unireg.h ../include/mysqld_error.h \
+-	structs.h sql_string.h sql_list.h sql_map.h handler.h table.h \
+-	field.h sql_udf.h item.h item_sum.h item_func.h \
+-	../include/ft_global.h item_cmpfunc.h ../regex/regex.h \
+-	item_strfunc.h sql_crypt.h item_timefunc.h item_uniq.h \
+-	../include/queues.h sql_class.h sql_lex.h lex_symbol.h \
+-	sql_yacc.h log_event.h opt_range.h sql_acl.h
+-sql_lex.o: sql_lex.cc mysql_priv.h ../include/global.h \
+-	../include/my_config.h ../mit-pthreads/include/bits/local_lim.h \
+-	../mit-pthreads/include/endian.h ../include/dbug.h \
+-	../include/my_sys.h ../include/my_pthread.h \
+-	../mit-pthreads/include/pthread/config.h \
+-	../mit-pthreads/include/sched.h ../include/m_ctype.h \
+-	../include/raid.h ../include/m_string.h \
+-	../include/mysql_version.h ../include/hash.h \
+-	../include/thr_lock.h ../include/my_list.h ../include/my_base.h \
+-	../include/my_bitmap.h ../include/violite.h ../include/my_net.h \
+-	../include/mysql_com.h unireg.h ../include/mysqld_error.h \
+-	structs.h sql_string.h sql_list.h sql_map.h handler.h table.h \
+-	field.h sql_udf.h item.h item_sum.h item_func.h \
+-	../include/ft_global.h item_cmpfunc.h ../regex/regex.h \
+-	item_strfunc.h sql_crypt.h item_timefunc.h item_uniq.h \
+-	../include/queues.h sql_class.h sql_lex.h lex_symbol.h \
+-	sql_yacc.h log_event.h opt_range.h item_create.h lex_hash.h
+-sql_list.o: sql_list.cc mysql_priv.h ../include/global.h \
+-	../include/my_config.h ../mit-pthreads/include/bits/local_lim.h \
+-	../mit-pthreads/include/endian.h ../include/dbug.h \
+-	../include/my_sys.h ../include/my_pthread.h \
+-	../mit-pthreads/include/pthread/config.h \
+-	../mit-pthreads/include/sched.h ../include/m_ctype.h \
+-	../include/raid.h ../include/m_string.h \
+-	../include/mysql_version.h ../include/hash.h \
+-	../include/thr_lock.h ../include/my_list.h ../include/my_base.h \
+-	../include/my_bitmap.h ../include/violite.h ../include/my_net.h \
+-	../include/mysql_com.h unireg.h ../include/mysqld_error.h \
+-	structs.h sql_string.h sql_list.h sql_map.h handler.h table.h \
+-	field.h sql_udf.h item.h item_sum.h item_func.h \
+-	../include/ft_global.h item_cmpfunc.h ../regex/regex.h \
+-	item_strfunc.h sql_crypt.h item_timefunc.h item_uniq.h \
+-	../include/queues.h sql_class.h sql_lex.h lex_symbol.h \
+-	sql_yacc.h log_event.h opt_range.h
+-sql_load.o: sql_load.cc mysql_priv.h ../include/global.h \
+-	../include/my_config.h ../mit-pthreads/include/bits/local_lim.h \
+-	../mit-pthreads/include/endian.h ../include/dbug.h \
+-	../include/my_sys.h ../include/my_pthread.h \
+-	../mit-pthreads/include/pthread/config.h \
+-	../mit-pthreads/include/sched.h ../include/m_ctype.h \
+-	../include/raid.h ../include/m_string.h \
+-	../include/mysql_version.h ../include/hash.h \
+-	../include/thr_lock.h ../include/my_list.h ../include/my_base.h \
+-	../include/my_bitmap.h ../include/violite.h ../include/my_net.h \
+-	../include/mysql_com.h unireg.h ../include/mysqld_error.h \
+-	structs.h sql_string.h sql_list.h sql_map.h handler.h table.h \
+-	field.h sql_udf.h item.h item_sum.h item_func.h \
+-	../include/ft_global.h item_cmpfunc.h ../regex/regex.h \
+-	item_strfunc.h sql_crypt.h item_timefunc.h item_uniq.h \
+-	../include/queues.h sql_class.h sql_lex.h lex_symbol.h \
+-	sql_yacc.h log_event.h opt_range.h ../include/my_dir.h
+-sql_manager.o: sql_manager.cc mysql_priv.h ../include/global.h \
+-	../include/my_config.h ../mit-pthreads/include/bits/local_lim.h \
+-	../mit-pthreads/include/endian.h ../include/dbug.h \
+-	../include/my_sys.h ../include/my_pthread.h \
+-	../mit-pthreads/include/pthread/config.h \
+-	../mit-pthreads/include/sched.h ../include/m_ctype.h \
+-	../include/raid.h ../include/m_string.h \
+-	../include/mysql_version.h ../include/hash.h \
+-	../include/thr_lock.h ../include/my_list.h ../include/my_base.h \
+-	../include/my_bitmap.h ../include/violite.h ../include/my_net.h \
+-	../include/mysql_com.h unireg.h ../include/mysqld_error.h \
+-	structs.h sql_string.h sql_list.h sql_map.h handler.h table.h \
+-	field.h sql_udf.h item.h item_sum.h item_func.h \
+-	../include/ft_global.h item_cmpfunc.h ../regex/regex.h \
+-	item_strfunc.h sql_crypt.h item_timefunc.h item_uniq.h \
+-	../include/queues.h sql_class.h sql_lex.h lex_symbol.h \
+-	sql_yacc.h log_event.h opt_range.h sql_manager.h
+-sql_map.o: sql_map.cc mysql_priv.h ../include/global.h \
+-	../include/my_config.h ../mit-pthreads/include/bits/local_lim.h \
+-	../mit-pthreads/include/endian.h ../include/dbug.h \
+-	../include/my_sys.h ../include/my_pthread.h \
+-	../mit-pthreads/include/pthread/config.h \
+-	../mit-pthreads/include/sched.h ../include/m_ctype.h \
+-	../include/raid.h ../include/m_string.h \
+-	../include/mysql_version.h ../include/hash.h \
+-	../include/thr_lock.h ../include/my_list.h ../include/my_base.h \
+-	../include/my_bitmap.h ../include/violite.h ../include/my_net.h \
+-	../include/mysql_com.h unireg.h ../include/mysqld_error.h \
+-	structs.h sql_string.h sql_list.h sql_map.h handler.h table.h \
+-	field.h sql_udf.h item.h item_sum.h item_func.h \
+-	../include/ft_global.h item_cmpfunc.h ../regex/regex.h \
+-	item_strfunc.h sql_crypt.h item_timefunc.h item_uniq.h \
+-	../include/queues.h sql_class.h sql_lex.h lex_symbol.h \
+-	sql_yacc.h log_event.h opt_range.h
+-sql_parse.o: sql_parse.cc mysql_priv.h ../include/global.h \
+-	../include/my_config.h ../mit-pthreads/include/bits/local_lim.h \
+-	../mit-pthreads/include/endian.h ../include/dbug.h \
+-	../include/my_sys.h ../include/my_pthread.h \
+-	../mit-pthreads/include/pthread/config.h \
+-	../mit-pthreads/include/sched.h ../include/m_ctype.h \
+-	../include/raid.h ../include/m_string.h \
+-	../include/mysql_version.h ../include/hash.h \
+-	../include/thr_lock.h ../include/my_list.h ../include/my_base.h \
+-	../include/my_bitmap.h ../include/violite.h ../include/my_net.h \
+-	../include/mysql_com.h unireg.h ../include/mysqld_error.h \
+-	structs.h sql_string.h sql_list.h sql_map.h handler.h table.h \
+-	field.h sql_udf.h item.h item_sum.h item_func.h \
+-	../include/ft_global.h item_cmpfunc.h ../regex/regex.h \
+-	item_strfunc.h sql_crypt.h item_timefunc.h item_uniq.h \
+-	../include/queues.h sql_class.h sql_lex.h lex_symbol.h \
+-	sql_yacc.h log_event.h opt_range.h sql_acl.h sql_repl.h slave.h \
+-	../include/thr_alarm.h ../include/myisam.h ../include/my_dir.h
+-sql_rename.o: sql_rename.cc mysql_priv.h ../include/global.h \
+-	../include/my_config.h ../mit-pthreads/include/bits/local_lim.h \
+-	../mit-pthreads/include/endian.h ../include/dbug.h \
+-	../include/my_sys.h ../include/my_pthread.h \
+-	../mit-pthreads/include/pthread/config.h \
+-	../mit-pthreads/include/sched.h ../include/m_ctype.h \
+-	../include/raid.h ../include/m_string.h \
+-	../include/mysql_version.h ../include/hash.h \
+-	../include/thr_lock.h ../include/my_list.h ../include/my_base.h \
+-	../include/my_bitmap.h ../include/violite.h ../include/my_net.h \
+-	../include/mysql_com.h unireg.h ../include/mysqld_error.h \
+-	structs.h sql_string.h sql_list.h sql_map.h handler.h table.h \
+-	field.h sql_udf.h item.h item_sum.h item_func.h \
+-	../include/ft_global.h item_cmpfunc.h ../regex/regex.h \
+-	item_strfunc.h sql_crypt.h item_timefunc.h item_uniq.h \
+-	../include/queues.h sql_class.h sql_lex.h lex_symbol.h \
+-	sql_yacc.h log_event.h opt_range.h
+-sql_repl.o: sql_repl.cc mysql_priv.h ../include/global.h \
+-	../include/my_config.h ../mit-pthreads/include/bits/local_lim.h \
+-	../mit-pthreads/include/endian.h ../include/dbug.h \
+-	../include/my_sys.h ../include/my_pthread.h \
+-	../mit-pthreads/include/pthread/config.h \
+-	../mit-pthreads/include/sched.h ../include/m_ctype.h \
+-	../include/raid.h ../include/m_string.h \
+-	../include/mysql_version.h ../include/hash.h \
+-	../include/thr_lock.h ../include/my_list.h ../include/my_base.h \
+-	../include/my_bitmap.h ../include/violite.h ../include/my_net.h \
+-	../include/mysql_com.h unireg.h ../include/mysqld_error.h \
+-	structs.h sql_string.h sql_list.h sql_map.h handler.h table.h \
+-	field.h sql_udf.h item.h item_sum.h item_func.h \
+-	../include/ft_global.h item_cmpfunc.h ../regex/regex.h \
+-	item_strfunc.h sql_crypt.h item_timefunc.h item_uniq.h \
+-	../include/queues.h sql_class.h sql_lex.h lex_symbol.h \
+-	sql_yacc.h log_event.h opt_range.h sql_repl.h slave.h sql_acl.h \
+-	../include/thr_alarm.h ../include/my_dir.h
+-sql_select.o: sql_select.cc mysql_priv.h ../include/global.h \
+-	../include/my_config.h ../mit-pthreads/include/bits/local_lim.h \
+-	../mit-pthreads/include/endian.h ../include/dbug.h \
+-	../include/my_sys.h ../include/my_pthread.h \
+-	../mit-pthreads/include/pthread/config.h \
+-	../mit-pthreads/include/sched.h ../include/m_ctype.h \
+-	../include/raid.h ../include/m_string.h \
+-	../include/mysql_version.h ../include/hash.h \
+-	../include/thr_lock.h ../include/my_list.h ../include/my_base.h \
+-	../include/my_bitmap.h ../include/violite.h ../include/my_net.h \
+-	../include/mysql_com.h unireg.h ../include/mysqld_error.h \
+-	structs.h sql_string.h sql_list.h sql_map.h handler.h table.h \
+-	field.h sql_udf.h item.h item_sum.h item_func.h \
+-	../include/ft_global.h item_cmpfunc.h ../regex/regex.h \
+-	item_strfunc.h sql_crypt.h item_timefunc.h item_uniq.h \
+-	../include/queues.h sql_class.h sql_lex.h lex_symbol.h \
+-	sql_yacc.h log_event.h opt_range.h sql_select.h procedure.h \
+-	../include/myisam.h opt_ft.h
+-sql_show.o: sql_show.cc mysql_priv.h ../include/global.h \
+-	../include/my_config.h ../mit-pthreads/include/bits/local_lim.h \
+-	../mit-pthreads/include/endian.h ../include/dbug.h \
+-	../include/my_sys.h ../include/my_pthread.h \
+-	../mit-pthreads/include/pthread/config.h \
+-	../mit-pthreads/include/sched.h ../include/m_ctype.h \
+-	../include/raid.h ../include/m_string.h \
+-	../include/mysql_version.h ../include/hash.h \
+-	../include/thr_lock.h ../include/my_list.h ../include/my_base.h \
+-	../include/my_bitmap.h ../include/violite.h ../include/my_net.h \
+-	../include/mysql_com.h unireg.h ../include/mysqld_error.h \
+-	structs.h sql_string.h sql_list.h sql_map.h handler.h table.h \
+-	field.h sql_udf.h item.h item_sum.h item_func.h \
+-	../include/ft_global.h item_cmpfunc.h ../regex/regex.h \
+-	item_strfunc.h sql_crypt.h item_timefunc.h item_uniq.h \
+-	../include/queues.h sql_class.h sql_lex.h lex_symbol.h \
+-	sql_yacc.h log_event.h opt_range.h sql_select.h procedure.h \
+-	../include/myisam.h sql_acl.h ../include/my_dir.h ha_berkeley.h \
+-	../bdb/build_unix/db.h
+-sql_string.o: sql_string.cc ../include/global.h ../include/my_config.h \
+-	../mit-pthreads/include/bits/local_lim.h \
+-	../mit-pthreads/include/endian.h ../include/dbug.h \
+-	../include/my_sys.h ../include/my_pthread.h \
+-	../mit-pthreads/include/pthread/config.h \
+-	../mit-pthreads/include/sched.h ../include/m_ctype.h \
+-	../include/raid.h ../include/m_string.h sql_string.h
+-sql_table.o: sql_table.cc mysql_priv.h ../include/global.h \
+-	../include/my_config.h ../mit-pthreads/include/bits/local_lim.h \
+-	../mit-pthreads/include/endian.h ../include/dbug.h \
+-	../include/my_sys.h ../include/my_pthread.h \
+-	../mit-pthreads/include/pthread/config.h \
+-	../mit-pthreads/include/sched.h ../include/m_ctype.h \
+-	../include/raid.h ../include/m_string.h \
+-	../include/mysql_version.h ../include/hash.h \
+-	../include/thr_lock.h ../include/my_list.h ../include/my_base.h \
+-	../include/my_bitmap.h ../include/violite.h ../include/my_net.h \
+-	../include/mysql_com.h unireg.h ../include/mysqld_error.h \
+-	structs.h sql_string.h sql_list.h sql_map.h handler.h table.h \
+-	field.h sql_udf.h item.h item_sum.h item_func.h \
+-	../include/ft_global.h item_cmpfunc.h ../regex/regex.h \
+-	item_strfunc.h sql_crypt.h item_timefunc.h item_uniq.h \
+-	../include/queues.h sql_class.h sql_lex.h lex_symbol.h \
+-	sql_yacc.h log_event.h opt_range.h ../include/myisam.h
+-sql_test.o: sql_test.cc mysql_priv.h ../include/global.h \
+-	../include/my_config.h ../mit-pthreads/include/bits/local_lim.h \
+-	../mit-pthreads/include/endian.h ../include/dbug.h \
+-	../include/my_sys.h ../include/my_pthread.h \
+-	../mit-pthreads/include/pthread/config.h \
+-	../mit-pthreads/include/sched.h ../include/m_ctype.h \
+-	../include/raid.h ../include/m_string.h \
+-	../include/mysql_version.h ../include/hash.h \
+-	../include/thr_lock.h ../include/my_list.h ../include/my_base.h \
+-	../include/my_bitmap.h ../include/violite.h ../include/my_net.h \
+-	../include/mysql_com.h unireg.h ../include/mysqld_error.h \
+-	structs.h sql_string.h sql_list.h sql_map.h handler.h table.h \
+-	field.h sql_udf.h item.h item_sum.h item_func.h \
+-	../include/ft_global.h item_cmpfunc.h ../regex/regex.h \
+-	item_strfunc.h sql_crypt.h item_timefunc.h item_uniq.h \
+-	../include/queues.h sql_class.h sql_lex.h lex_symbol.h \
+-	sql_yacc.h log_event.h opt_range.h sql_select.h procedure.h \
+-	../include/myisam.h
+-sql_udf.o: sql_udf.cc mysql_priv.h ../include/global.h \
+-	../include/my_config.h ../mit-pthreads/include/bits/local_lim.h \
+-	../mit-pthreads/include/endian.h ../include/dbug.h \
+-	../include/my_sys.h ../include/my_pthread.h \
+-	../mit-pthreads/include/pthread/config.h \
+-	../mit-pthreads/include/sched.h ../include/m_ctype.h \
+-	../include/raid.h ../include/m_string.h \
+-	../include/mysql_version.h ../include/hash.h \
+-	../include/thr_lock.h ../include/my_list.h ../include/my_base.h \
+-	../include/my_bitmap.h ../include/violite.h ../include/my_net.h \
+-	../include/mysql_com.h unireg.h ../include/mysqld_error.h \
+-	structs.h sql_string.h sql_list.h sql_map.h handler.h table.h \
+-	field.h sql_udf.h item.h item_sum.h item_func.h \
+-	../include/ft_global.h item_cmpfunc.h ../regex/regex.h \
+-	item_strfunc.h sql_crypt.h item_timefunc.h item_uniq.h \
+-	../include/queues.h sql_class.h sql_lex.h lex_symbol.h \
+-	sql_yacc.h log_event.h opt_range.h
+-sql_update.o: sql_update.cc mysql_priv.h ../include/global.h \
+-	../include/my_config.h ../mit-pthreads/include/bits/local_lim.h \
+-	../mit-pthreads/include/endian.h ../include/dbug.h \
+-	../include/my_sys.h ../include/my_pthread.h \
+-	../mit-pthreads/include/pthread/config.h \
+-	../mit-pthreads/include/sched.h ../include/m_ctype.h \
+-	../include/raid.h ../include/m_string.h \
+-	../include/mysql_version.h ../include/hash.h \
+-	../include/thr_lock.h ../include/my_list.h ../include/my_base.h \
+-	../include/my_bitmap.h ../include/violite.h ../include/my_net.h \
+-	../include/mysql_com.h unireg.h ../include/mysqld_error.h \
+-	structs.h sql_string.h sql_list.h sql_map.h handler.h table.h \
+-	field.h sql_udf.h item.h item_sum.h item_func.h \
+-	../include/ft_global.h item_cmpfunc.h ../regex/regex.h \
+-	item_strfunc.h sql_crypt.h item_timefunc.h item_uniq.h \
+-	../include/queues.h sql_class.h sql_lex.h lex_symbol.h \
+-	sql_yacc.h log_event.h opt_range.h sql_acl.h
+-table.o: table.cc mysql_priv.h ../include/global.h \
+-	../include/my_config.h ../mit-pthreads/include/bits/local_lim.h \
+-	../mit-pthreads/include/endian.h ../include/dbug.h \
+-	../include/my_sys.h ../include/my_pthread.h \
+-	../mit-pthreads/include/pthread/config.h \
+-	../mit-pthreads/include/sched.h ../include/m_ctype.h \
+-	../include/raid.h ../include/m_string.h \
+-	../include/mysql_version.h ../include/hash.h \
+-	../include/thr_lock.h ../include/my_list.h ../include/my_base.h \
+-	../include/my_bitmap.h ../include/violite.h ../include/my_net.h \
+-	../include/mysql_com.h unireg.h ../include/mysqld_error.h \
+-	structs.h sql_string.h sql_list.h sql_map.h handler.h table.h \
+-	field.h sql_udf.h item.h item_sum.h item_func.h \
+-	../include/ft_global.h item_cmpfunc.h ../regex/regex.h \
+-	item_strfunc.h sql_crypt.h item_timefunc.h item_uniq.h \
+-	../include/queues.h sql_class.h sql_lex.h lex_symbol.h \
+-	sql_yacc.h log_event.h opt_range.h
+-thr_malloc.o: thr_malloc.cc mysql_priv.h ../include/global.h \
+-	../include/my_config.h ../mit-pthreads/include/bits/local_lim.h \
+-	../mit-pthreads/include/endian.h ../include/dbug.h \
+-	../include/my_sys.h ../include/my_pthread.h \
+-	../mit-pthreads/include/pthread/config.h \
+-	../mit-pthreads/include/sched.h ../include/m_ctype.h \
+-	../include/raid.h ../include/m_string.h \
+-	../include/mysql_version.h ../include/hash.h \
+-	../include/thr_lock.h ../include/my_list.h ../include/my_base.h \
+-	../include/my_bitmap.h ../include/violite.h ../include/my_net.h \
+-	../include/mysql_com.h unireg.h ../include/mysqld_error.h \
+-	structs.h sql_string.h sql_list.h sql_map.h handler.h table.h \
+-	field.h sql_udf.h item.h item_sum.h item_func.h \
+-	../include/ft_global.h item_cmpfunc.h ../regex/regex.h \
+-	item_strfunc.h sql_crypt.h item_timefunc.h item_uniq.h \
+-	../include/queues.h sql_class.h sql_lex.h lex_symbol.h \
+-	sql_yacc.h log_event.h opt_range.h
+-time.o: time.cc mysql_priv.h ../include/global.h ../include/my_config.h \
+-	../mit-pthreads/include/bits/local_lim.h \
+-	../mit-pthreads/include/endian.h ../include/dbug.h \
+-	../include/my_sys.h ../include/my_pthread.h \
+-	../mit-pthreads/include/pthread/config.h \
+-	../mit-pthreads/include/sched.h ../include/m_ctype.h \
+-	../include/raid.h ../include/m_string.h \
+-	../include/mysql_version.h ../include/hash.h \
+-	../include/thr_lock.h ../include/my_list.h ../include/my_base.h \
+-	../include/my_bitmap.h ../include/violite.h ../include/my_net.h \
+-	../include/mysql_com.h unireg.h ../include/mysqld_error.h \
+-	structs.h sql_string.h sql_list.h sql_map.h handler.h table.h \
+-	field.h sql_udf.h item.h item_sum.h item_func.h \
+-	../include/ft_global.h item_cmpfunc.h ../regex/regex.h \
+-	item_strfunc.h sql_crypt.h item_timefunc.h item_uniq.h \
+-	../include/queues.h sql_class.h sql_lex.h lex_symbol.h \
+-	sql_yacc.h log_event.h opt_range.h
+-unireg.o: unireg.cc mysql_priv.h ../include/global.h \
+-	../include/my_config.h ../mit-pthreads/include/bits/local_lim.h \
+-	../mit-pthreads/include/endian.h ../include/dbug.h \
+-	../include/my_sys.h ../include/my_pthread.h \
+-	../mit-pthreads/include/pthread/config.h \
+-	../mit-pthreads/include/sched.h ../include/m_ctype.h \
+-	../include/raid.h ../include/m_string.h \
+-	../include/mysql_version.h ../include/hash.h \
+-	../include/thr_lock.h ../include/my_list.h ../include/my_base.h \
+-	../include/my_bitmap.h ../include/violite.h ../include/my_net.h \
+-	../include/mysql_com.h unireg.h ../include/mysqld_error.h \
+-	structs.h sql_string.h sql_list.h sql_map.h handler.h table.h \
+-	field.h sql_udf.h item.h item_sum.h item_func.h \
+-	../include/ft_global.h item_cmpfunc.h ../regex/regex.h \
+-	item_strfunc.h sql_crypt.h item_timefunc.h item_uniq.h \
+-	../include/queues.h sql_class.h sql_lex.h lex_symbol.h \
+-	sql_yacc.h log_event.h opt_range.h
+-violite.o: violite.c ../include/global.h ../include/my_config.h \
+-	../mit-pthreads/include/bits/local_lim.h \
+-	../mit-pthreads/include/endian.h ../include/dbug.h \
+-	../include/violite.h ../include/my_net.h ../include/my_sys.h \
+-	../include/my_pthread.h \
+-	../mit-pthreads/include/pthread/config.h \
+-	../mit-pthreads/include/sched.h ../include/m_ctype.h \
+-	../include/raid.h ../include/m_string.h
+ 
++DEPS_MAGIC := $(shell mkdir .deps > /dev/null 2>&1 || :)
++
++-include $(DEP_FILES)
++
++mostlyclean-depend:
++
++clean-depend:
++
++distclean-depend:
++	-rm -rf .deps
++
++maintainer-clean-depend:
++
++%.o: %.c
++	@echo '$(COMPILE) -c $<'; \
++	$(COMPILE) -Wp,-MD,.deps/$(*F).pp -c $<
++	@-cp .deps/$(*F).pp .deps/$(*F).P; \
++	tr ' ' '\012' < .deps/$(*F).pp \
++	  | sed -e 's/^\\$$//' -e '/^$$/ d' -e '/:$$/ d' -e 's/$$/ :/' \
++	    >> .deps/$(*F).P; \
++	rm .deps/$(*F).pp
++
++%.lo: %.c
++	@echo '$(LTCOMPILE) -c $<'; \
++	$(LTCOMPILE) -Wp,-MD,.deps/$(*F).pp -c $<
++	@-sed -e 's/^\([^:]*\)\.o[ 	]*:/\1.lo \1.o :/' \
++	  < .deps/$(*F).pp > .deps/$(*F).P; \
++	tr ' ' '\012' < .deps/$(*F).pp \
++	  | sed -e 's/^\\$$//' -e '/^$$/ d' -e '/:$$/ d' -e 's/$$/ :/' \
++	    >> .deps/$(*F).P; \
++	rm -f .deps/$(*F).pp
++
++%.o: %.cc
++	@echo '$(CXXCOMPILE) -c $<'; \
++	$(CXXCOMPILE) -Wp,-MD,.deps/$(*F).pp -c $<
++	@-cp .deps/$(*F).pp .deps/$(*F).P; \
++	tr ' ' '\012' < .deps/$(*F).pp \
++	  | sed -e 's/^\\$$//' -e '/^$$/ d' -e '/:$$/ d' -e 's/$$/ :/' \
++	    >> .deps/$(*F).P; \
++	rm .deps/$(*F).pp
++
++%.lo: %.cc
++	@echo '$(LTCXXCOMPILE) -c $<'; \
++	$(LTCXXCOMPILE) -Wp,-MD,.deps/$(*F).pp -c $<
++	@-sed -e 's/^\([^:]*\)\.o[ 	]*:/\1.lo \1.o :/' \
++	  < .deps/$(*F).pp > .deps/$(*F).P; \
++	tr ' ' '\012' < .deps/$(*F).pp \
++	  | sed -e 's/^\\$$//' -e '/^$$/ d' -e '/:$$/ d' -e 's/$$/ :/' \
++	    >> .deps/$(*F).P; \
++	rm -f .deps/$(*F).pp
+ info-am:
+ info: info-recursive
+ dvi-am:
+@@ -1821,21 +622,21 @@
+ 	-test -z "sql_yacchhsql_yacccc$(BUILT_SOURCES)" || rm -f sql_yacchh sql_yacccc $(BUILT_SOURCES)
+ mostlyclean-am:  mostlyclean-binPROGRAMS mostlyclean-libexecPROGRAMS \
+ 		mostlyclean-noinstPROGRAMS mostlyclean-compile \
+-		mostlyclean-libtool mostlyclean-tags \
++		mostlyclean-libtool mostlyclean-tags mostlyclean-depend \
+ 		mostlyclean-generic
+ 
+ mostlyclean: mostlyclean-recursive
+ 
+ clean-am:  clean-binPROGRAMS clean-libexecPROGRAMS clean-noinstPROGRAMS \
+-		clean-compile clean-libtool clean-tags clean-generic \
+-		mostlyclean-am
++		clean-compile clean-libtool clean-tags clean-depend \
++		clean-generic mostlyclean-am
+ 
+ clean: clean-recursive
+ 
+ distclean-am:  distclean-binPROGRAMS distclean-libexecPROGRAMS \
+ 		distclean-noinstPROGRAMS distclean-compile \
+-		distclean-libtool distclean-tags distclean-generic \
+-		clean-am
++		distclean-libtool distclean-tags distclean-depend \
++		distclean-generic clean-am
+ 	-rm -f libtool
+ 
+ distclean: distclean-recursive
+@@ -1844,8 +645,8 @@
+ 		maintainer-clean-libexecPROGRAMS \
+ 		maintainer-clean-noinstPROGRAMS \
+ 		maintainer-clean-compile maintainer-clean-libtool \
+-		maintainer-clean-tags maintainer-clean-generic \
+-		distclean-am
++		maintainer-clean-tags maintainer-clean-depend \
++		maintainer-clean-generic distclean-am
+ 	@echo "This command is intended for maintainers to use;"
+ 	@echo "it deletes files that may require special tools to rebuild."
+ 
+@@ -1866,12 +667,14 @@
+ all-recursive check-recursive installcheck-recursive info-recursive \
+ dvi-recursive mostlyclean-recursive distclean-recursive clean-recursive \
+ maintainer-clean-recursive tags tags-recursive mostlyclean-tags \
+-distclean-tags clean-tags maintainer-clean-tags distdir info-am info \
+-dvi-am dvi check check-am installcheck-am installcheck install-exec-am \
+-install-exec install-data-am install-data install-am install \
+-uninstall-am uninstall all-redirect all-am all installdirs-am \
+-installdirs mostlyclean-generic distclean-generic clean-generic \
+-maintainer-clean-generic clean mostlyclean distclean maintainer-clean
++distclean-tags clean-tags maintainer-clean-tags distdir \
++mostlyclean-depend distclean-depend clean-depend \
++maintainer-clean-depend info-am info dvi-am dvi check check-am \
++installcheck-am installcheck install-exec-am install-exec \
++install-data-am install-data install-am install uninstall-am uninstall \
++all-redirect all-am all installdirs-am installdirs mostlyclean-generic \
++distclean-generic clean-generic maintainer-clean-generic clean \
++mostlyclean distclean maintainer-clean
+ 
+ 
+ link_sources:
+diff -r -u mysql-3.23.36.orig/sql/share/Makefile.in mysql-3.23.36/sql/share/Makefile.in
+--- mysql-3.23.36.orig/sql/share/Makefile.in	Tue Mar 27 10:20:28 2001
++++ mysql-3.23.36/sql/share/Makefile.in	Fri Apr 13 16:23:22 2001
+@@ -163,14 +163,14 @@
+ 
+ DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST)
+ 
+-TAR = gtar
++TAR = tar
+ GZIP_ENV = --best
+ all: all-redirect
+ .SUFFIXES:
+ $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) 
+-	cd $(top_srcdir) && $(AUTOMAKE) --gnu --include-deps sql/share/Makefile
++	cd $(top_srcdir) && $(AUTOMAKE) --gnu sql/share/Makefile
+ 
+-Makefile: $(srcdir)/Makefile.in  $(top_builddir)/config.status
++Makefile: $(srcdir)/Makefile.in  $(top_builddir)/config.status $(BUILT_SOURCES)
+ 	cd $(top_builddir) \
+ 	  && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status
+ 
+@@ -183,10 +183,15 @@
+ subdir = sql/share
+ 
+ distdir: $(DISTFILES)
++	here=`cd $(top_builddir) && pwd`; \
++	top_distdir=`cd $(top_distdir) && pwd`; \
++	distdir=`cd $(distdir) && pwd`; \
++	cd $(top_srcdir) \
++	  && $(AUTOMAKE) --include-deps --build-dir=$$here --srcdir-name=$(top_srcdir) --output-dir=$$top_distdir --gnu sql/share/Makefile
+ 	@for file in $(DISTFILES); do \
+ 	  d=$(srcdir); \
+ 	  if test -d $$d/$$file; then \
+-	    cp -pr $$d/$$file $(distdir)/$$file; \
++	    cp -pr $$/$$file $(distdir)/$$file; \
+ 	  else \
+ 	    test -f $(distdir)/$$file \
+ 	    || ln $$d/$$file $(distdir)/$$file 2> /dev/null \
+diff -r -u mysql-3.23.36.orig/sql-bench/Makefile.in mysql-3.23.36/sql-bench/Makefile.in
+--- mysql-3.23.36.orig/sql-bench/Makefile.in	Tue Mar 27 10:20:31 2001
++++ mysql-3.23.36/sql-bench/Makefile.in	Fri Apr 13 16:23:23 2001
+@@ -193,15 +193,15 @@
+ 
+ DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST)
+ 
+-TAR = gtar
++TAR = tar
+ GZIP_ENV = --best
+ all: all-redirect
+ .SUFFIXES:
+ .SUFFIXES: .sh
+ $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) 
+-	cd $(top_srcdir) && $(AUTOMAKE) --gnu --include-deps sql-bench/Makefile
++	cd $(top_srcdir) && $(AUTOMAKE) --gnu sql-bench/Makefile
+ 
+-Makefile: $(srcdir)/Makefile.in  $(top_builddir)/config.status
++Makefile: $(srcdir)/Makefile.in  $(top_builddir)/config.status $(BUILT_SOURCES)
+ 	cd $(top_builddir) \
+ 	  && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status
+ 
+@@ -233,10 +233,15 @@
+ subdir = sql-bench
+ 
+ distdir: $(DISTFILES)
++	here=`cd $(top_builddir) && pwd`; \
++	top_distdir=`cd $(top_distdir) && pwd`; \
++	distdir=`cd $(distdir) && pwd`; \
++	cd $(top_srcdir) \
++	  && $(AUTOMAKE) --include-deps --build-dir=$$here --srcdir-name=$(top_srcdir) --output-dir=$$top_distdir --gnu sql-bench/Makefile
+ 	@for file in $(DISTFILES); do \
+ 	  d=$(srcdir); \
+ 	  if test -d $$d/$$file; then \
+-	    cp -pr $$d/$$file $(distdir)/$$file; \
++	    cp -pr $$/$$file $(distdir)/$$file; \
+ 	  else \
+ 	    test -f $(distdir)/$$file \
+ 	    || ln $$d/$$file $(distdir)/$$file 2> /dev/null \
+diff -r -u mysql-3.23.36.orig/strings/Makefile.in mysql-3.23.36/strings/Makefile.in
+--- mysql-3.23.36.orig/strings/Makefile.in	Tue Mar 27 10:20:13 2001
++++ mysql-3.23.36/strings/Makefile.in	Fri Apr 13 16:23:20 2001
+@@ -210,22 +210,6 @@
+ LDFLAGS = @LDFLAGS@
+ LIBS = @LIBS@
+ libmystrings_a_DEPENDENCIES = 
+-@ASSEMBLER_x86_TRUE@@ASSEMBLER_sparc_FALSE@libmystrings_a_OBJECTS =  \
+-@ASSEMBLER_x86_TRUE@@ASSEMBLER_sparc_FALSE@strings-x86.o \
+-@ASSEMBLER_x86_TRUE@@ASSEMBLER_sparc_FALSE@longlong2str-x86.o bfill.o \
+-@ASSEMBLER_x86_TRUE@@ASSEMBLER_sparc_FALSE@bmove.o bmove512.o bchange.o \
+-@ASSEMBLER_x86_TRUE@@ASSEMBLER_sparc_FALSE@strxnmov.o int2str.o \
+-@ASSEMBLER_x86_TRUE@@ASSEMBLER_sparc_FALSE@str2int.o r_strinstr.o \
+-@ASSEMBLER_x86_TRUE@@ASSEMBLER_sparc_FALSE@atof.o bcmp.o strtol.o \
+-@ASSEMBLER_x86_TRUE@@ASSEMBLER_sparc_FALSE@strtoul.o strtoll.o \
+-@ASSEMBLER_x86_TRUE@@ASSEMBLER_sparc_FALSE@strtoull.o strxmov.o \
+-@ASSEMBLER_x86_TRUE@@ASSEMBLER_sparc_FALSE@bmove_upp.o strappend.o \
+-@ASSEMBLER_x86_TRUE@@ASSEMBLER_sparc_FALSE@strcont.o strend.o strfill.o \
+-@ASSEMBLER_x86_TRUE@@ASSEMBLER_sparc_FALSE@strcend.o is_prefix.o \
+-@ASSEMBLER_x86_TRUE@@ASSEMBLER_sparc_FALSE@strstr.o strinstr.o \
+-@ASSEMBLER_x86_TRUE@@ASSEMBLER_sparc_FALSE@strmake.o strnmov.o strmov.o \
+-@ASSEMBLER_x86_TRUE@@ASSEMBLER_sparc_FALSE@longlong2str.o llstr.o \
+-@ASSEMBLER_x86_TRUE@@ASSEMBLER_sparc_FALSE@ctype.o strnlen.o
+ @ASSEMBLER_x86_FALSE@@ASSEMBLER_sparc_TRUE@libmystrings_a_OBJECTS =  \
+ @ASSEMBLER_x86_FALSE@@ASSEMBLER_sparc_TRUE@bmove_upp-sparc.o \
+ @ASSEMBLER_x86_FALSE@@ASSEMBLER_sparc_TRUE@strappend-sparc.o \
+@@ -260,6 +244,22 @@
+ @ASSEMBLER_x86_FALSE@@ASSEMBLER_sparc_FALSE@strtol.o strtoul.o \
+ @ASSEMBLER_x86_FALSE@@ASSEMBLER_sparc_FALSE@strtoll.o strtoull.o \
+ @ASSEMBLER_x86_FALSE@@ASSEMBLER_sparc_FALSE@llstr.o ctype.o strnlen.o
++@ASSEMBLER_x86_TRUE@@ASSEMBLER_sparc_FALSE@libmystrings_a_OBJECTS =  \
++@ASSEMBLER_x86_TRUE@@ASSEMBLER_sparc_FALSE@strings-x86.o \
++@ASSEMBLER_x86_TRUE@@ASSEMBLER_sparc_FALSE@longlong2str-x86.o bfill.o \
++@ASSEMBLER_x86_TRUE@@ASSEMBLER_sparc_FALSE@bmove.o bmove512.o bchange.o \
++@ASSEMBLER_x86_TRUE@@ASSEMBLER_sparc_FALSE@strxnmov.o int2str.o \
++@ASSEMBLER_x86_TRUE@@ASSEMBLER_sparc_FALSE@str2int.o r_strinstr.o \
++@ASSEMBLER_x86_TRUE@@ASSEMBLER_sparc_FALSE@atof.o bcmp.o strtol.o \
++@ASSEMBLER_x86_TRUE@@ASSEMBLER_sparc_FALSE@strtoul.o strtoll.o \
++@ASSEMBLER_x86_TRUE@@ASSEMBLER_sparc_FALSE@strtoull.o strxmov.o \
++@ASSEMBLER_x86_TRUE@@ASSEMBLER_sparc_FALSE@bmove_upp.o strappend.o \
++@ASSEMBLER_x86_TRUE@@ASSEMBLER_sparc_FALSE@strcont.o strend.o strfill.o \
++@ASSEMBLER_x86_TRUE@@ASSEMBLER_sparc_FALSE@strcend.o is_prefix.o \
++@ASSEMBLER_x86_TRUE@@ASSEMBLER_sparc_FALSE@strstr.o strinstr.o \
++@ASSEMBLER_x86_TRUE@@ASSEMBLER_sparc_FALSE@strmake.o strnmov.o strmov.o \
++@ASSEMBLER_x86_TRUE@@ASSEMBLER_sparc_FALSE@longlong2str.o llstr.o \
++@ASSEMBLER_x86_TRUE@@ASSEMBLER_sparc_FALSE@ctype.o strnlen.o
+ @ASSEMBLER_x86_TRUE@@ASSEMBLER_sparc_TRUE@libmystrings_a_OBJECTS =  \
+ @ASSEMBLER_x86_TRUE@@ASSEMBLER_sparc_TRUE@strings-x86.o \
+ @ASSEMBLER_x86_TRUE@@ASSEMBLER_sparc_TRUE@longlong2str-x86.o bfill.o \
+@@ -291,8 +291,21 @@
+ 
+ DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST)
+ 
+-TAR = gtar
++TAR = tar
+ GZIP_ENV = --best
++DEP_FILES =  .deps/atof.P .deps/bchange.P .deps/bcmp.P .deps/bfill.P \
++.deps/bmove.P .deps/bmove512.P .deps/bmove_upp-sparc.P \
++.deps/bmove_upp.P .deps/conf_to_src.P .deps/ctype.P .deps/int2str.P \
++.deps/is_prefix.P .deps/llstr.P .deps/longlong2str-x86.P \
++.deps/longlong2str.P .deps/r_strinstr.P .deps/str2int.P \
++.deps/strappend-sparc.P .deps/strappend.P .deps/strcend.P \
++.deps/strcont.P .deps/strend-sparc.P .deps/strend.P .deps/strfill.P \
++.deps/strings-x86.P .deps/strinstr-sparc.P .deps/strinstr.P \
++.deps/strmake-sparc.P .deps/strmake.P .deps/strmov-sparc.P \
++.deps/strmov.P .deps/strnlen.P .deps/strnmov-sparc.P .deps/strnmov.P \
++.deps/strstr-sparc.P .deps/strstr.P .deps/strtol.P .deps/strtoll.P \
++.deps/strtoul.P .deps/strtoull.P .deps/strxmov-sparc.P .deps/strxmov.P \
++.deps/strxnmov.P
+ SOURCES = $(libmystrings_a_SOURCES) $(conf_to_src_SOURCES)
+ OBJECTS = $(libmystrings_a_OBJECTS) $(conf_to_src_OBJECTS)
+ 
+@@ -300,9 +313,9 @@
+ .SUFFIXES:
+ .SUFFIXES: .S .c .lo .o .s
+ $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) 
+-	cd $(top_srcdir) && $(AUTOMAKE) --gnu --include-deps strings/Makefile
++	cd $(top_srcdir) && $(AUTOMAKE) --gnu strings/Makefile
+ 
+-Makefile: $(srcdir)/Makefile.in  $(top_builddir)/config.status
++Makefile: $(srcdir)/Makefile.in  $(top_builddir)/config.status $(BUILT_SOURCES)
+ 	cd $(top_builddir) \
+ 	  && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status
+ 
+@@ -339,9 +352,6 @@
+ 	  rm -f $(DESTDIR)$(pkglibdir)/$$p; \
+ 	done
+ 
+-.c.o:
+-	$(COMPILE) -c $<
+-
+ .s.o:
+ 	$(COMPILE) -c $<
+ 
+@@ -358,9 +368,6 @@
+ 
+ maintainer-clean-compile:
+ 
+-.c.lo:
+-	$(LIBTOOL) --mode=compile $(COMPILE) -c $<
+-
+ .s.lo:
+ 	$(LIBTOOL) --mode=compile $(COMPILE) -c $<
+ 
+@@ -429,142 +436,53 @@
+ subdir = strings
+ 
+ distdir: $(DISTFILES)
++	here=`cd $(top_builddir) && pwd`; \
++	top_distdir=`cd $(top_distdir) && pwd`; \
++	distdir=`cd $(distdir) && pwd`; \
++	cd $(top_srcdir) \
++	  && $(AUTOMAKE) --include-deps --build-dir=$$here --srcdir-name=$(top_srcdir) --output-dir=$$top_distdir --gnu strings/Makefile
+ 	@for file in $(DISTFILES); do \
+ 	  d=$(srcdir); \
+ 	  if test -d $$d/$$file; then \
+-	    cp -pr $$d/$$file $(distdir)/$$file; \
++	    cp -pr $$/$$file $(distdir)/$$file; \
+ 	  else \
+ 	    test -f $(distdir)/$$file \
+ 	    || ln $$d/$$file $(distdir)/$$file 2> /dev/null \
+ 	    || cp -p $$d/$$file $(distdir)/$$file || :; \
+ 	  fi; \
+ 	done
+-atof.o: atof.c ../include/global.h ../include/my_config.h \
+-	../mit-pthreads/include/bits/local_lim.h \
+-	../mit-pthreads/include/endian.h ../include/dbug.h
+-bchange.o: bchange.c ../include/global.h ../include/my_config.h \
+-	../mit-pthreads/include/bits/local_lim.h \
+-	../mit-pthreads/include/endian.h ../include/dbug.h \
+-	../include/m_string.h
+-bcmp.o: bcmp.c ../include/global.h ../include/my_config.h \
+-	../mit-pthreads/include/bits/local_lim.h \
+-	../mit-pthreads/include/endian.h ../include/dbug.h \
+-	../include/m_string.h
+-bfill.o: bfill.c ../include/global.h ../include/my_config.h \
+-	../mit-pthreads/include/bits/local_lim.h \
+-	../mit-pthreads/include/endian.h ../include/dbug.h \
+-	../include/m_string.h
+-bmove.o: bmove.c ../include/global.h ../include/my_config.h \
+-	../mit-pthreads/include/bits/local_lim.h \
+-	../mit-pthreads/include/endian.h ../include/dbug.h \
+-	../include/m_string.h
+-bmove512.o: bmove512.c ../include/global.h ../include/my_config.h \
+-	../mit-pthreads/include/bits/local_lim.h \
+-	../mit-pthreads/include/endian.h ../include/dbug.h \
+-	../include/m_string.h
+-bmove_upp.o: bmove_upp.c ../include/global.h ../include/my_config.h \
+-	../mit-pthreads/include/bits/local_lim.h \
+-	../mit-pthreads/include/endian.h ../include/dbug.h \
+-	../include/m_string.h
+-conf_to_src.o: conf_to_src.c ../mit-pthreads/include/endian.h
+-ctype.o: ctype.c ../include/global.h ../include/my_config.h \
+-	../mit-pthreads/include/bits/local_lim.h \
+-	../mit-pthreads/include/endian.h ../include/dbug.h \
+-	../include/m_ctype.h ctype_extra_sources.c ctype_autoconf.c
+-int2str.o: int2str.c ../include/global.h ../include/my_config.h \
+-	../mit-pthreads/include/bits/local_lim.h \
+-	../mit-pthreads/include/endian.h ../include/dbug.h \
+-	../include/m_string.h
+-is_prefix.o: is_prefix.c ../include/global.h ../include/my_config.h \
+-	../mit-pthreads/include/bits/local_lim.h \
+-	../mit-pthreads/include/endian.h ../include/dbug.h \
+-	../include/m_string.h
+-llstr.o: llstr.c ../include/global.h ../include/my_config.h \
+-	../mit-pthreads/include/bits/local_lim.h \
+-	../mit-pthreads/include/endian.h ../include/dbug.h \
+-	../include/m_string.h
+-longlong2str.o: longlong2str.c ../include/global.h \
+-	../include/my_config.h ../mit-pthreads/include/bits/local_lim.h \
+-	../mit-pthreads/include/endian.h ../include/dbug.h \
+-	../include/m_string.h
+-r_strinstr.o: r_strinstr.c ../include/global.h ../include/my_config.h \
+-	../mit-pthreads/include/bits/local_lim.h \
+-	../mit-pthreads/include/endian.h ../include/dbug.h \
+-	../include/m_string.h
+-str2int.o: str2int.c ../include/global.h ../include/my_config.h \
+-	../mit-pthreads/include/bits/local_lim.h \
+-	../mit-pthreads/include/endian.h ../include/dbug.h \
+-	../include/m_string.h ../include/m_ctype.h ../include/my_sys.h \
+-	../include/my_pthread.h \
+-	../mit-pthreads/include/pthread/config.h \
+-	../mit-pthreads/include/sched.h ../include/raid.h
+-strappend.o: strappend.c ../include/global.h ../include/my_config.h \
+-	../mit-pthreads/include/bits/local_lim.h \
+-	../mit-pthreads/include/endian.h ../include/dbug.h \
+-	../include/m_string.h
+-strcend.o: strcend.c ../include/global.h ../include/my_config.h \
+-	../mit-pthreads/include/bits/local_lim.h \
+-	../mit-pthreads/include/endian.h ../include/dbug.h \
+-	../include/m_string.h
+-strcont.o: strcont.c ../include/global.h ../include/my_config.h \
+-	../mit-pthreads/include/bits/local_lim.h \
+-	../mit-pthreads/include/endian.h ../include/dbug.h \
+-	../include/m_string.h
+-strend.o: strend.c ../include/global.h ../include/my_config.h \
+-	../mit-pthreads/include/bits/local_lim.h \
+-	../mit-pthreads/include/endian.h ../include/dbug.h \
+-	../include/m_string.h
+-strfill.o: strfill.c ../include/global.h ../include/my_config.h \
+-	../mit-pthreads/include/bits/local_lim.h \
+-	../mit-pthreads/include/endian.h ../include/dbug.h \
+-	../include/m_string.h
+-strinstr.o: strinstr.c ../include/global.h ../include/my_config.h \
+-	../mit-pthreads/include/bits/local_lim.h \
+-	../mit-pthreads/include/endian.h ../include/dbug.h \
+-	../include/m_string.h
+-strmake.o: strmake.c ../include/global.h ../include/my_config.h \
+-	../mit-pthreads/include/bits/local_lim.h \
+-	../mit-pthreads/include/endian.h ../include/dbug.h \
+-	../include/m_string.h
+-strmov.o: strmov.c ../include/global.h ../include/my_config.h \
+-	../mit-pthreads/include/bits/local_lim.h \
+-	../mit-pthreads/include/endian.h ../include/dbug.h \
+-	../include/m_string.h
+-strnlen.o: strnlen.c ../include/global.h ../include/my_config.h \
+-	../mit-pthreads/include/bits/local_lim.h \
+-	../mit-pthreads/include/endian.h ../include/dbug.h \
+-	../include/m_string.h
+-strnmov.o: strnmov.c ../include/global.h ../include/my_config.h \
+-	../mit-pthreads/include/bits/local_lim.h \
+-	../mit-pthreads/include/endian.h ../include/dbug.h \
+-	../include/m_string.h
+-strstr.o: strstr.c ../include/global.h ../include/my_config.h \
+-	../mit-pthreads/include/bits/local_lim.h \
+-	../mit-pthreads/include/endian.h ../include/dbug.h \
+-	../include/m_string.h
+-strtol.o: strtol.c ../include/global.h ../include/my_config.h \
+-	../mit-pthreads/include/bits/local_lim.h \
+-	../mit-pthreads/include/endian.h ../include/dbug.h
+-strtoll.o: strtoll.c ../include/global.h ../include/my_config.h \
+-	../mit-pthreads/include/bits/local_lim.h \
+-	../mit-pthreads/include/endian.h ../include/dbug.h \
+-	../include/m_string.h
+-strtoul.o: strtoul.c ../include/global.h ../include/my_config.h \
+-	../mit-pthreads/include/bits/local_lim.h \
+-	../mit-pthreads/include/endian.h ../include/dbug.h
+-strtoull.o: strtoull.c ../include/global.h ../include/my_config.h \
+-	../mit-pthreads/include/bits/local_lim.h \
+-	../mit-pthreads/include/endian.h ../include/dbug.h \
+-	../include/m_string.h
+-strxmov.o: strxmov.c ../include/global.h ../include/my_config.h \
+-	../mit-pthreads/include/bits/local_lim.h \
+-	../mit-pthreads/include/endian.h ../include/dbug.h \
+-	../include/m_string.h
+-strxnmov.o: strxnmov.c ../include/global.h ../include/my_config.h \
+-	../mit-pthreads/include/bits/local_lim.h \
+-	../mit-pthreads/include/endian.h ../include/dbug.h \
+-	../include/m_string.h
+ 
++DEPS_MAGIC := $(shell mkdir .deps > /dev/null 2>&1 || :)
++
++-include $(DEP_FILES)
++
++mostlyclean-depend:
++
++clean-depend:
++
++distclean-depend:
++	-rm -rf .deps
++
++maintainer-clean-depend:
++
++%.o: %.c
++	@echo '$(COMPILE) -c $<'; \
++	$(COMPILE) -Wp,-MD,.deps/$(*F).pp -c $<
++	@-cp .deps/$(*F).pp .deps/$(*F).P; \
++	tr ' ' '\012' < .deps/$(*F).pp \
++	  | sed -e 's/^\\$$//' -e '/^$$/ d' -e '/:$$/ d' -e 's/$$/ :/' \
++	    >> .deps/$(*F).P; \
++	rm .deps/$(*F).pp
++
++%.lo: %.c
++	@echo '$(LTCOMPILE) -c $<'; \
++	$(LTCOMPILE) -Wp,-MD,.deps/$(*F).pp -c $<
++	@-sed -e 's/^\([^:]*\)\.o[ 	]*:/\1.lo \1.o :/' \
++	  < .deps/$(*F).pp > .deps/$(*F).P; \
++	tr ' ' '\012' < .deps/$(*F).pp \
++	  | sed -e 's/^\\$$//' -e '/^$$/ d' -e '/:$$/ d' -e 's/$$/ :/' \
++	    >> .deps/$(*F).P; \
++	rm -f .deps/$(*F).pp
+ info-am:
+ info: info-am
+ dvi-am:
+@@ -603,19 +521,20 @@
+ maintainer-clean-generic:
+ mostlyclean-am:  mostlyclean-pkglibLIBRARIES mostlyclean-compile \
+ 		mostlyclean-libtool mostlyclean-noinstPROGRAMS \
+-		mostlyclean-tags mostlyclean-generic
++		mostlyclean-tags mostlyclean-depend mostlyclean-generic
+ 
+ mostlyclean: mostlyclean-am
+ 
+ clean-am:  clean-pkglibLIBRARIES clean-compile clean-libtool \
+-		clean-noinstPROGRAMS clean-tags clean-generic \
+-		mostlyclean-am clean-local
++		clean-noinstPROGRAMS clean-tags clean-depend \
++		clean-generic mostlyclean-am clean-local
+ 
+ clean: clean-am
+ 
+ distclean-am:  distclean-pkglibLIBRARIES distclean-compile \
+ 		distclean-libtool distclean-noinstPROGRAMS \
+-		distclean-tags distclean-generic clean-am
++		distclean-tags distclean-depend distclean-generic \
++		clean-am
+ 	-rm -f libtool
+ 
+ distclean: distclean-am
+@@ -623,7 +542,8 @@
+ maintainer-clean-am:  maintainer-clean-pkglibLIBRARIES \
+ 		maintainer-clean-compile maintainer-clean-libtool \
+ 		maintainer-clean-noinstPROGRAMS maintainer-clean-tags \
+-		maintainer-clean-generic distclean-am
++		maintainer-clean-depend maintainer-clean-generic \
++		distclean-am
+ 	@echo "This command is intended for maintainers to use;"
+ 	@echo "it deletes files that may require special tools to rebuild."
+ 
+@@ -637,12 +557,13 @@
+ maintainer-clean-libtool mostlyclean-noinstPROGRAMS \
+ distclean-noinstPROGRAMS clean-noinstPROGRAMS \
+ maintainer-clean-noinstPROGRAMS tags mostlyclean-tags distclean-tags \
+-clean-tags maintainer-clean-tags distdir info-am info dvi-am dvi check \
+-check-am installcheck-am installcheck install-exec-am install-exec \
+-install-data-am install-data install-am install uninstall-am uninstall \
+-all-redirect all-am all installdirs mostlyclean-generic \
+-distclean-generic clean-generic maintainer-clean-generic clean \
+-mostlyclean distclean maintainer-clean
++clean-tags maintainer-clean-tags distdir mostlyclean-depend \
++distclean-depend clean-depend maintainer-clean-depend info-am info \
++dvi-am dvi check check-am installcheck-am installcheck install-exec-am \
++install-exec install-data-am install-data install-am install \
++uninstall-am uninstall all-redirect all-am all installdirs \
++mostlyclean-generic distclean-generic clean-generic \
++maintainer-clean-generic clean mostlyclean distclean maintainer-clean
+ 
+ ctype.o:		ctype_extra_sources.c
+ 
+diff -r -u mysql-3.23.36.orig/support-files/Makefile.in mysql-3.23.36/support-files/Makefile.in
+--- mysql-3.23.36.orig/support-files/Makefile.in	Tue Mar 27 10:20:33 2001
++++ mysql-3.23.36/support-files/Makefile.in	Fri Apr 13 16:23:24 2001
+@@ -197,15 +197,15 @@
+ 
+ DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST)
+ 
+-TAR = gtar
++TAR = tar
+ GZIP_ENV = --best
+ all: all-redirect
+ .SUFFIXES:
+ .SUFFIXES: .sh
+ $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) 
+-	cd $(top_srcdir) && $(AUTOMAKE) --gnu --include-deps support-files/Makefile
++	cd $(top_srcdir) && $(AUTOMAKE) --gnu support-files/Makefile
+ 
+-Makefile: $(srcdir)/Makefile.in  $(top_builddir)/config.status
++Makefile: $(srcdir)/Makefile.in  $(top_builddir)/config.status $(BUILT_SOURCES)
+ 	cd $(top_builddir) \
+ 	  && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status
+ 
+@@ -256,10 +256,15 @@
+ subdir = support-files
+ 
+ distdir: $(DISTFILES)
++	here=`cd $(top_builddir) && pwd`; \
++	top_distdir=`cd $(top_distdir) && pwd`; \
++	distdir=`cd $(distdir) && pwd`; \
++	cd $(top_srcdir) \
++	  && $(AUTOMAKE) --include-deps --build-dir=$$here --srcdir-name=$(top_srcdir) --output-dir=$$top_distdir --gnu support-files/Makefile
+ 	@for file in $(DISTFILES); do \
+ 	  d=$(srcdir); \
+ 	  if test -d $$d/$$file; then \
+-	    cp -pr $$d/$$file $(distdir)/$$file; \
++	    cp -pr $$/$$file $(distdir)/$$file; \
+ 	  else \
+ 	    test -f $(distdir)/$$file \
+ 	    || ln $$d/$$file $(distdir)/$$file 2> /dev/null \
+diff -r -u mysql-3.23.36.orig/tests/Makefile.in mysql-3.23.36/tests/Makefile.in
+--- mysql-3.23.36.orig/tests/Makefile.in	Tue Mar 27 10:20:29 2001
++++ mysql-3.23.36/tests/Makefile.in	Fri Apr 13 16:23:23 2001
+@@ -183,14 +183,14 @@
+ 
+ DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST)
+ 
+-TAR = gtar
++TAR = tar
+ GZIP_ENV = --best
+ all: all-redirect
+ .SUFFIXES:
+ $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) 
+-	cd $(top_srcdir) && $(AUTOMAKE) --gnu --include-deps tests/Makefile
++	cd $(top_srcdir) && $(AUTOMAKE) --gnu tests/Makefile
+ 
+-Makefile: $(srcdir)/Makefile.in  $(top_builddir)/config.status
++Makefile: $(srcdir)/Makefile.in  $(top_builddir)/config.status $(BUILT_SOURCES)
+ 	cd $(top_builddir) \
+ 	  && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status
+ 
+@@ -203,10 +203,15 @@
+ subdir = tests
+ 
+ distdir: $(DISTFILES)
++	here=`cd $(top_builddir) && pwd`; \
++	top_distdir=`cd $(top_distdir) && pwd`; \
++	distdir=`cd $(distdir) && pwd`; \
++	cd $(top_srcdir) \
++	  && $(AUTOMAKE) --include-deps --build-dir=$$here --srcdir-name=$(top_srcdir) --output-dir=$$top_distdir --gnu tests/Makefile
+ 	@for file in $(DISTFILES); do \
+ 	  d=$(srcdir); \
+ 	  if test -d $$d/$$file; then \
+-	    cp -pr $$d/$$file $(distdir)/$$file; \
++	    cp -pr $$/$$file $(distdir)/$$file; \
+ 	  else \
+ 	    test -f $(distdir)/$$file \
+ 	    || ln $$d/$$file $(distdir)/$$file 2> /dev/null \
diff --git a/dev-db/mysql/files/mysql-3.23.36-nisam.h-gentoo.diff b/dev-db/mysql/files/mysql-3.23.36-nisam.h-gentoo.diff
new file mode 100644
index 000000000000..8b4450478808
--- /dev/null
+++ b/dev-db/mysql/files/mysql-3.23.36-nisam.h-gentoo.diff
@@ -0,0 +1,11 @@
+--- include/nisam.h~	Tue Mar 27 10:11:02 2001
++++ include/nisam.h	Fri Apr 13 16:26:02 2001
+@@ -31,7 +31,7 @@
+ 
+ #define N_MAXKEY	16		/* Max allowed keys */
+ #define N_MAXKEY_SEG	16		/* Max segments for key */
+-#define N_MAX_KEY_LENGTH 256		/* May be increased up to 500 */
++#define N_MAX_KEY_LENGTH 500		/* May be increased up to 500 */
+ #define N_MAX_KEY_BUFF	 (N_MAX_KEY_LENGTH+N_MAXKEY_SEG+sizeof(double)-1)
+ #define N_MAX_POSSIBLE_KEY_BUFF 500+9
+ 
diff --git a/dev-db/mysql/mysql-3.23.36.ebuild b/dev-db/mysql/mysql-3.23.36.ebuild
new file mode 100644
index 000000000000..0d8a8f2654ef
--- /dev/null
+++ b/dev-db/mysql/mysql-3.23.36.ebuild
@@ -0,0 +1,133 @@
+# Copyright 1999-2000 Gentoo Technologies, Inc.
+# Distributed under the terms of the GNU General Public License, v2 or later
+# Author Achim Gottinger <achim@gentoo.org>
+# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql/mysql-3.23.36.ebuild,v 1.1 2001/04/13 14:53:15 achim Exp $
+
+A=${P}.tar.gz
+S=${WORKDIR}/${P}
+DESCRIPTION="The MySQL Database"
+SRC_URI="ftp://mysql.valueclick.com/mysql/Downloads/MySQL-3.23/${A}
+	 http://www.mysql.com/Downloads/MySQL-3.23/${A}"
+
+HOMEPAGE="http://www.mysql.com/"
+
+DEPEND="virtual/glibc
+	tcpd? ( >=sys-apps/tcp-wrappers-7.6 )
+	berkdb? ( >=sys-libs/db-3.2.3h )
+    readline? ( >=sys-libs/realdine-4.2 )
+    >=sys-libs/ncurses-5.1
+    >=sys-libs/zlib-1.1.3"
+
+
+src_unpack() {
+	unpack ${A}
+	cd ${S}
+	echo ">>> Applying ${P}-db-3.2.3-gentoo.diff..."
+	patch -p1 < ${FILESDIR}/${P}-db-3.2.3-gentoo.diff
+	# Required for qmail-mysql
+	echo ">>> Applying ${P}-nisam.h-gentoo.diff..."
+	patch -p0 < ${FILESDIR}/${P}-nisam.h-gentoo.diff
+}
+
+src_compile() {
+
+    local myconf
+
+    # MySQL doesn't like optimizations
+    export CFLAGS="${CFLAGS/-O?/}"
+    export CXXFLAGS="${CXXFLAGS/-O?/}"
+
+    if [ "`use tcpd`" ]
+    then
+      myconf="--with-libwrap"
+    fi
+
+    if [ "`use readline`" ]
+    then
+      # Means use system readline
+      myconf="$myconf --without-readline"
+    else
+      myconf="$myconf --with-readline"
+    fi
+
+    if [ "`use berkdb`" ]
+    then
+      myconf="$myconf --with-berkdb-includes=/usr/include/db3 --with-berkdb-libs=/usr/lib"
+    else
+      myconf="$myconf --without-berkdb"
+    fi
+
+    if [ "$DEBUG" == "true" ]
+    then
+      myconf="$myconf --with-debug"
+    else
+      myconf="$myconf --without-debug"
+    fi
+
+	try CXX=gcc ./configure --prefix=/usr --host=${CHOST} \
+	--enable-shared \
+	--enable-static \
+	--enable-assembler \
+	--enable-thread-safe-client \
+	--with-raid \
+	--with-low-memory \
+	--libdir=/usr/lib \
+	--libexecdir=/usr/sbin \
+	--sysconfdir=/etc/mysql \
+	--localstatedir=/var/mysql \
+	--infodir=/usr/share/info \
+	--mandir=/usr/share/man \
+	--with-mysql-user=mysql \
+    $myconf
+
+	try make testdir=/usr/share/mysql/test benchdir=/usr/share/mysql/bench
+}
+
+src_install() {
+
+	
+	# Install MySQL
+
+	try make install prefix=${D}/usr \
+		libdir=${D}/usr/lib \
+		libexecdir=${D}/usr/sbin \
+		sysconfdir=${D}/etc/mysql \
+		localstatedir=${D}/var/mysql \
+		infodir=${D}/usr/share/info \
+		mandir=${D}/usr/share/man \
+	 	testdir=${D}/usr/share/mysql/test \
+		benchdir=${D}/usr/share/mysql/bench
+
+
+	# Move Client Libs
+	mv ${D}/usr/lib/mysql/libmysqlclient*.so* ${D}/usr/lib
+
+	insinto /usr/include/mysql
+        doins include/my_config.h include/my_dir.h
+	dodir /etc/mysql
+	cp scripts/mysqlaccess.conf ${D}/etc/mysql
+	cp ${FILESDIR}/my.cnf ${D}/etc/mysql
+
+	dodir /etc/rc.d/init.d
+	cp ${FILESDIR}/mysql ${D}/etc/rc.d/init.d/mysql
+	
+	# MySQL Docs
+	
+
+	dodoc README MIRRORS
+	cd ${S}/Docs 
+	docinto ps
+	dodoc manual.ps 
+	docinto txt
+	dodoc manual.txt
+	docinto html
+	dodoc manual.html manual_toc.html
+		
+}
+
+pkg_config () {
+
+  echo "Setting up symlinks..."
+  ${ROOT}/usr/sbin/rc-update add mysql
+
+}