diff options
65 files changed, 0 insertions, 22278 deletions
diff --git a/dev-db/MyODBC/MyODBC-2.50.36.ebuild b/dev-db/MyODBC/MyODBC-2.50.36.ebuild deleted file mode 100644 index bd3636c55e94..000000000000 --- a/dev-db/MyODBC/MyODBC-2.50.36.ebuild +++ /dev/null @@ -1,31 +0,0 @@ -# Copyright 1999-2000 Gentoo Technologies, Inc. -# Distributed under the terms of the GNU General Public License, v2 or later -# Author Your Name <your email> -# $Header: /var/cvsroot/gentoo-x86/dev-db/MyODBC/MyODBC-2.50.36.ebuild,v 1.2 2000/11/17 11:15:51 achim Exp $ - -#P= -A=${P}.tar.gz -S=${WORKDIR}/${P} -DESCRIPTION="ODBC interface for MySQL" -SRC_URI="http://www.mysql.com/Downloads/MyODBC/${A}" -HOMEPAGE="http://www.mysql.com" - -DEPEND=">=dev-db/unixODBC-1.8.13 - >=dev-db/mysql-3.23.27" - -src_compile() { - - cd ${S} - try ./configure --prefix=/usr --host=${CHOST} \ - --with-unixODBC=/usr --with-odbc-ini=/etc/odbc - try make - -} - -src_install () { - - cd ${S} - try make DESTDIR=${D} install - dodoc ChangeLog ChangeSet -} - diff --git a/dev-db/MyODBC/files/digest-MyODBC-2.50.36 b/dev-db/MyODBC/files/digest-MyODBC-2.50.36 deleted file mode 100644 index a4750ffe9d20..000000000000 --- a/dev-db/MyODBC/files/digest-MyODBC-2.50.36 +++ /dev/null @@ -1 +0,0 @@ -MD5 eb96c1a7990f89f9ab7257404af7f702 MyODBC-2.50.36.tar.gz diff --git a/dev-db/mysql/files/digest-mysql-3.23.28 b/dev-db/mysql/files/digest-mysql-3.23.28 deleted file mode 100644 index e37ad0c0977c..000000000000 --- a/dev-db/mysql/files/digest-mysql-3.23.28 +++ /dev/null @@ -1 +0,0 @@ -MD5 c7846c514600711f3f5ae65deb320c63 mysql-3.23.28-gamma.tar.gz diff --git a/dev-db/mysql/files/digest-mysql-3.23.31 b/dev-db/mysql/files/digest-mysql-3.23.31 deleted file mode 100644 index f9d20200e887..000000000000 --- a/dev-db/mysql/files/digest-mysql-3.23.31 +++ /dev/null @@ -1 +0,0 @@ -MD5 b857ae8bdeefac5dd012611359efd6ee mysql-3.23.31.tar.gz diff --git a/dev-db/mysql/files/digest-mysql-3.23.32 b/dev-db/mysql/files/digest-mysql-3.23.32 deleted file mode 100644 index 063412352c47..000000000000 --- a/dev-db/mysql/files/digest-mysql-3.23.32 +++ /dev/null @@ -1 +0,0 @@ -MD5 a25ee394377a9d8c14bb9fbd3f84fafa mysql-3.23.32.tar.gz diff --git a/dev-db/mysql/files/digest-mysql-3.23.32-r1 b/dev-db/mysql/files/digest-mysql-3.23.32-r1 deleted file mode 100644 index 063412352c47..000000000000 --- a/dev-db/mysql/files/digest-mysql-3.23.32-r1 +++ /dev/null @@ -1 +0,0 @@ -MD5 a25ee394377a9d8c14bb9fbd3f84fafa mysql-3.23.32.tar.gz diff --git a/dev-db/mysql/files/digest-mysql-3.23.32-r2 b/dev-db/mysql/files/digest-mysql-3.23.32-r2 deleted file mode 100644 index 063412352c47..000000000000 --- a/dev-db/mysql/files/digest-mysql-3.23.32-r2 +++ /dev/null @@ -1 +0,0 @@ -MD5 a25ee394377a9d8c14bb9fbd3f84fafa mysql-3.23.32.tar.gz diff --git a/dev-db/mysql/files/mysql-3.23.32-db-3.2.3-gentoo.diff b/dev-db/mysql/files/mysql-3.23.32-db-3.2.3-gentoo.diff deleted file mode 100644 index 65e231e39bba..000000000000 --- a/dev-db/mysql/files/mysql-3.23.32-db-3.2.3-gentoo.diff +++ /dev/null @@ -1,20578 +0,0 @@ -diff -r -N -U3 mysql-3.23.32.orig/Docs/Makefile.in mysql-3.23.32/Docs/Makefile.in ---- mysql-3.23.32.orig/Docs/Makefile.in Mon Jan 22 14:43:56 2001 -+++ mysql-3.23.32/Docs/Makefile.in Thu Mar 1 17:01:08 2001 -@@ -1,6 +1,7 @@ --# Makefile.in generated automatically by automake 1.4 from Makefile.am -+# Makefile.in generated automatically by automake 1.4d from Makefile.am - --# Copyright (C) 1994, 1995-8, 1999 Free Software Foundation, Inc. -+# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001 -+# Free Software Foundation, Inc. - # This Makefile.in is free software; the Free Software Foundation - # gives unlimited permission to copy and/or distribute it, - # with or without modifications, as long as this notice is preserved. -@@ -10,18 +11,6 @@ - # even the implied warranty of MERCHANTABILITY or FITNESS FOR A - # PARTICULAR PURPOSE. - --# Normally you do not need to remake the files here. But if you want --# to you will need the GNU TeX-info utilities. To make a Postscript --# files you also need TeX and dvips. To make the PDF file you will --# need pdftex. We use the teTeX distribution for all of these. -- --# We avoid default automake rules because of problems with .dvi file --# and BSD makes -- --# If you know how to fix any of this more elegantly please mail --# david@mysql.com -- -- - SHELL = @SHELL@ - - srcdir = @srcdir@ -@@ -43,8 +32,6 @@ - includedir = @includedir@ - oldincludedir = /usr/include - --DESTDIR = -- - pkgdatadir = $(datadir)/@PACKAGE@ - pkglibdir = $(libdir)/@PACKAGE@ - pkgincludedir = $(includedir)/@PACKAGE@ -@@ -57,9 +44,11 @@ - AUTOHEADER = @AUTOHEADER@ - - INSTALL = @INSTALL@ --INSTALL_PROGRAM = @INSTALL_PROGRAM@ $(AM_INSTALL_PROGRAM_FLAGS) -+INSTALL_PROGRAM = @INSTALL_PROGRAM@ - INSTALL_DATA = @INSTALL_DATA@ - INSTALL_SCRIPT = @INSTALL_SCRIPT@ -+INSTALL_STRIP_FLAG = -+INSTALL_HEADER = $(INSTALL_DATA) - transform = @program_transform_name@ - - NORMAL_INSTALL = : -@@ -68,6 +57,8 @@ - NORMAL_UNINSTALL = : - PRE_UNINSTALL = : - POST_UNINSTALL = : -+ -+@SET_MAKE@ - build_alias = @build_alias@ - build_triplet = @build@ - host_alias = @host_alias@ -@@ -75,6 +66,8 @@ - target_alias = @target_alias@ - target_triplet = @target@ - ALLOCA = @ALLOCA@ -+AMDEP = @AMDEP@ -+AMTAR = @AMTAR@ - AS = @AS@ - AVAILABLE_LANGUAGES = @AVAILABLE_LANGUAGES@ - AVAILABLE_LANGUAGES_ERRORS = @AVAILABLE_LANGUAGES_ERRORS@ -@@ -96,6 +89,7 @@ - CXX = @CXX@ - CXXFLAGS = @CXXFLAGS@ - CXXLDFLAGS = @CXXLDFLAGS@ -+DEPDIR = @DEPDIR@ - DLLTOOL = @DLLTOOL@ - DOT_FRM_VERSION = @DOT_FRM_VERSION@ - FIND_PROC = @FIND_PROC@ -@@ -112,6 +106,7 @@ - LN_S = @LN_S@ - MACHINE_TYPE = @MACHINE_TYPE@ - MAINT = @MAINT@ -+MAKEINFO = @MAKEINFO@ - MAKE_SHELL = @MAKE_SHELL@ - MT_INCLUDES = @MT_INCLUDES@ - MT_LD_ADD = @MT_LD_ADD@ -@@ -148,11 +143,13 @@ - VERSION = @VERSION@ - WRAPLIBS = @WRAPLIBS@ - YACC = @YACC@ -+_am_include = @_am_include@ - bdb_includes = @bdb_includes@ - bdb_libs = @bdb_libs@ - bench_dirs = @bench_dirs@ - default_charset = @default_charset@ - docs_dirs = @docs_dirs@ -+install_sh = @install_sh@ - linked_client_targets = @linked_client_targets@ - readline_dir = @readline_dir@ - readline_link = @readline_link@ -@@ -162,12 +159,25 @@ - thread_dirs = @thread_dirs@ - uname_prog = @uname_prog@ - -+# Normally you do not need to remake the files here. But if you want -+# to you will need the GNU TeX-info utilities. To make a Postscript -+# files you also need TeX and dvips. To make the PDF file you will -+# need pdftex. We use the teTeX distribution for all of these. -+ -+# We avoid default automake rules because of problems with .dvi file -+# and BSD makes -+ -+# If you know how to fix any of this more elegantly please mail -+# david@mysql.com -+ -+ - TEXI2HTML_FLAGS = -iso -number - DVIPS = dvips - MAKEINFO = @MAKEINFO@ - TEXINFO_TEX = Support/texinfo.tex - --noinst_SCRIPTS = Support/texi2html Support/generate-text-files.pl Support/generate-mirror-listing.pl -+noinst_SCRIPTS = Support/texi2html Support/generate-text-files.pl \ -+ Support/generate-mirror-listing.pl - - info_TEXINFOS = manual.texi - -@@ -177,11 +187,13 @@ - EXTRA_DIST = $(noinst_SCRIPTS) $(BUILT_SOURCES) mysqld_error.txt INSTALL-BINARY - - GT = $(srcdir)/Support/generate-text-files.pl -+subdir = Docs - mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs - CONFIG_HEADER = ../config.h - CONFIG_CLEAN_FILES = - SCRIPTS = $(noinst_SCRIPTS) - -+DIST_SOURCES = - TEXI2DVI = texi2dvi - INFO_DEPS = mysql.info - DVIS = manual.dvi -@@ -189,19 +201,18 @@ - DIST_COMMON = Makefile.am Makefile.in - - --DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST) -+DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) - --TAR = gtar - 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 - cd $(top_builddir) \ -- && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status -+ && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= CONFIG_LINKS= $(SHELL) ./config.status - - - mysql.info: manual.texi -@@ -258,7 +269,7 @@ - @list='$(INFO_DEPS)'; \ - for file in $$list; do \ - d=$(srcdir); \ -- for ifile in `cd $$d && echo $$file $$file-[0-9] $$file-[0-9][0-9]`; do \ -+ for ifile in `CDPATH=: && cd $$d && echo $$file $$file-[0-9] $$file-[0-9][0-9]`; do \ - if test -f $$d/$$ifile; then \ - echo " $(INSTALL_DATA) $$d/$$ifile $(DESTDIR)$(infodir)/$$ifile"; \ - $(INSTALL_DATA) $$d/$$ifile $(DESTDIR)$(infodir)/$$ifile; \ -@@ -277,42 +288,41 @@ - uninstall-info: - $(PRE_UNINSTALL) - @if $(SHELL) -c 'install-info --version | sed 1q | fgrep -s -v -i debian' >/dev/null 2>&1; then \ -- ii=yes; \ -- else ii=; fi; \ -- list='$(INFO_DEPS)'; \ -- for file in $$list; do \ -- test -z "$ii" \ -- || install-info --info-dir=$(DESTDIR)$(infodir) --remove $$file; \ -- done -+ list='$(INFO_DEPS)'; \ -+ for file in $$list; do \ -+ echo " install-info --info-dir=$(DESTDIR)$(infodir) --remove $(DESTDIR)$(infodir)/$$file"; \ -+ install-info --info-dir=$(DESTDIR)$(infodir) --remove $(DESTDIR)$(infodir)/$$file; \ -+ done; \ -+ else :; fi - @$(NORMAL_UNINSTALL) -- list='$(INFO_DEPS)'; \ -+ @list='$(INFO_DEPS)'; \ - for file in $$list; do \ -- (cd $(DESTDIR)$(infodir) && rm -f $$file $$file-[0-9] $$file-[0-9][0-9]); \ -+ (if cd $(DESTDIR)$(infodir); then \ -+ echo " rm -f $$file $$file-[0-9] $$file-[0-9][0-9])"; \ -+ rm -f $$file $$file-[0-9] $$file-[0-9][0-9]; \ -+ else :; fi); \ - done - - dist-info: $(INFO_DEPS) - list='$(INFO_DEPS)'; \ - for base in $$list; do \ - d=$(srcdir); \ -- for file in `cd $$d && eval echo $$base*`; do \ -+ for file in `CDPATH=: && cd $$d && eval echo $$base*`; do \ - test -f $(distdir)/$$file \ -- || ln $$d/$$file $(distdir)/$$file 2> /dev/null \ - || cp -p $$d/$$file $(distdir)/$$file; \ - done; \ - done - - mostlyclean-aminfo: - -rm -f manual.aux manual.cp manual.cps manual.dvi manual.fn manual.fns \ -- manual.ky manual.kys manual.ps manual.log manual.pg \ -- manual.toc manual.tp manual.tps manual.vr manual.vrs \ -- manual.op manual.tr manual.cv manual.cn -- --clean-aminfo: -- --distclean-aminfo: -+ manual.pgs manual.ky manual.kys manual.ps manual.log \ -+ manual.pg manual.toc manual.tp manual.tps manual.vr \ -+ manual.vrs manual.op manual.tr manual.cv manual.cn manual.cm \ -+ manual.ov - - maintainer-clean-aminfo: -- cd $(srcdir) && for i in $(INFO_DEPS); do \ -+ cd $(srcdir) && \ -+ for i in $(INFO_DEPS); do \ - rm -f $$i; \ - if test "`echo $$i-[0-9]*`" != "$$i-[0-9]*"; then \ - rm -f $$i-[0-9]*; \ -@@ -324,18 +334,18 @@ - - distdir = $(top_builddir)/$(PACKAGE)-$(VERSION)/$(subdir) - --subdir = Docs - - distdir: $(DISTFILES) -- $(mkinstalldirs) $(distdir)/Support -+ $(mkinstalldirs) $(distdir)/Support Support - @for file in $(DISTFILES); do \ - d=$(srcdir); \ - if test -d $$d/$$file; then \ -- cp -pr $$d/$$file $(distdir)/$$file; \ -+ cp -pR $$d/$$file $(distdir) \ -+ || exit 1; \ - else \ - test -f $(distdir)/$$file \ -- || ln $$d/$$file $(distdir)/$$file 2> /dev/null \ -- || cp -p $$d/$$file $(distdir)/$$file || :; \ -+ || cp -p $$d/$$file $(distdir)/$$file \ -+ || exit 1; \ - fi; \ - done - $(MAKE) $(AM_MAKEFLAGS) top_distdir="$(top_distdir)" distdir="$(distdir)" dist-info -@@ -348,6 +358,9 @@ - check: check-am - installcheck-am: - installcheck: installcheck-am -+all-redirect: $(BUILT_SOURCES) -+ $(MAKE) $(AM_MAKEFLAGS) all-am -+ - install-exec-am: - install-exec: install-exec-am - -@@ -360,9 +373,8 @@ - uninstall-am: uninstall-info - uninstall: uninstall-am - all-am: Makefile $(INFO_DEPS) $(SCRIPTS) --all-redirect: all-am - install-strip: -- $(MAKE) $(AM_MAKEFLAGS) AM_INSTALL_PROGRAM_FLAGS=-s install -+ $(MAKE) $(AM_MAKEFLAGS) INSTALL_STRIP_FLAG=-s install - installdirs: - $(mkinstalldirs) $(DESTDIR)$(infodir) - -@@ -376,34 +388,35 @@ - -rm -f config.cache config.log stamp-h stamp-h[0-9]* - - maintainer-clean-generic: -+ @echo "This command is intended for maintainers to use" -+ @echo "it deletes files that may require special tools to rebuild." -+ -rm -f Makefile.in - -test -z "$(BUILT_SOURCES)" || rm -f $(BUILT_SOURCES) --mostlyclean-am: mostlyclean-aminfo mostlyclean-generic -- --mostlyclean: mostlyclean-am -- --clean-am: clean-aminfo clean-generic mostlyclean-am -- - clean: clean-am - --distclean-am: distclean-aminfo distclean-generic clean-am -- -rm -f libtool -+clean-am: clean-generic mostlyclean-am - - distclean: distclean-am - --maintainer-clean-am: maintainer-clean-aminfo 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." -+distclean-am: clean-am distclean-generic - - maintainer-clean: maintainer-clean-am - --.PHONY: install-info-am uninstall-info mostlyclean-aminfo \ --distclean-aminfo clean-aminfo maintainer-clean-aminfo 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 -+maintainer-clean-am: distclean-am maintainer-clean-aminfo \ -+ maintainer-clean-generic -+ -+mostlyclean: mostlyclean-am -+ -+mostlyclean-am: mostlyclean-aminfo mostlyclean-generic -+ -+.PHONY: all-redirect check check-am clean clean-generic distclean \ -+ distclean-generic distdir dvi dvi-am info info-am install \ -+ install-am install-data install-data-am install-exec \ -+ install-exec-am install-info-am install-strip installcheck \ -+ installcheck-am installdirs maintainer-clean \ -+ maintainer-clean-aminfo maintainer-clean-generic mostlyclean \ -+ mostlyclean-aminfo mostlyclean-generic uninstall uninstall-am \ -+ uninstall-info - - - all: $(targets) txt_files -diff -r -N -U3 mysql-3.23.32.orig/Makefile.in mysql-3.23.32/Makefile.in ---- mysql-3.23.32.orig/Makefile.in Mon Jan 22 14:43:54 2001 -+++ mysql-3.23.32/Makefile.in Thu Mar 1 17:00:49 2001 -@@ -1,6 +1,7 @@ --# Makefile.in generated automatically by automake 1.4 from Makefile.am -+# Makefile.in generated automatically by automake 1.4d from Makefile.am - --# Copyright (C) 1994, 1995-8, 1999 Free Software Foundation, Inc. -+# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001 -+# Free Software Foundation, Inc. - # This Makefile.in is free software; the Free Software Foundation - # gives unlimited permission to copy and/or distribute it, - # with or without modifications, as long as this notice is preserved. -@@ -10,25 +11,6 @@ - # even the implied warranty of MERCHANTABILITY or FITNESS FOR A - # PARTICULAR PURPOSE. - --# Copyright (C) 2000 MySQL AB & MySQL Finland AB & TCX DataKonsult AB --# --# This program is free software; you can redistribute it and/or modify --# it under the terms of the GNU General Public License as published by --# the Free Software Foundation; either version 2 of the License, or --# (at your option) any later version. --# --# This program is distributed in the hope that it will be useful, --# but WITHOUT ANY WARRANTY; without even the implied warranty of --# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the --# GNU General Public License for more details. --# --# You should have received a copy of the GNU General Public License --# along with this program; if not, write to the Free Software --# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -- --# Process this file with automake to create Makefile.in -- -- - SHELL = @SHELL@ - - srcdir = @srcdir@ -@@ -50,8 +32,6 @@ - includedir = @includedir@ - oldincludedir = /usr/include - --DESTDIR = -- - pkgdatadir = $(datadir)/@PACKAGE@ - pkglibdir = $(libdir)/@PACKAGE@ - pkgincludedir = $(includedir)/@PACKAGE@ -@@ -64,9 +44,11 @@ - AUTOHEADER = @AUTOHEADER@ - - INSTALL = @INSTALL@ --INSTALL_PROGRAM = @INSTALL_PROGRAM@ $(AM_INSTALL_PROGRAM_FLAGS) -+INSTALL_PROGRAM = @INSTALL_PROGRAM@ - INSTALL_DATA = @INSTALL_DATA@ - INSTALL_SCRIPT = @INSTALL_SCRIPT@ -+INSTALL_STRIP_FLAG = -+INSTALL_HEADER = $(INSTALL_DATA) - transform = @program_transform_name@ - - NORMAL_INSTALL = : -@@ -75,6 +57,8 @@ - NORMAL_UNINSTALL = : - PRE_UNINSTALL = : - POST_UNINSTALL = : -+ -+@SET_MAKE@ - build_alias = @build_alias@ - build_triplet = @build@ - host_alias = @host_alias@ -@@ -82,6 +66,8 @@ - target_alias = @target_alias@ - target_triplet = @target@ - ALLOCA = @ALLOCA@ -+AMDEP = @AMDEP@ -+AMTAR = @AMTAR@ - AS = @AS@ - AVAILABLE_LANGUAGES = @AVAILABLE_LANGUAGES@ - AVAILABLE_LANGUAGES_ERRORS = @AVAILABLE_LANGUAGES_ERRORS@ -@@ -103,6 +89,7 @@ - CXX = @CXX@ - CXXFLAGS = @CXXFLAGS@ - CXXLDFLAGS = @CXXLDFLAGS@ -+DEPDIR = @DEPDIR@ - DLLTOOL = @DLLTOOL@ - DOT_FRM_VERSION = @DOT_FRM_VERSION@ - FIND_PROC = @FIND_PROC@ -@@ -156,11 +143,13 @@ - VERSION = @VERSION@ - WRAPLIBS = @WRAPLIBS@ - YACC = @YACC@ -+_am_include = @_am_include@ - bdb_includes = @bdb_includes@ - bdb_libs = @bdb_libs@ - bench_dirs = @bench_dirs@ - default_charset = @default_charset@ - docs_dirs = @docs_dirs@ -+install_sh = @install_sh@ - linked_client_targets = @linked_client_targets@ - readline_dir = @readline_dir@ - readline_link = @readline_link@ -@@ -170,37 +159,63 @@ - thread_dirs = @thread_dirs@ - uname_prog = @uname_prog@ - -+# Copyright (C) 2000 MySQL AB & MySQL Finland AB & TCX DataKonsult AB -+# -+# This program is free software; you can redistribute it and/or modify -+# it under the terms of the GNU General Public License as published by -+# the Free Software Foundation; either version 2 of the License, or -+# (at your option) any later version. -+# -+# This program is distributed in the hope that it will be useful, -+# but WITHOUT ANY WARRANTY; without even the implied warranty of -+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -+# GNU General Public License for more details. -+# -+# You should have received a copy of the GNU General Public License -+# along with this program; if not, write to the Free Software -+# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -+ -+# Process this file with automake to create Makefile.in -+ -+ - AUTOMAKE_OPTIONS = foreign - TAR = gtar - # These are built from source in the Docs directory --EXTRA_DIST = INSTALL-SOURCE README COPYING COPYING.LIB MIRRORS -+EXTRA_DIST = INSTALL-SOURCE README \ -+ COPYING COPYING.LIB MIRRORS - --SUBDIRS = include @docs_dirs@ @readline_dir@ @thread_dirs@ @sql_client_dirs@ @sql_server_dirs@ scripts tests man @bench_dirs@ support-files -+SUBDIRS = include @docs_dirs@ @readline_dir@ \ -+ @thread_dirs@ @sql_client_dirs@ \ -+ @sql_server_dirs@ scripts tests man \ -+ @bench_dirs@ support-files - - - # Relink after clean - CLEANFILES = linked_client_sources linked_server_sources linked_libmysql_sources linked_libmysql_r_sources linked_include_sources -+subdir = . - ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 - mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs - CONFIG_HEADER = config.h - CONFIG_CLEAN_FILES = -+DIST_SOURCES = - DIST_COMMON = README ./stamp-h.in COPYING COPYING.LIB Makefile.am \ - Makefile.in acconfig.h acinclude.m4 aclocal.m4 config.guess config.h.in \ - config.sub configure configure.in install-sh ltconfig ltmain.sh missing \ - mkinstalldirs - - --DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST) -+DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) - - GZIP_ENV = --best -+DIST_SUBDIRS = $(SUBDIRS) - 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 - cd $(top_builddir) \ -- && CONFIG_FILES=$@ CONFIG_HEADERS= $(SHELL) ./config.status -+ && CONFIG_FILES=$@ CONFIG_HEADERS= CONFIG_LINKS= $(SHELL) ./config.status - - $(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ configure.in acinclude.m4 - cd $(srcdir) && $(ACLOCAL) -@@ -210,37 +225,32 @@ - $(srcdir)/configure: @MAINTAINER_MODE_TRUE@$(srcdir)/configure.in $(ACLOCAL_M4) $(CONFIGURE_DEPENDENCIES) - cd $(srcdir) && $(AUTOCONF) - stamp-h: $(srcdir)/config.h.in $(top_builddir)/config.status -+ @rm -f stamp-h stamp-hT -+ @echo timestamp > stamp-hT 2> /dev/null - cd $(top_builddir) \ - && CONFIG_FILES= CONFIG_HEADERS=config.h \ - $(SHELL) ./config.status -- @echo timestamp > stamp-h 2> /dev/null --$(srcdir)/config.h.in: @MAINTAINER_MODE_TRUE@$(srcdir)/stamp-h.in -+ @mv stamp-hT stamp-h -+$(srcdir)/config.h.in: @MAINTAINER_MODE_TRUE@$(srcdir)/./stamp-h.in - @if test ! -f $@; then \ -- rm -f $(srcdir)/stamp-h.in; \ -- $(MAKE) $(srcdir)/stamp-h.in; \ -+ rm -f $(srcdir)/./stamp-h.in; \ -+ $(MAKE) $(srcdir)/./stamp-h.in; \ - else :; fi --$(srcdir)/stamp-h.in: $(top_srcdir)/configure.in $(ACLOCAL_M4) acconfig.h -+$(srcdir)/./stamp-h.in: $(top_srcdir)/configure.in $(ACLOCAL_M4) acconfig.h -+ @rm -f $(srcdir)/./stamp-h.in $(srcdir)/./stamp-h.inT -+ @echo timestamp > $(srcdir)/./stamp-h.inT 2> /dev/null - cd $(top_srcdir) && $(AUTOHEADER) -- @echo timestamp > $(srcdir)/stamp-h.in 2> /dev/null -- --mostlyclean-hdr: -- --clean-hdr: -+ @mv $(srcdir)/./stamp-h.inT $(srcdir)/./stamp-h.in - - distclean-hdr: - -rm -f config.h - --maintainer-clean-hdr: -- - # This directory's subdirectories are mostly independent; you can cd - # into them and run `make' without going through this Makefile. - # To change the values of `make' variables: instead of editing Makefiles, - # (1) if the variable is set in `config.status', edit `config.status' - # (which will cause the Makefiles to be regenerated when you run `make'); - # (2) otherwise, pass the desired values on the `make' command line. -- --@SET_MAKE@ -- - all-recursive install-data-recursive install-exec-recursive \ - installdirs-recursive install-recursive uninstall-recursive \ - check-recursive installcheck-recursive info-recursive dvi-recursive: -@@ -266,11 +276,16 @@ - maintainer-clean-recursive: - @set fnord $(MAKEFLAGS); amf=$$2; \ - dot_seen=no; \ -- rev=''; list='$(SUBDIRS)'; for subdir in $$list; do \ -- rev="$$subdir $$rev"; \ -- test "$$subdir" = "." && dot_seen=yes; \ -+ case "$@" in \ -+ distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \ -+ *) list='$(SUBDIRS)' ;; \ -+ esac; \ -+ rev=''; for subdir in $$list; do \ -+ if test "$$subdir" = "."; then :; else \ -+ rev="$$subdir $$rev"; \ -+ fi; \ - done; \ -- test "$$dot_seen" = "no" && rev=". $$rev"; \ -+ rev="$$rev ."; \ - target=`echo $@ | sed s/-recursive//`; \ - for subdir in $$rev; do \ - echo "Making $$target in $$subdir"; \ -@@ -289,15 +304,17 @@ - - tags: TAGS - --ID: $(HEADERS) $(SOURCES) $(LISP) -- list='$(SOURCES) $(HEADERS)'; \ -- unique=`for i in $$list; do echo $$i; done | \ -- awk ' { files[$$0] = 1; } \ -+ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) -+ list='$(SOURCES) $(HEADERS) $(TAGS_FILES)'; \ -+ unique=`for i in $$list; do \ -+ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ -+ done | \ -+ $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ -- here=`pwd` && cd $(srcdir) \ -- && mkid -f$$here/ID $$unique $(LISP) -+ mkid -fID $$unique $(LISP) - --TAGS: tags-recursive $(HEADERS) $(SOURCES) config.h.in $(TAGS_DEPENDENCIES) $(LISP) -+TAGS: tags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ -+ $(TAGS_FILES) $(LISP) - tags=; \ - here=`pwd`; \ - list='$(SUBDIRS)'; for subdir in $$list; do \ -@@ -305,68 +322,87 @@ - test -f $$subdir/TAGS && tags="$$tags -i $$here/$$subdir/TAGS"; \ - fi; \ - done; \ -- list='$(SOURCES) $(HEADERS)'; \ -- unique=`for i in $$list; do echo $$i; done | \ -- awk ' { files[$$0] = 1; } \ -+ list='$(SOURCES) $(HEADERS) $(TAGS_FILES)'; \ -+ unique=`for i in $$list; do \ -+ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ -+ done | \ -+ $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ -- test -z "$(ETAGS_ARGS)config.h.in$$unique$(LISP)$$tags" \ -- || (cd $(srcdir) && etags $(ETAGS_ARGS) $$tags config.h.in $$unique $(LISP) -o $$here/TAGS) -+ test -z "$(ETAGS_ARGS)$$unique$(LISP)$$tags" \ -+ || etags $(ETAGS_ARGS) $$tags $$unique $(LISP) - --mostlyclean-tags: -- --clean-tags: -+GTAGS: -+ here=`CDPATH=: && cd $(top_builddir) && pwd` \ -+ && cd $(top_srcdir) \ -+ && gtags -i $$here - - distclean-tags: - -rm -f TAGS ID - --maintainer-clean-tags: -- - distdir = $(PACKAGE)-$(VERSION) - top_distdir = $(distdir) - -+ - # This target untars the dist file and tries a VPATH configuration. Then - # it guarantees that the distribution is self-contained by making another - # tarfile. - distcheck: dist -- -rm -rf $(distdir) -- GZIP=$(GZIP_ENV) $(TAR) zxf $(distdir).tar.gz -+ -chmod -R a+w $(distdir) > /dev/null 2>&1; rm -rf $(distdir) -+ GZIP=$(GZIP_ENV) gunzip -c $(distdir).tar.gz | $(AMTAR) xf - -+ chmod -R a-w $(distdir); chmod a+w $(distdir) - mkdir $(distdir)/=build - mkdir $(distdir)/=inst -- dc_install_base=`cd $(distdir)/=inst && pwd`; \ -- cd $(distdir)/=build \ -+ chmod a-w $(distdir) -+ dc_install_base=`CDPATH=: && cd $(distdir)/=inst && pwd` \ -+ && cd $(distdir)/=build \ - && ../configure --srcdir=.. --prefix=$$dc_install_base \ - && $(MAKE) $(AM_MAKEFLAGS) \ - && $(MAKE) $(AM_MAKEFLAGS) dvi \ - && $(MAKE) $(AM_MAKEFLAGS) check \ - && $(MAKE) $(AM_MAKEFLAGS) install \ - && $(MAKE) $(AM_MAKEFLAGS) installcheck \ -- && $(MAKE) $(AM_MAKEFLAGS) dist -- -rm -rf $(distdir) -+ && $(MAKE) $(AM_MAKEFLAGS) uninstall \ -+ && test `find $$dc_install_base -type f -print | wc -l` -le 1 \ -+ && $(MAKE) $(AM_MAKEFLAGS) dist \ -+ && $(MAKE) $(AM_MAKEFLAGS) distclean \ -+ && rm -f $(distdir).tar.gz \ -+ && test `find . -type f -print | wc -l` -eq 0 -+ -chmod -R a+w $(distdir) > /dev/null 2>&1; rm -rf $(distdir) - @banner="$(distdir).tar.gz is ready for distribution"; \ - dashes=`echo "$$banner" | sed s/./=/g`; \ - echo "$$dashes"; \ - echo "$$banner"; \ - echo "$$dashes" - dist: distdir -- -chmod -R a+r $(distdir) -- GZIP=$(GZIP_ENV) $(TAR) chozf $(distdir).tar.gz $(distdir) -- -rm -rf $(distdir) -+ -find $(distdir) -type d ! -perm -777 -exec chmod a+rwx {} \; -o \ -+ ! -type d ! -perm -444 -links 1 -exec chmod a+r {} \; -o \ -+ ! -type d ! -perm -400 -exec chmod a+r {} \; -o \ -+ ! -type d ! -perm -444 -exec $(SHELL) $(install_sh) -c -m a+r {} {} \; \ -+ || chmod -R a+r $(distdir) -+ $(AMTAR) chof - $(distdir) | GZIP=$(GZIP_ENV) gzip -c > $(distdir).tar.gz -+ -chmod -R a+w $(distdir) > /dev/null 2>&1; rm -rf $(distdir) - dist-all: distdir -- -chmod -R a+r $(distdir) -- GZIP=$(GZIP_ENV) $(TAR) chozf $(distdir).tar.gz $(distdir) -- -rm -rf $(distdir) -+ -find $(distdir) -type d ! -perm -777 -exec chmod a+rwx {} \; -o \ -+ ! -type d ! -perm -444 -links 1 -exec chmod a+r {} \; -o \ -+ ! -type d ! -perm -400 -exec chmod a+r {} \; -o \ -+ ! -type d ! -perm -444 -exec $(SHELL) $(install_sh) -c -m a+r {} {} \; \ -+ || chmod -R a+r $(distdir) -+ $(AMTAR) chof - $(distdir) | GZIP=$(GZIP_ENV) gzip -c > $(distdir).tar.gz -+ -chmod -R a+w $(distdir) > /dev/null 2>&1; rm -rf $(distdir) -+ - distdir: $(DISTFILES) -- -rm -rf $(distdir) -+ -chmod -R a+w $(distdir) > /dev/null 2>&1; rm -rf $(distdir) - mkdir $(distdir) -- -chmod 777 $(distdir) -+ $(mkinstalldirs) $(distdir)/include include - @for file in $(DISTFILES); do \ - d=$(srcdir); \ - if test -d $$d/$$file; then \ -- cp -pr $$d/$$file $(distdir)/$$file; \ -+ cp -pR $$d/$$file $(distdir) \ -+ || exit 1; \ - else \ - test -f $(distdir)/$$file \ -- || ln $$d/$$file $(distdir)/$$file 2> /dev/null \ -- || cp -p $$d/$$file $(distdir)/$$file || :; \ -+ || cp -p $$d/$$file $(distdir)/$$file \ -+ || exit 1; \ - fi; \ - done - for subdir in $(SUBDIRS); do \ -@@ -374,8 +410,8 @@ - test -d $(distdir)/$$subdir \ - || mkdir $(distdir)/$$subdir \ - || exit 1; \ -- chmod 777 $(distdir)/$$subdir; \ -- (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) top_distdir=../$(distdir) distdir=../$(distdir)/$$subdir distdir) \ -+ (cd $$subdir && \ -+ $(MAKE) $(AM_MAKEFLAGS) top_distdir=../$(distdir) distdir=../$(distdir)/$$subdir distdir) \ - || exit 1; \ - fi; \ - done -@@ -387,7 +423,7 @@ - check: check-recursive - installcheck-am: - installcheck: installcheck-recursive --all-recursive-am: config.h -+all-redirect: config.h - $(MAKE) $(AM_MAKEFLAGS) all-recursive - - install-exec-am: -@@ -402,9 +438,8 @@ - uninstall-am: - uninstall: uninstall-recursive - all-am: Makefile config.h --all-redirect: all-recursive-am - install-strip: -- $(MAKE) $(AM_MAKEFLAGS) AM_INSTALL_PROGRAM_FLAGS=-s install -+ $(MAKE) $(AM_MAKEFLAGS) INSTALL_STRIP_FLAG=-s install - installdirs: installdirs-recursive - installdirs-am: - -@@ -419,40 +454,39 @@ - -rm -f config.cache config.log stamp-h stamp-h[0-9]* - - maintainer-clean-generic: --mostlyclean-am: mostlyclean-hdr mostlyclean-tags mostlyclean-generic -- --mostlyclean: mostlyclean-recursive -- --clean-am: clean-hdr clean-tags clean-generic mostlyclean-am -- -+ @echo "This command is intended for maintainers to use" -+ @echo "it deletes files that may require special tools to rebuild." -+ -rm -f Makefile.in - clean: clean-recursive - --distclean-am: distclean-hdr distclean-tags distclean-generic clean-am -- -rm -f libtool -+clean-am: clean-generic mostlyclean-am - - distclean: distclean-recursive - -rm -f config.status - --maintainer-clean-am: maintainer-clean-hdr maintainer-clean-tags \ -- 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." -+distclean-am: clean-am distclean-generic distclean-hdr distclean-tags - - maintainer-clean: maintainer-clean-recursive - -rm -f config.status - --.PHONY: mostlyclean-hdr distclean-hdr clean-hdr maintainer-clean-hdr \ --install-data-recursive uninstall-data-recursive install-exec-recursive \ --uninstall-exec-recursive installdirs-recursive uninstalldirs-recursive \ --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 all-recursive-am \ --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 -+maintainer-clean-am: distclean-am maintainer-clean-generic -+ -+mostlyclean: mostlyclean-recursive -+ -+mostlyclean-am: mostlyclean-generic -+ -+.PHONY: all-recursive all-redirect check check-am check-recursive clean \ -+ clean-generic clean-recursive distclean distclean-generic \ -+ distclean-hdr distclean-recursive distclean-tags distdir dvi \ -+ dvi-am dvi-recursive info info-am info-recursive install \ -+ install-am install-data install-data-am install-data-recursive \ -+ install-exec install-exec-am install-exec-recursive \ -+ install-recursive install-strip installcheck installcheck-am \ -+ installcheck-recursive installdirs installdirs-am \ -+ installdirs-recursive maintainer-clean maintainer-clean-generic \ -+ maintainer-clean-recursive mostlyclean mostlyclean-generic \ -+ mostlyclean-recursive tags tags-recursive uninstall \ -+ uninstall-am uninstall-recursive - - - # This is just so that the linking is done early. -diff -r -N -U3 mysql-3.23.32.orig/acinclude.m4 mysql-3.23.32/acinclude.m4 ---- mysql-3.23.32.orig/acinclude.m4 Mon Jan 22 14:37:02 2001 -+++ mysql-3.23.32/acinclude.m4 Thu Mar 1 16:59:59 2001 -@@ -744,12 +744,12 @@ - if test X"$bdb_version_ok" = Xyes; then - save_LDFLAGS="$LDFLAGS" - LDFLAGS="-L$lib $LDFLAGS" -- AC_CHECK_LIB(db,db_env_create, [ -+ AC_CHECK_LIB(db-3.2,db_env_create, [ - bdb_dir_ok=installed - MYSQL_TOP_BUILDDIR([inc]) - MYSQL_TOP_BUILDDIR([lib]) - bdb_includes="-I$inc" -- bdb_libs="-L$lib -ldb" -+ bdb_libs="-L$lib -ldb-3.2" - ]) - LDFLAGS="$save_LDFLAGS" - else -@@ -777,7 +777,7 @@ - bdb="$dir" - MYSQL_TOP_BUILDDIR([dir]) - bdb_includes="-I$dir/build_unix" -- bdb_libs="-L$dir/build_unix -ldb" -+ bdb_libs="-L$dir/build_unix -ldb-3.2" - else - bdb_dir_ok="$bdb_version_ok" - fi -diff -r -N -U3 mysql-3.23.32.orig/aclocal.m4 mysql-3.23.32/aclocal.m4 ---- mysql-3.23.32.orig/aclocal.m4 Mon Jan 22 14:37:09 2001 -+++ mysql-3.23.32/aclocal.m4 Thu Mar 1 17:00:04 2001 -@@ -1,14 +1,15 @@ --dnl aclocal.m4 generated automatically by aclocal 1.4 -+# aclocal.m4 generated automatically by aclocal 1.4d - --dnl Copyright (C) 1994, 1995-8, 1999 Free Software Foundation, Inc. --dnl This file is free software; the Free Software Foundation --dnl gives unlimited permission to copy and/or distribute it, --dnl with or without modifications, as long as this notice is preserved. -- --dnl This program is distributed in the hope that it will be useful, --dnl but WITHOUT ANY WARRANTY, to the extent permitted by law; without --dnl even the implied warranty of MERCHANTABILITY or FITNESS FOR A --dnl PARTICULAR PURPOSE. -+# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000 -+# Free Software Foundation, Inc. -+# This file is free software; the Free Software Foundation -+# gives unlimited permission to copy and/or distribute it, -+# with or without modifications, as long as this notice is preserved. -+ -+# This program is distributed in the hope that it will be useful, -+# but WITHOUT ANY WARRANTY, to the extent permitted by law; without -+# even the implied warranty of MERCHANTABILITY or FITNESS FOR A -+# PARTICULAR PURPOSE. - - # Local macros for automake & autoconf - -@@ -756,12 +757,12 @@ - if test X"$bdb_version_ok" = Xyes; then - save_LDFLAGS="$LDFLAGS" - LDFLAGS="-L$lib $LDFLAGS" -- AC_CHECK_LIB(db,db_env_create, [ -+ AC_CHECK_LIB(db-3.2,db_env_create, [ - bdb_dir_ok=installed - MYSQL_TOP_BUILDDIR([inc]) - MYSQL_TOP_BUILDDIR([lib]) - bdb_includes="-I$inc" -- bdb_libs="-L$lib -ldb" -+ bdb_libs="-L$lib -ldb-3.2" - ]) - LDFLAGS="$save_LDFLAGS" - else -@@ -789,7 +790,7 @@ - bdb="$dir" - MYSQL_TOP_BUILDDIR([dir]) - bdb_includes="-I$dir/build_unix" -- bdb_libs="-L$dir/build_unix -ldb" -+ bdb_libs="-L$dir/build_unix -ldb-3.2" - else - bdb_dir_ok="$bdb_version_ok" - fi -@@ -996,80 +997,379 @@ - # some checks are only needed if your package does certain things. - # But this isn't really a big deal. - --# serial 1 -+# serial 5 - --dnl Usage: --dnl AM_INIT_AUTOMAKE(package,version, [no-define]) -+# There are a few dirty hacks below to avoid letting `AC_PROG_CC' be -+# written in clear, in which case automake, when reading aclocal.m4, -+# will think it sees a *use*, and therefore will trigger all it's -+# C support machinery. Also note that it means that autoscan, seeing -+# CC etc. in the Makefile, will ask for an AC_PROG_CC use... -+ -+ -+# We require 2.13 because we rely on SHELL being computed by configure. -+AC_PREREQ([2.13]) -+ -+# AC_PROVIDE_IFELSE(MACRO-NAME, IF-PROVIDED, IF-NOT-PROVIDED) -+# ----------------------------------------------------------- -+# If MACRO-NAME is provided do IF-PROVIDED, else IF-NOT-PROVIDED. -+# The purpose of this macro is to provide the user with a means to -+# check macros which are provided without letting her know how the -+# information is coded. -+# If this macro is not defined by Autoconf, define it here. -+ifdef([AC_PROVIDE_IFELSE], -+ [], -+ [define([AC_PROVIDE_IFELSE], -+ [ifdef([AC_PROVIDE_$1], -+ [$2], [$3])])]) -+ -+ -+# AM_INIT_AUTOMAKE(PACKAGE,VERSION, [NO-DEFINE]) -+# ---------------------------------------------- -+AC_DEFUN([AM_INIT_AUTOMAKE], -+[AC_REQUIRE([AC_PROG_INSTALL])dnl -+# test to see if srcdir already configured -+if test "`CDPATH=:; cd $srcdir && pwd`" != "`pwd`" && -+ test -f $srcdir/config.status; then -+ AC_MSG_ERROR([source directory already configured; run \"make distclean\" there first]) -+fi -+ -+# Define the identity of the package. -+PACKAGE=$1 -+AC_SUBST(PACKAGE)dnl -+VERSION=$2 -+AC_SUBST(VERSION)dnl -+ifelse([$3],, -+[AC_DEFINE_UNQUOTED(PACKAGE, "$PACKAGE", [Name of package]) -+AC_DEFINE_UNQUOTED(VERSION, "$VERSION", [Version number of package])]) - --AC_DEFUN(AM_INIT_AUTOMAKE, --[AC_REQUIRE([AC_PROG_INSTALL]) --PACKAGE=[$1] --AC_SUBST(PACKAGE) --VERSION=[$2] --AC_SUBST(VERSION) --dnl test to see if srcdir already configured --if test "`cd $srcdir && pwd`" != "`pwd`" && test -f $srcdir/config.status; then -- AC_MSG_ERROR([source directory already configured; run "make distclean" there first]) -+# Autoconf 2.50 wants to disallow AM_ names. We explicitly allow -+# the ones we care about. -+ifdef([m4_pattern_allow], [m4_pattern_allow([AM_CFLAGS])]) -+ifdef([m4_pattern_allow], [m4_pattern_allow([AM_CPPFLAGS])]) -+ifdef([m4_pattern_allow], [m4_pattern_allow([AM_CXXFLAGS])]) -+ifdef([m4_pattern_allow], [m4_pattern_allow([AM_OBJCFLAGS])]) -+ifdef([m4_pattern_allow], [m4_pattern_allow([AM_FFLAGS])]) -+ifdef([m4_pattern_allow], [m4_pattern_allow([AM_RFLAGS])]) -+ifdef([m4_pattern_allow], [m4_pattern_allow([AM_GCJFLAGS])]) -+ -+# Some tools Automake needs. -+AC_REQUIRE([AM_SANITY_CHECK])dnl -+AC_REQUIRE([AC_ARG_PROGRAM])dnl -+AM_MISSING_PROG(ACLOCAL, aclocal) -+AM_MISSING_PROG(AUTOCONF, autoconf) -+AM_MISSING_PROG(AUTOMAKE, automake) -+AM_MISSING_PROG(AUTOHEADER, autoheader) -+AM_MISSING_PROG(MAKEINFO, makeinfo) -+AM_MISSING_PROG(AMTAR, tar) -+AM_MISSING_INSTALL_SH -+# We need awk for the "check" target. The system "awk" is bad on -+# some platforms. -+AC_REQUIRE([AC_PROG_AWK])dnl -+AC_REQUIRE([AC_PROG_MAKE_SET])dnl -+AC_REQUIRE([AM_DEP_TRACK])dnl -+AC_REQUIRE([AM_SET_DEPDIR])dnl -+AC_PROVIDE_IFELSE([AC_PROG_][CC], -+ [AM_DEPENDENCIES(CC)], -+ [define([AC_PROG_][CC], -+ defn([AC_PROG_][CC])[AM_DEPENDENCIES(CC)])])dnl -+AC_PROVIDE_IFELSE([AC_PROG_][CXX], -+ [AM_DEPENDENCIES(CXX)], -+ [define([AC_PROG_][CXX], -+ defn([AC_PROG_][CXX])[AM_DEPENDENCIES(CXX)])])dnl -+]) -+ -+ -+# serial 2 -+ -+# AM_MISSING_PROG(NAME, PROGRAM) -+# ------------------------------ -+AC_DEFUN([AM_MISSING_PROG], -+[AC_REQUIRE([AM_MISSING_HAS_RUN]) -+$1=${$1-"${am_missing_run}$2"} -+AC_SUBST($1)]) -+ -+ -+# AM_MISSING_INSTALL_SH -+# --------------------- -+# Like AM_MISSING_PROG, but only looks for install-sh. -+AC_DEFUN([AM_MISSING_INSTALL_SH], -+[AC_REQUIRE([AM_MISSING_HAS_RUN]) -+if test -z "$install_sh"; then -+ for install_sh in "$ac_aux_dir/install-sh" \ -+ "$ac_aux_dir/install.sh" \ -+ "${am_missing_run}${ac_auxdir}/install-sh"; -+ do -+ test -f "$install_sh" && break -+ done -+ # FIXME: an evil hack: we remove the SHELL invocation from -+ # install_sh because automake adds it back in. Sigh. -+ install_sh=`echo $install_sh | sed -e 's/\${SHELL}//'` -+fi -+AC_SUBST(install_sh)]) -+ -+ -+# AM_MISSING_HAS_RUN -+# ------------------ -+# Define MISSING if not defined so far and test if it supports --run. -+# If it does, set am_missing_run to use it, otherwise, to nothing. -+AC_DEFUN([AM_MISSING_HAS_RUN], -+[test x"${MISSING+set}" = xset || -+ MISSING="\${SHELL} `CDPATH=:; cd $ac_aux_dir && pwd`/missing" -+# Use eval to expand $SHELL -+if eval "$MISSING --run :"; then -+ am_missing_run="$MISSING --run " -+else -+ am_missing_run= -+ am_backtick='`' -+ AC_MSG_WARN([${am_backtick}missing' script is too old or missing]) -+fi -+]) -+ -+# serial 3 -+ -+# There are a few dirty hacks below to avoid letting `AC_PROG_CC' be -+# written in clear, in which case automake, when reading aclocal.m4, -+# will think it sees a *use*, and therefore will trigger all it's -+# C support machinery. Also note that it means that autoscan, seeing -+# CC etc. in the Makefile, will ask for an AC_PROG_CC use... -+ -+# AM_DEPENDENCIES(NAME) -+# --------------------- -+# See how the compiler implements dependency checking. -+# NAME is "CC", "CXX" or "OBJC". -+# We try a few techniques and use that to set a single cache variable. -+AC_DEFUN([AM_DEPENDENCIES], -+[AC_REQUIRE([AM_SET_DEPDIR])dnl -+AC_REQUIRE([AM_OUTPUT_DEPENDENCY_COMMANDS])dnl -+ifelse([$1], CC, -+ [AC_REQUIRE([AC_PROG_][CC])dnl -+AC_REQUIRE([AC_PROG_][CPP]) -+depcc="$CC" -+depcpp="$CPP"], -+ [$1], CXX, [AC_REQUIRE([AC_PROG_][CXX])dnl -+AC_REQUIRE([AC_PROG_][CXXCPP]) -+depcc="$CXX" -+depcpp="$CXXCPP"], -+ [$1], OBJC, [am_cv_OBJC_dependencies_compiler_type=gcc], -+ [AC_REQUIRE([AC_PROG_][$1])dnl -+depcc="$$1" -+depcpp=""]) -+ -+AC_REQUIRE([AM_MAKE_INCLUDE]) -+ -+AC_CACHE_CHECK([dependency style of $depcc], -+ [am_cv_$1_dependencies_compiler_type], -+[if test -z "$AMDEP"; then -+ # We make a subdir and do the tests there. Otherwise we can end up -+ # making bogus files that we don't know about and never remove. For -+ # instance it was reported that on HP-UX the gcc test will end up -+ # making a dummy file named `D' -- because `-MD' means `put the output -+ # in D'. -+ mkdir confdir -+ # Copy depcomp to subdir because otherwise we won't find it if we're -+ # using a relative directory. -+ cp "$am_depcomp" confdir -+ cd confdir -+ -+ am_cv_$1_dependencies_compiler_type=none -+ for depmode in `sed -n ['s/^#*\([a-zA-Z0-9]*\))$/\1/p'] < "./depcomp"`; do -+ # We need to recreate these files for each test, as the compiler may -+ # overwrite some of them when testing with obscure command lines. -+ # This happens at least with the AIX C compiler. -+ echo '#include "conftest.h"' > conftest.c -+ echo 'int i;' > conftest.h -+ -+ case "$depmode" in -+ nosideeffect) -+ # after this tag, mechanisms are not by side-effect, so they'll -+ # only be used when explicitly requested -+ if test "x$enable_dependency_tracking" = xyes; then -+ continue -+ else -+ break -+ fi -+ ;; -+ none) break ;; -+ esac -+ # We check with `-c' and `-o' for the sake of the "dashmstdout" -+ # mode. It turns out that the SunPro C++ compiler does not properly -+ # handle `-M -o', and we need to detect this. -+ if depmode="$depmode" \ -+ source=conftest.c object=conftest.o \ -+ depfile=conftest.Po tmpdepfile=conftest.TPo \ -+ $SHELL ./depcomp $depcc -c conftest.c -o conftest.o >/dev/null 2>&1 && -+ grep conftest.h conftest.Po > /dev/null 2>&1; then -+ am_cv_$1_dependencies_compiler_type="$depmode" -+ break -+ fi -+ done -+ -+ cd .. -+ rm -rf confdir -+else -+ am_cv_$1_dependencies_compiler_type=none - fi --ifelse([$3],, --AC_DEFINE_UNQUOTED(PACKAGE, "$PACKAGE", [Name of package]) --AC_DEFINE_UNQUOTED(VERSION, "$VERSION", [Version number of package])) --AC_REQUIRE([AM_SANITY_CHECK]) --AC_REQUIRE([AC_ARG_PROGRAM]) --dnl FIXME This is truly gross. --missing_dir=`cd $ac_aux_dir && pwd` --AM_MISSING_PROG(ACLOCAL, aclocal, $missing_dir) --AM_MISSING_PROG(AUTOCONF, autoconf, $missing_dir) --AM_MISSING_PROG(AUTOMAKE, automake, $missing_dir) --AM_MISSING_PROG(AUTOHEADER, autoheader, $missing_dir) --AM_MISSING_PROG(MAKEINFO, makeinfo, $missing_dir) --AC_REQUIRE([AC_PROG_MAKE_SET])]) -- --dnl AM_MISSING_PROG(NAME, PROGRAM, DIRECTORY) --dnl The program must properly implement --version. --AC_DEFUN(AM_MISSING_PROG, --[AC_MSG_CHECKING(for working $2) --# 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. --if ($2 --version) < /dev/null > /dev/null 2>&1; then -- $1=$2 -- AC_MSG_RESULT(found) -+]) -+$1DEPMODE="depmode=$am_cv_$1_dependencies_compiler_type" -+AC_SUBST([$1DEPMODE]) -+]) -+ -+ -+# AM_SET_DEPDIR -+# ------------- -+# Choose a directory name for dependency files. -+# This macro is AC_REQUIREd in AM_DEPENDENCIES -+AC_DEFUN([AM_SET_DEPDIR], -+[if test -d .deps || mkdir .deps 2> /dev/null || test -d .deps; then -+ DEPDIR=.deps -+ # We redirect because .deps might already exist and be populated. -+ # In this situation we don't want to see an error. -+ rmdir .deps > /dev/null 2>&1 - else -- $1="$3/missing $2" -- AC_MSG_RESULT(missing) -+ DEPDIR=_deps - fi --AC_SUBST($1)]) -+AC_SUBST(DEPDIR) -+]) - --# Like AC_CONFIG_HEADER, but automatically create stamp file. - --AC_DEFUN(AM_CONFIG_HEADER, --[AC_PREREQ([2.12]) --AC_CONFIG_HEADER([$1]) --dnl When config.status generates a header, we must update the stamp-h file. --dnl This file resides in the same directory as the config header --dnl that is generated. We must strip everything past the first ":", --dnl and everything past the last "/". --AC_OUTPUT_COMMANDS(changequote(<<,>>)dnl --ifelse(patsubst(<<$1>>, <<[^ ]>>, <<>>), <<>>, --<<test -z "<<$>>CONFIG_HEADERS" || echo timestamp > patsubst(<<$1>>, <<^\([^:]*/\)?.*>>, <<\1>>)stamp-h<<>>dnl>>, --<<am_indx=1 --for am_file in <<$1>>; do -- case " <<$>>CONFIG_HEADERS " in -- *" <<$>>am_file "*<<)>> -- echo timestamp > `echo <<$>>am_file | sed -e 's%:.*%%' -e 's%[^/]*$%%'`stamp-h$am_indx -- ;; -+# AM_DEP_TRACK -+# ------------ -+AC_DEFUN([AM_DEP_TRACK], -+[AC_ARG_ENABLE(dependency-tracking, -+[ --disable-dependency-tracking Speeds up one-time builds -+ --enable-dependency-tracking Do not reject slow dependency extractors]) -+if test "x$enable_dependency_tracking" = xno; then -+ AMDEP="#" -+else -+ am_depcomp="$ac_aux_dir/depcomp" -+ if test ! -f "$am_depcomp"; then -+ AMDEP="#" -+ else -+ AMDEP= -+ fi -+fi -+AC_SUBST(AMDEP) -+if test -z "$AMDEP"; then -+ AMDEPBACKSLASH='\' -+else -+ AMDEPBACKSLASH= -+fi -+pushdef([subst], defn([AC_SUBST])) -+subst(AMDEPBACKSLASH) -+popdef([subst]) -+]) -+ -+# Generate code to set up dependency tracking. -+# This macro should only be invoked once -- use via AC_REQUIRE. -+# Usage: -+# AM_OUTPUT_DEPENDENCY_COMMANDS -+ -+# -+# This code is only required when automatic dependency tracking -+# is enabled. FIXME. This creates each `.P' file that we will -+# need in order to bootstrap the dependency handling code. -+AC_DEFUN([AM_OUTPUT_DEPENDENCY_COMMANDS],[ -+AC_OUTPUT_COMMANDS([ -+test x"$AMDEP" != x"" || -+for mf in $CONFIG_FILES; do -+ case "$mf" in -+ Makefile) dirpart=.;; -+ */Makefile) dirpart=`echo "$mf" | sed -e 's|/[^/]*$||'`;; -+ *) continue;; - esac -- am_indx=`expr "<<$>>am_indx" + 1` --done<<>>dnl>>) --changequote([,]))]) -+ grep '^DEP_FILES *= *[^ #]' < "$mf" > /dev/null || continue -+ # Extract the definition of DEP_FILES from the Makefile without -+ # running `make'. -+ DEPDIR=`sed -n -e '/^DEPDIR = / s///p' < "$mf"` -+ test -z "$DEPDIR" && continue -+ # When using ansi2knr, U may be empty or an underscore; expand it -+ U=`sed -n -e '/^U = / s///p' < "$mf"` -+ test -d "$dirpart/$DEPDIR" || mkdir "$dirpart/$DEPDIR" -+ # We invoke sed twice because it is the simplest approach to -+ # changing $(DEPDIR) to its actual value in the expansion. -+ for file in `sed -n -e ' -+ /^DEP_FILES = .*\\\\$/ { -+ s/^DEP_FILES = // -+ :loop -+ s/\\\\$// -+ p -+ n -+ /\\\\$/ b loop -+ p -+ } -+ /^DEP_FILES = / s/^DEP_FILES = //p' < "$mf" | \ -+ sed -e 's/\$(DEPDIR)/'"$DEPDIR"'/g' -e 's/\$U/'"$U"'/g'`; do -+ # Make sure the directory exists. -+ test -f "$dirpart/$file" && continue -+ fdir=`echo "$file" | sed -e 's|/[^/]*$||'` -+ $ac_aux_dir/mkinstalldirs "$dirpart/$fdir" > /dev/null 2>&1 -+ # echo "creating $dirpart/$file" -+ echo '# dummy' > "$dirpart/$file" -+ done -+done -+], [AMDEP="$AMDEP" -+ac_aux_dir="$ac_aux_dir"])]) -+ -+# AM_MAKE_INCLUDE() -+# ----------------- -+# Check to see how make treats includes. -+AC_DEFUN([AM_MAKE_INCLUDE], -+[am_make=${MAKE-make} -+# BSD make uses .include -+cat > confinc << 'END' -+doit: -+ @echo done -+END -+# If we don't find an include directive, just comment out the code. -+AC_MSG_CHECKING([for style of include used by $am_make]) -+_am_include='#' -+for am_inc in include .include; do -+ echo "$am_inc confinc" > confmf -+ if test "`$am_make -f confmf 2> /dev/null`" = "done"; then -+ _am_include=$am_inc -+ break -+ fi -+done -+AC_SUBST(_am_include) -+AC_MSG_RESULT($_am_include) -+rm -f confinc confmf -+]) -+ -+# Like AC_CONFIG_HEADER, but automatically create stamp file. -+ -+# serial 3 -+ -+# When config.status generates a header, we must update the stamp-h file. -+# This file resides in the same directory as the config header -+# that is generated. We must strip everything past the first ":", -+# and everything past the last "/". -+ -+AC_PREREQ([2.12]) -+ -+AC_DEFUN([AM_CONFIG_HEADER], -+[AC_CONFIG_HEADER([$1]) -+ AC_OUTPUT_COMMANDS( -+ ifelse(patsubst([$1], [[^ ]], []), -+ [], -+ [test -z "$CONFIG_HEADERS" || echo timestamp >dnl -+ patsubst([$1], [^\([^:]*/\)?.*], [\1])stamp-h]), -+ [am_indx=1 -+ for am_file in $1; do -+ case " $CONFIG_HEADERS " in -+ *" $am_file "*) -+ echo timestamp > `echo $am_file | sed 's%:.*%%;s%[^/]*$%%'`stamp-h$am_indx -+ ;; -+ esac -+ am_indx=\`expr \$am_indx + 1\` -+ done]) -+]) - - # Add --enable-maintainer-mode option to configure. - # From Jim Meyering - - # serial 1 - --AC_DEFUN(AM_MAINTAINER_MODE, -+AC_DEFUN([AM_MAINTAINER_MODE], - [AC_MSG_CHECKING([whether to enable maintainer-specific portions of Makefiles]) - dnl maintainer-mode is disabled by default - AC_ARG_ENABLE(maintainer-mode, -@@ -1077,18 +1377,21 @@ - (and sometimes confusing) to the casual installer], - USE_MAINTAINER_MODE=$enableval, - USE_MAINTAINER_MODE=no) -- AC_MSG_RESULT($USE_MAINTAINER_MODE) -- AM_CONDITIONAL(MAINTAINER_MODE, test $USE_MAINTAINER_MODE = yes) -+ AC_MSG_RESULT([$USE_MAINTAINER_MODE]) -+ AM_CONDITIONAL(MAINTAINER_MODE, [test $USE_MAINTAINER_MODE = yes]) - MAINT=$MAINTAINER_MODE_TRUE - AC_SUBST(MAINT)dnl - ] - ) - --# Define a conditional. -+# serial 2 - --AC_DEFUN(AM_CONDITIONAL, --[AC_SUBST($1_TRUE) --AC_SUBST($1_FALSE) -+# AM_CONDITIONAL(NAME, SHELL-CONDITION) -+# ------------------------------------- -+# Define a conditional. -+AC_DEFUN([AM_CONDITIONAL], -+[AC_SUBST([$1_TRUE]) -+AC_SUBST([$1_FALSE]) - if $2; then - $1_TRUE= - $1_FALSE='#' -@@ -1149,12 +1452,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" -@@ -1453,31 +1751,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, -@@ -1490,8 +1792,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 -N -U3 mysql-3.23.32.orig/client/Makefile.in mysql-3.23.32/client/Makefile.in ---- mysql-3.23.32.orig/client/Makefile.in Mon Jan 22 14:44:00 2001 -+++ mysql-3.23.32/client/Makefile.in Thu Mar 1 17:01:01 2001 -@@ -1,6 +1,7 @@ --# Makefile.in generated automatically by automake 1.4 from Makefile.am -+# Makefile.in generated automatically by automake 1.4d from Makefile.am - --# Copyright (C) 1994, 1995-8, 1999 Free Software Foundation, Inc. -+# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001 -+# Free Software Foundation, Inc. - # This Makefile.in is free software; the Free Software Foundation - # gives unlimited permission to copy and/or distribute it, - # with or without modifications, as long as this notice is preserved. -@@ -10,25 +11,6 @@ - # even the implied warranty of MERCHANTABILITY or FITNESS FOR A - # PARTICULAR PURPOSE. - --# Copyright (C) 2000 MySQL AB & MySQL Finland AB & TCX DataKonsult AB --# --# This program is free software; you can redistribute it and/or modify --# it under the terms of the GNU General Public License as published by --# the Free Software Foundation; either version 2 of the License, or --# (at your option) any later version. --# --# This program is distributed in the hope that it will be useful, --# but WITHOUT ANY WARRANTY; without even the implied warranty of --# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the --# GNU General Public License for more details. --# --# You should have received a copy of the GNU General Public License --# along with this program; if not, write to the Free Software --# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -- --# This file is public domain and comes with NO WARRANTY of any kind -- -- - SHELL = @SHELL@ - - srcdir = @srcdir@ -@@ -50,8 +32,6 @@ - includedir = @includedir@ - oldincludedir = /usr/include - --DESTDIR = -- - pkgdatadir = $(datadir)/@PACKAGE@ - pkglibdir = $(libdir)/@PACKAGE@ - pkgincludedir = $(includedir)/@PACKAGE@ -@@ -64,9 +44,11 @@ - AUTOHEADER = @AUTOHEADER@ - - INSTALL = @INSTALL@ --INSTALL_PROGRAM = @INSTALL_PROGRAM@ $(AM_INSTALL_PROGRAM_FLAGS) -+INSTALL_PROGRAM = @INSTALL_PROGRAM@ - INSTALL_DATA = @INSTALL_DATA@ - INSTALL_SCRIPT = @INSTALL_SCRIPT@ -+INSTALL_STRIP_FLAG = -+INSTALL_HEADER = $(INSTALL_DATA) - transform = @program_transform_name@ - - NORMAL_INSTALL = : -@@ -75,6 +57,8 @@ - NORMAL_UNINSTALL = : - PRE_UNINSTALL = : - POST_UNINSTALL = : -+ -+@SET_MAKE@ - build_alias = @build_alias@ - build_triplet = @build@ - host_alias = @host_alias@ -@@ -82,6 +66,8 @@ - target_alias = @target_alias@ - target_triplet = @target@ - ALLOCA = @ALLOCA@ -+AMDEP = @AMDEP@ -+AMTAR = @AMTAR@ - AS = @AS@ - AVAILABLE_LANGUAGES = @AVAILABLE_LANGUAGES@ - AVAILABLE_LANGUAGES_ERRORS = @AVAILABLE_LANGUAGES_ERRORS@ -@@ -103,6 +89,7 @@ - CXX = @CXX@ - CXXFLAGS = @CXXFLAGS@ - CXXLDFLAGS = @CXXLDFLAGS@ -+DEPDIR = @DEPDIR@ - DLLTOOL = @DLLTOOL@ - DOT_FRM_VERSION = @DOT_FRM_VERSION@ - FIND_PROC = @FIND_PROC@ -@@ -156,11 +143,13 @@ - VERSION = @VERSION@ - WRAPLIBS = @WRAPLIBS@ - YACC = @YACC@ -+_am_include = @_am_include@ - bdb_includes = @bdb_includes@ - bdb_libs = @bdb_libs@ - bench_dirs = @bench_dirs@ - default_charset = @default_charset@ - docs_dirs = @docs_dirs@ -+install_sh = @install_sh@ - linked_client_targets = @linked_client_targets@ - readline_dir = @readline_dir@ - readline_link = @readline_link@ -@@ -170,7 +159,28 @@ - thread_dirs = @thread_dirs@ - uname_prog = @uname_prog@ - --INCLUDES = -I$(srcdir)/../include -I../include -I$(srcdir)/.. -I$(top_srcdir) -I.. -+# Copyright (C) 2000 MySQL AB & MySQL Finland AB & TCX DataKonsult AB -+# -+# This program is free software; you can redistribute it and/or modify -+# it under the terms of the GNU General Public License as published by -+# the Free Software Foundation; either version 2 of the License, or -+# (at your option) any later version. -+# -+# This program is distributed in the hope that it will be useful, -+# but WITHOUT ANY WARRANTY; without even the implied warranty of -+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -+# GNU General Public License for more details. -+# -+# You should have received a copy of the GNU General Public License -+# along with this program; if not, write to the Free Software -+# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -+ -+# This file is public domain and comes with NO WARRANTY of any kind -+ -+ -+INCLUDES = -I$(srcdir)/../include \ -+ -I../include -I$(srcdir)/.. -I$(top_srcdir) \ -+ -I.. - - LIBS = @CLIENT_LIBS@ - LDADD = @CLIENT_EXTRA_LDFLAGS@ ../libmysql/libmysqlclient.la -@@ -191,6 +201,7 @@ - - # Fix for mit-threads - DEFS = -DUNDEF_THREADS_HACK -+subdir = client - mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs - CONFIG_HEADER = ../config.h - CONFIG_CLEAN_FILES = -@@ -198,16 +209,17 @@ - - CPPFLAGS = @CPPFLAGS@ - LDFLAGS = @LDFLAGS@ --mysql_OBJECTS = mysql.o readline.o sql_string.o completion_hash.o -+insert_test_SOURCES = insert_test.c -+insert_test_OBJECTS = insert_test.o -+insert_test_LDADD = $(LDADD) -+insert_test_LDFLAGS = -+am_mysql_OBJECTS = mysql.o readline.o sql_string.o completion_hash.o -+mysql_OBJECTS = $(am_mysql_OBJECTS) - mysql_LDFLAGS = - mysqladmin_SOURCES = mysqladmin.c - mysqladmin_OBJECTS = mysqladmin.o - mysqladmin_LDADD = $(LDADD) - mysqladmin_LDFLAGS = --mysqlshow_SOURCES = mysqlshow.c --mysqlshow_OBJECTS = mysqlshow.o --mysqlshow_LDADD = $(LDADD) --mysqlshow_LDFLAGS = - mysqldump_SOURCES = mysqldump.c - mysqldump_OBJECTS = mysqldump.o - mysqldump_LDADD = $(LDADD) -@@ -216,13 +228,14 @@ - mysqlimport_OBJECTS = mysqlimport.o - mysqlimport_LDADD = $(LDADD) - mysqlimport_LDFLAGS = --mysqltest_OBJECTS = mysqltest.o -+mysqlshow_SOURCES = mysqlshow.c -+mysqlshow_OBJECTS = mysqlshow.o -+mysqlshow_LDADD = $(LDADD) -+mysqlshow_LDFLAGS = -+am_mysqltest_OBJECTS = mysqltest.o -+mysqltest_OBJECTS = $(am_mysqltest_OBJECTS) - mysqltest_LDADD = $(LDADD) - mysqltest_LDFLAGS = --insert_test_SOURCES = insert_test.c --insert_test_OBJECTS = insert_test.o --insert_test_LDADD = $(LDADD) --insert_test_LDFLAGS = - select_test_SOURCES = select_test.c - select_test_OBJECTS = select_test.o - select_test_LDADD = $(LDADD) -@@ -232,35 +245,45 @@ - thread_test_LDADD = $(LDADD) - thread_test_DEPENDENCIES = ../libmysql/libmysqlclient.la - thread_test_LDFLAGS = -+COMPILE = $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -+LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) - CXXCOMPILE = $(CXX) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) - LTCXXCOMPILE = $(LIBTOOL) --mode=compile $(CXX) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) - CXXLD = $(CXX) --CXXLINK = $(LIBTOOL) --mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(LDFLAGS) -o $@ --COMPILE = $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) --LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -+CXXLINK = $(LIBTOOL) --mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@ - CCLD = $(CC) --LINK = $(LIBTOOL) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(LDFLAGS) -o $@ -+LINK = $(LIBTOOL) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@ -+DIST_SOURCES = insert_test.c $(mysql_SOURCES) mysqladmin.c mysqldump.c \ -+mysqlimport.c mysqlshow.c $(mysqltest_SOURCES) select_test.c \ -+thread_test.c - HEADERS = $(noinst_HEADERS) - --DIST_COMMON = Makefile.am Makefile.in -+depcomp = $(SHELL) $(top_srcdir)/depcomp -+@AMDEP@DEP_FILES = $(DEPDIR)/completion_hash.Po \ -+@AMDEP@$(DEPDIR)/insert_test.Po $(DEPDIR)/mysql.Po \ -+@AMDEP@$(DEPDIR)/mysqladmin.Po $(DEPDIR)/mysqldump.Po \ -+@AMDEP@$(DEPDIR)/mysqlimport.Po $(DEPDIR)/mysqlshow.Po \ -+@AMDEP@$(DEPDIR)/mysqltest.Po $(DEPDIR)/readline.Po \ -+@AMDEP@$(DEPDIR)/select_test.Po $(DEPDIR)/sql_string.Po \ -+@AMDEP@$(DEPDIR)/thread_test.Po -+DIST_COMMON = $(noinst_HEADERS) Makefile.am Makefile.in - - --DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST) -+DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) - --TAR = gtar - GZIP_ENV = --best --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 -+SOURCES = insert_test.c $(mysql_SOURCES) mysqladmin.c mysqldump.c mysqlimport.c mysqlshow.c $(mysqltest_SOURCES) select_test.c thread_test.c -+OBJECTS = insert_test.o $(am_mysql_OBJECTS) mysqladmin.o mysqldump.o mysqlimport.o mysqlshow.o $(am_mysqltest_OBJECTS) select_test.o thread_test.o - --all: all-redirect -+all: all-am - .SUFFIXES: --.SUFFIXES: .S .c .cc .lo .o .s -+.SUFFIXES: .c .cc .lo .o - $(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 - cd $(top_builddir) \ -- && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status -+ && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= CONFIG_LINKS= $(SHELL) ./config.status - - - mostlyclean-binPROGRAMS: -@@ -277,15 +300,18 @@ - $(mkinstalldirs) $(DESTDIR)$(bindir) - @list='$(bin_PROGRAMS)'; for p in $$list; do \ - if test -f $$p; then \ -- echo " $(LIBTOOL) --mode=install $(INSTALL_PROGRAM) $$p $(DESTDIR)$(bindir)/`echo $$p|sed 's/$(EXEEXT)$$//'|sed '$(transform)'|sed 's/$$/$(EXEEXT)/'`"; \ -- $(LIBTOOL) --mode=install $(INSTALL_PROGRAM) $$p $(DESTDIR)$(bindir)/`echo $$p|sed 's/$(EXEEXT)$$//'|sed '$(transform)'|sed 's/$$/$(EXEEXT)/'`; \ -+ f="`echo $$p|sed -e 's/$(EXEEXT)$$//' -e '$(transform)' -e 's/$$/$(EXEEXT)/'`"; \ -+ echo " $(LIBTOOL) --mode=install $(INSTALL_PROGRAM) $(INSTALL_STRIP_FLAG) $$p $(DESTDIR)$(bindir)/$$f"; \ -+ $(LIBTOOL) --mode=install $(INSTALL_PROGRAM) $(INSTALL_STRIP_FLAG) $$p $(DESTDIR)$(bindir)/$$f; \ - else :; fi; \ - done - - uninstall-binPROGRAMS: - @$(NORMAL_UNINSTALL) -- list='$(bin_PROGRAMS)'; for p in $$list; do \ -- rm -f $(DESTDIR)$(bindir)/`echo $$p|sed 's/$(EXEEXT)$$//'|sed '$(transform)'|sed 's/$$/$(EXEEXT)/'`; \ -+ @list='$(bin_PROGRAMS)'; for p in $$list; do \ -+ f="`echo $$p|sed -e 's/$(EXEEXT)$$//' -e '$(transform)' -e 's/$$/$(EXEEXT)/'`"; \ -+ echo " rm -f $(DESTDIR)$(bindir)/$$f"; \ -+ rm -f $(DESTDIR)$(bindir)/$$f; \ - done - - mostlyclean-noinstPROGRAMS: -@@ -297,34 +323,12 @@ - - maintainer-clean-noinstPROGRAMS: - --.c.o: -- $(COMPILE) -c $< -- --.s.o: -- $(COMPILE) -c $< -- --.S.o: -- $(COMPILE) -c $< -- - mostlyclean-compile: - -rm -f *.o core *.core - --clean-compile: -- - distclean-compile: - -rm -f *.tab.c - --maintainer-clean-compile: -- --.c.lo: -- $(LIBTOOL) --mode=compile $(COMPILE) -c $< -- --.s.lo: -- $(LIBTOOL) --mode=compile $(COMPILE) -c $< -- --.S.lo: -- $(LIBTOOL) --mode=compile $(COMPILE) -c $< -- - mostlyclean-libtool: - -rm -f *.lo - -@@ -332,8 +336,11 @@ - -rm -rf .libs _libs - - distclean-libtool: -+ -rm -f libtool - --maintainer-clean-libtool: -+insert_test: $(insert_test_OBJECTS) $(insert_test_DEPENDENCIES) -+ @rm -f insert_test -+ $(LINK) $(insert_test_LDFLAGS) $(insert_test_OBJECTS) $(insert_test_LDADD) $(LIBS) - - mysql: $(mysql_OBJECTS) $(mysql_DEPENDENCIES) - @rm -f mysql -@@ -343,10 +350,6 @@ - @rm -f mysqladmin - $(LINK) $(mysqladmin_LDFLAGS) $(mysqladmin_OBJECTS) $(mysqladmin_LDADD) $(LIBS) - --mysqlshow: $(mysqlshow_OBJECTS) $(mysqlshow_DEPENDENCIES) -- @rm -f mysqlshow -- $(LINK) $(mysqlshow_LDFLAGS) $(mysqlshow_OBJECTS) $(mysqlshow_LDADD) $(LIBS) -- - mysqldump: $(mysqldump_OBJECTS) $(mysqldump_DEPENDENCIES) - @rm -f mysqldump - $(LINK) $(mysqldump_LDFLAGS) $(mysqldump_OBJECTS) $(mysqldump_LDADD) $(LIBS) -@@ -355,14 +358,14 @@ - @rm -f mysqlimport - $(LINK) $(mysqlimport_LDFLAGS) $(mysqlimport_OBJECTS) $(mysqlimport_LDADD) $(LIBS) - -+mysqlshow: $(mysqlshow_OBJECTS) $(mysqlshow_DEPENDENCIES) -+ @rm -f mysqlshow -+ $(LINK) $(mysqlshow_LDFLAGS) $(mysqlshow_OBJECTS) $(mysqlshow_LDADD) $(LIBS) -+ - mysqltest: $(mysqltest_OBJECTS) $(mysqltest_DEPENDENCIES) - @rm -f mysqltest - $(LINK) $(mysqltest_LDFLAGS) $(mysqltest_OBJECTS) $(mysqltest_LDADD) $(LIBS) - --insert_test: $(insert_test_OBJECTS) $(insert_test_DEPENDENCIES) -- @rm -f insert_test -- $(LINK) $(insert_test_LDFLAGS) $(insert_test_OBJECTS) $(insert_test_LDADD) $(LIBS) -- - select_test: $(select_test_OBJECTS) $(select_test_DEPENDENCIES) - @rm -f select_test - $(LINK) $(select_test_LDFLAGS) $(select_test_OBJECTS) $(select_test_LDADD) $(LIBS) -@@ -370,118 +373,100 @@ - thread_test: $(thread_test_OBJECTS) $(thread_test_DEPENDENCIES) - @rm -f thread_test - $(LINK) $(thread_test_LDFLAGS) $(thread_test_OBJECTS) $(thread_test_LDADD) $(LIBS) --.cc.o: -- $(CXXCOMPILE) -c $< --.cc.lo: -- $(LTCXXCOMPILE) -c $< - - tags: TAGS - --ID: $(HEADERS) $(SOURCES) $(LISP) -- list='$(SOURCES) $(HEADERS)'; \ -- unique=`for i in $$list; do echo $$i; done | \ -- awk ' { files[$$0] = 1; } \ -+ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) -+ list='$(SOURCES) $(HEADERS) $(TAGS_FILES)'; \ -+ unique=`for i in $$list; do \ -+ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ -+ done | \ -+ $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ -- here=`pwd` && cd $(srcdir) \ -- && mkid -f$$here/ID $$unique $(LISP) -+ mkid -fID $$unique $(LISP) - --TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) $(LISP) -+TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ -+ $(TAGS_FILES) $(LISP) - tags=; \ - here=`pwd`; \ -- list='$(SOURCES) $(HEADERS)'; \ -- unique=`for i in $$list; do echo $$i; done | \ -- awk ' { files[$$0] = 1; } \ -+ list='$(SOURCES) $(HEADERS) $(TAGS_FILES)'; \ -+ unique=`for i in $$list; do \ -+ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ -+ done | \ -+ $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ - test -z "$(ETAGS_ARGS)$$unique$(LISP)$$tags" \ -- || (cd $(srcdir) && etags $(ETAGS_ARGS) $$tags $$unique $(LISP) -o $$here/TAGS) -- --mostlyclean-tags: -+ || etags $(ETAGS_ARGS) $$tags $$unique $(LISP) - --clean-tags: -+GTAGS: -+ here=`CDPATH=: && cd $(top_builddir) && pwd` \ -+ && cd $(top_srcdir) \ -+ && gtags -i $$here - - distclean-tags: - -rm -f TAGS ID - --maintainer-clean-tags: -+@AMDEP@@_am_include@ $(DEPDIR)/completion_hash.Po -+@AMDEP@@_am_include@ $(DEPDIR)/insert_test.Po -+@AMDEP@@_am_include@ $(DEPDIR)/mysql.Po -+@AMDEP@@_am_include@ $(DEPDIR)/mysqladmin.Po -+@AMDEP@@_am_include@ $(DEPDIR)/mysqldump.Po -+@AMDEP@@_am_include@ $(DEPDIR)/mysqlimport.Po -+@AMDEP@@_am_include@ $(DEPDIR)/mysqlshow.Po -+@AMDEP@@_am_include@ $(DEPDIR)/mysqltest.Po -+@AMDEP@@_am_include@ $(DEPDIR)/readline.Po -+@AMDEP@@_am_include@ $(DEPDIR)/select_test.Po -+@AMDEP@@_am_include@ $(DEPDIR)/sql_string.Po -+@AMDEP@@_am_include@ $(DEPDIR)/thread_test.Po -+ -+distclean-depend: -+ -rm -rf $(DEPDIR) -+ -+@AMDEP@CCDEPMODE = @CCDEPMODE@ -+ -+.c.o: -+@AMDEP@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ -+@AMDEP@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@ -+@AMDEP@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -+ $(COMPILE) -c -o $@ `test -f $< || echo '$(srcdir)/'`$< -+ -+.c.lo: -+@AMDEP@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ -+@AMDEP@ depfile='$(DEPDIR)/$*.Plo' tmpdepfile='$(DEPDIR)/$*.TPlo' @AMDEPBACKSLASH@ -+@AMDEP@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -+ $(LTCOMPILE) -c -o $@ `test -f $< || echo '$(srcdir)/'`$< -+ -+ -+@AMDEP@CXXDEPMODE = @CXXDEPMODE@ -+ -+.cc.o: -+@AMDEP@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ -+@AMDEP@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@ -+@AMDEP@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -+ $(CXXCOMPILE) -c -o $@ `test -f $< || echo '$(srcdir)/'`$< -+ -+.cc.lo: -+@AMDEP@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ -+@AMDEP@ depfile='$(DEPDIR)/$*.Plo' tmpdepfile='$(DEPDIR)/$*.TPlo' @AMDEPBACKSLASH@ -+@AMDEP@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -+ $(LTCXXCOMPILE) -c -o $@ `test -f $< || echo '$(srcdir)/'`$< -+ - - distdir = $(top_builddir)/$(PACKAGE)-$(VERSION)/$(subdir) - --subdir = client - - distdir: $(DISTFILES) - @for file in $(DISTFILES); do \ - d=$(srcdir); \ - if test -d $$d/$$file; then \ -- cp -pr $$d/$$file $(distdir)/$$file; \ -+ cp -pR $$d/$$file $(distdir) \ -+ || exit 1; \ - else \ - test -f $(distdir)/$$file \ -- || ln $$d/$$file $(distdir)/$$file 2> /dev/null \ -- || cp -p $$d/$$file $(distdir)/$$file || :; \ -+ || cp -p $$d/$$file $(distdir)/$$file \ -+ || exit 1; \ - 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 -- - info-am: - info: info-am - dvi-am: -@@ -502,9 +487,8 @@ - uninstall-am: uninstall-binPROGRAMS - uninstall: uninstall-am - all-am: Makefile $(PROGRAMS) $(HEADERS) --all-redirect: all-am - install-strip: -- $(MAKE) $(AM_MAKEFLAGS) AM_INSTALL_PROGRAM_FLAGS=-s install -+ $(MAKE) $(AM_MAKEFLAGS) INSTALL_STRIP_FLAG=-s install - installdirs: - $(mkinstalldirs) $(DESTDIR)$(bindir) - -@@ -518,47 +502,44 @@ - -rm -f config.cache config.log stamp-h stamp-h[0-9]* - - maintainer-clean-generic: --mostlyclean-am: mostlyclean-binPROGRAMS mostlyclean-noinstPROGRAMS \ -- mostlyclean-compile mostlyclean-libtool \ -- mostlyclean-tags mostlyclean-generic -- --mostlyclean: mostlyclean-am -- --clean-am: clean-binPROGRAMS clean-noinstPROGRAMS clean-compile \ -- clean-libtool clean-tags clean-generic mostlyclean-am -- -+ @echo "This command is intended for maintainers to use" -+ @echo "it deletes files that may require special tools to rebuild." -+ -rm -f Makefile.in - clean: clean-am - --distclean-am: distclean-binPROGRAMS distclean-noinstPROGRAMS \ -- distclean-compile distclean-libtool distclean-tags \ -- distclean-generic clean-am -- -rm -f libtool -+clean-am: clean-binPROGRAMS clean-generic clean-libtool \ -+ clean-noinstPROGRAMS mostlyclean-am - - distclean: distclean-am - --maintainer-clean-am: maintainer-clean-binPROGRAMS \ -- maintainer-clean-noinstPROGRAMS \ -- maintainer-clean-compile maintainer-clean-libtool \ -- maintainer-clean-tags 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." -+distclean-am: clean-am distclean-binPROGRAMS distclean-compile \ -+ distclean-depend distclean-generic distclean-libtool \ -+ distclean-noinstPROGRAMS distclean-tags - - maintainer-clean: maintainer-clean-am - --.PHONY: mostlyclean-binPROGRAMS distclean-binPROGRAMS clean-binPROGRAMS \ --maintainer-clean-binPROGRAMS uninstall-binPROGRAMS install-binPROGRAMS \ --mostlyclean-noinstPROGRAMS distclean-noinstPROGRAMS \ --clean-noinstPROGRAMS maintainer-clean-noinstPROGRAMS \ --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 -+maintainer-clean-am: distclean-am maintainer-clean-binPROGRAMS \ -+ maintainer-clean-generic maintainer-clean-noinstPROGRAMS -+ -+mostlyclean: mostlyclean-am -+ -+mostlyclean-am: mostlyclean-binPROGRAMS mostlyclean-compile \ -+ mostlyclean-generic mostlyclean-libtool \ -+ mostlyclean-noinstPROGRAMS -+ -+.PHONY: check check-am clean clean-binPROGRAMS clean-generic \ -+ clean-libtool clean-noinstPROGRAMS distclean \ -+ distclean-binPROGRAMS distclean-compile distclean-depend \ -+ distclean-generic distclean-libtool distclean-noinstPROGRAMS \ -+ distclean-tags distdir dvi dvi-am info info-am install \ -+ install-am install-binPROGRAMS install-data install-data-am \ -+ install-exec install-exec-am install-strip installcheck \ -+ installcheck-am installdirs maintainer-clean \ -+ maintainer-clean-binPROGRAMS maintainer-clean-generic \ -+ maintainer-clean-noinstPROGRAMS mostlyclean \ -+ mostlyclean-binPROGRAMS mostlyclean-compile mostlyclean-generic \ -+ mostlyclean-libtool mostlyclean-noinstPROGRAMS tags uninstall \ -+ uninstall-am uninstall-binPROGRAMS - - - thread_test.o: thread_test.c -diff -r -N -U3 mysql-3.23.32.orig/configure mysql-3.23.32/configure ---- mysql-3.23.32.orig/configure Mon Jan 22 14:37:14 2001 -+++ mysql-3.23.32/configure Thu Mar 1 17:00:28 2001 -@@ -34,15 +34,106 @@ - # some checks are only needed if your package does certain things. - # But this isn't really a big deal. - --# serial 1 -+# serial 5 -+ -+# There are a few dirty hacks below to avoid letting `AC_PROG_CC' be -+# written in clear, in which case automake, when reading aclocal.m4, -+# will think it sees a *use*, and therefore will trigger all it's -+# C support machinery. Also note that it means that autoscan, seeing -+# CC etc. in the Makefile, will ask for an AC_PROG_CC use... -+ -+ -+# We require 2.13 because we rely on SHELL being computed by configure. -+ -+ -+# AC_PROVIDE_IFELSE(MACRO-NAME, IF-PROVIDED, IF-NOT-PROVIDED) -+# ----------------------------------------------------------- -+# If MACRO-NAME is provided do IF-PROVIDED, else IF-NOT-PROVIDED. -+# The purpose of this macro is to provide the user with a means to -+# check macros which are provided without letting her know how the -+# information is coded. -+# If this macro is not defined by Autoconf, define it here. -+ -+ -+ -+# AM_INIT_AUTOMAKE(PACKAGE,VERSION, [NO-DEFINE]) -+# ---------------------------------------------- -+ -+ -+ -+# serial 2 -+ -+# AM_MISSING_PROG(NAME, PROGRAM) -+# ------------------------------ -+ -+ -+ -+# AM_MISSING_INSTALL_SH -+# --------------------- -+# Like AM_MISSING_PROG, but only looks for install-sh. -+ -+ - -+# AM_MISSING_HAS_RUN -+# ------------------ -+# Define MISSING if not defined so far and test if it supports --run. -+# If it does, set am_missing_run to use it, otherwise, to nothing. - - -+# serial 3 - -+# There are a few dirty hacks below to avoid letting `AC_PROG_CC' be -+# written in clear, in which case automake, when reading aclocal.m4, -+# will think it sees a *use*, and therefore will trigger all it's -+# C support machinery. Also note that it means that autoscan, seeing -+# CC etc. in the Makefile, will ask for an AC_PROG_CC use... -+ -+# AM_DEPENDENCIES(NAME) -+# --------------------- -+# See how the compiler implements dependency checking. -+# NAME is "CC", "CXX" or "OBJC". -+# We try a few techniques and use that to set a single cache variable. -+ -+ -+ -+# AM_SET_DEPDIR -+# ------------- -+# Choose a directory name for dependency files. -+# This macro is AC_REQUIREd in AM_DEPENDENCIES -+ -+ -+ -+# AM_DEP_TRACK -+# ------------ -+ -+ -+# Generate code to set up dependency tracking. -+# This macro should only be invoked once -- use via AC_REQUIRE. -+# Usage: -+# AM_OUTPUT_DEPENDENCY_COMMANDS -+ -+# -+# This code is only required when automatic dependency tracking -+# is enabled. FIXME. This creates each `.P' file that we will -+# need in order to bootstrap the dependency handling code. -+ -+ -+# AM_MAKE_INCLUDE() -+# ----------------- -+# Check to see how make treats includes. - - - # Like AC_CONFIG_HEADER, but automatically create stamp file. - -+# serial 3 -+ -+# When config.status generates a header, we must update the stamp-h file. -+# This file resides in the same directory as the config header -+# that is generated. We must strip everything past the first ":", -+# and everything past the last "/". -+ -+ -+ - - - # Add --enable-maintainer-mode option to configure. -@@ -52,8 +143,11 @@ - - - --# Define a conditional. -+# serial 2 - -+# AM_CONDITIONAL(NAME, SHELL-CONDITION) -+# ------------------------------------- -+# Define a conditional. - - - -@@ -108,23 +202,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. - - -@@ -142,6 +240,9 @@ - ac_default_prefix=/usr/local - # Any additions from configure.in: - ac_help="$ac_help -+ --disable-dependency-tracking Speeds up one-time builds -+ --enable-dependency-tracking Do not reject slow dependency extractors" -+ac_help="$ac_help - --enable-maintainer-mode enable make rules and dependencies not useful - (and sometimes confusing) to the casual installer" - ac_help="$ac_help -@@ -792,7 +893,7 @@ - fi - - echo $ac_n "checking host system type""... $ac_c" 1>&6 --echo "configure:796: checking host system type" >&5 -+echo "configure:897: checking host system type" >&5 - - host_alias=$host - case "$host_alias" in -@@ -813,7 +914,7 @@ - echo "$ac_t""$host" 1>&6 - - echo $ac_n "checking target system type""... $ac_c" 1>&6 --echo "configure:817: checking target system type" >&5 -+echo "configure:918: checking target system type" >&5 - - target_alias=$target - case "$target_alias" in -@@ -831,7 +932,7 @@ - echo "$ac_t""$target" 1>&6 - - echo $ac_n "checking build system type""... $ac_c" 1>&6 --echo "configure:835: checking build system type" >&5 -+echo "configure:936: checking build system type" >&5 - - build_alias=$build - case "$build_alias" in -@@ -866,7 +967,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:870: checking for a BSD compatible install" >&5 -+echo "configure:971: 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 -@@ -919,7 +1020,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:923: checking whether build environment is sane" >&5 -+echo "configure:1024: 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 -@@ -953,8 +1054,53 @@ - # sed with no file args requires a program. - test "$program_transform_name" = "" && program_transform_name="s,x,x," - -+test x"${MISSING+set}" = xset || -+ MISSING="\${SHELL} `CDPATH=:; cd $ac_aux_dir && pwd`/missing" -+# Use eval to expand $SHELL -+if eval "$MISSING --run :"; then -+ am_missing_run="$MISSING --run " -+else -+ am_missing_run= -+ am_backtick='`' -+ echo "configure: warning: ${am_backtick}missing' script is too old or missing" 1>&2 -+fi -+ -+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:1074: 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 -+ if test -n "$AWK"; then -+ ac_cv_prog_AWK="$AWK" # Let the user override the test. -+else -+ IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":" -+ ac_dummy="$PATH" -+ for ac_dir in $ac_dummy; do -+ test -z "$ac_dir" && ac_dir=. -+ if test -f $ac_dir/$ac_word; then -+ ac_cv_prog_AWK="$ac_prog" -+ break -+ fi -+ done -+ IFS="$ac_save_ifs" -+fi -+fi -+AWK="$ac_cv_prog_AWK" -+if test -n "$AWK"; then -+ echo "$ac_t""$AWK" 1>&6 -+else -+ echo "$ac_t""no" 1>&6 -+fi -+ -+test -n "$AWK" && break -+done -+ - echo $ac_n "checking whether ${MAKE-make} sets \${MAKE}""... $ac_c" 1>&6 --echo "configure:958: checking whether ${MAKE-make} sets \${MAKE}" >&5 -+echo "configure:1104: 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 -@@ -980,14 +1126,51 @@ - SET_MAKE="MAKE=${MAKE-make}" - fi - -+# Check whether --enable-dependency-tracking or --disable-dependency-tracking was given. -+if test "${enable_dependency_tracking+set}" = set; then -+ enableval="$enable_dependency_tracking" -+ : -+fi -+ -+if test "x$enable_dependency_tracking" = xno; then -+ AMDEP="#" -+else -+ am_depcomp="$ac_aux_dir/depcomp" -+ if test ! -f "$am_depcomp"; then -+ AMDEP="#" -+ else -+ AMDEP= -+ fi -+fi -+ -+if test -z "$AMDEP"; then -+ AMDEPBACKSLASH='\' -+else -+ AMDEPBACKSLASH= -+fi - --PACKAGE=mysql - --VERSION=3.23.32 - --if test "`cd $srcdir && pwd`" != "`pwd`" && test -f $srcdir/config.status; then -- { echo "configure: error: source directory already configured; run "make distclean" there first" 1>&2; exit 1; } -+ -+if test -d .deps || mkdir .deps 2> /dev/null || test -d .deps; then -+ DEPDIR=.deps -+ # We redirect because .deps might already exist and be populated. -+ # In this situation we don't want to see an error. -+ rmdir .deps > /dev/null 2>&1 -+else -+ DEPDIR=_deps - fi -+ -+ -+# test to see if srcdir already configured -+if test "`CDPATH=:; cd $srcdir && pwd`" != "`pwd`" && -+ test -f $srcdir/config.status; then -+ { echo "configure: error: source directory already configured; run \"make distclean\" there first" 1>&2; exit 1; } -+fi -+ -+# Define the identity of the package. -+PACKAGE=mysql -+VERSION=3.23.32 - cat >> confdefs.h <<EOF - #define PACKAGE "$PACKAGE" - EOF -@@ -997,78 +1180,55 @@ - EOF - - -+# Autoconf 2.50 wants to disallow AM_ names. We explicitly allow -+# the ones we care about. - --missing_dir=`cd $ac_aux_dir && pwd` --echo $ac_n "checking for working aclocal""... $ac_c" 1>&6 --echo "configure:1004: 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. --if (aclocal --version) < /dev/null > /dev/null 2>&1; then -- ACLOCAL=aclocal -- echo "$ac_t""found" 1>&6 --else -- ACLOCAL="$missing_dir/missing aclocal" -- echo "$ac_t""missing" 1>&6 --fi -- --echo $ac_n "checking for working autoconf""... $ac_c" 1>&6 --echo "configure:1017: 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. --if (autoconf --version) < /dev/null > /dev/null 2>&1; then -- AUTOCONF=autoconf -- echo "$ac_t""found" 1>&6 --else -- AUTOCONF="$missing_dir/missing autoconf" -- echo "$ac_t""missing" 1>&6 --fi -- --echo $ac_n "checking for working automake""... $ac_c" 1>&6 --echo "configure:1030: 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. --if (automake --version) < /dev/null > /dev/null 2>&1; then -- AUTOMAKE=automake -- echo "$ac_t""found" 1>&6 --else -- AUTOMAKE="$missing_dir/missing automake" -- echo "$ac_t""missing" 1>&6 --fi -- --echo $ac_n "checking for working autoheader""... $ac_c" 1>&6 --echo "configure:1043: 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. --if (autoheader --version) < /dev/null > /dev/null 2>&1; then -- AUTOHEADER=autoheader -- echo "$ac_t""found" 1>&6 --else -- AUTOHEADER="$missing_dir/missing autoheader" -- echo "$ac_t""missing" 1>&6 --fi -- --echo $ac_n "checking for working makeinfo""... $ac_c" 1>&6 --echo "configure:1056: 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. --if (makeinfo --version) < /dev/null > /dev/null 2>&1; then -- MAKEINFO=makeinfo -- echo "$ac_t""found" 1>&6 --else -- MAKEINFO="$missing_dir/missing makeinfo" -- echo "$ac_t""missing" 1>&6 --fi - - - - - - -+ -+# Some tools Automake needs. -+ -+ACLOCAL=${ACLOCAL-"${am_missing_run}aclocal"} -+ -+ -+AUTOCONF=${AUTOCONF-"${am_missing_run}autoconf"} -+ -+ -+AUTOMAKE=${AUTOMAKE-"${am_missing_run}automake"} -+ -+ -+AUTOHEADER=${AUTOHEADER-"${am_missing_run}autoheader"} -+ -+ -+MAKEINFO=${MAKEINFO-"${am_missing_run}makeinfo"} -+ -+ -+AMTAR=${AMTAR-"${am_missing_run}tar"} -+ -+ -+if test -z "$install_sh"; then -+ for install_sh in "$ac_aux_dir/install-sh" \ -+ "$ac_aux_dir/install.sh" \ -+ "${am_missing_run}${ac_auxdir}/install-sh"; -+ do -+ test -f "$install_sh" && break -+ done -+ # FIXME: an evil hack: we remove the SHELL invocation from -+ # install_sh because automake adds it back in. Sigh. -+ install_sh=`echo $install_sh | sed -e 's/\${SHELL}//'` -+fi -+ -+# We need awk for the "check" target. The system "awk" is bad on -+# some platforms. -+ -+ -+ -+ -+ - PROTOCOL_VERSION=10 - DOT_FRM_VERSION=6 - # See the libtool docs for information on how to do shared lib versions. -@@ -1154,7 +1314,7 @@ - - - echo $ac_n "checking whether to enable maintainer-specific portions of Makefiles""... $ac_c" 1>&6 --echo "configure:1158: checking whether to enable maintainer-specific portions of Makefiles" >&5 -+echo "configure:1318: 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" -@@ -1196,7 +1356,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:1200: checking whether build environment is sane" >&5 -+echo "configure:1360: 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 -@@ -1213,7 +1373,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:1217: checking whether ${MAKE-make} sets \${MAKE}" >&5 -+echo "configure:1377: 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 -@@ -1276,12 +1436,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:1285: checking for $ac_word" >&5 -+echo "configure:1445: 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 -@@ -1313,7 +1473,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:1317: checking for $ac_word" >&5 -+echo "configure:1477: 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 -@@ -1343,7 +1503,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:1347: checking for $ac_word" >&5 -+echo "configure:1507: 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 -@@ -1394,7 +1554,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:1398: checking for $ac_word" >&5 -+echo "configure:1558: 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 -@@ -1426,7 +1586,7 @@ - fi - - echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works""... $ac_c" 1>&6 --echo "configure:1430: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5 -+echo "configure:1590: 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. -@@ -1437,12 +1597,12 @@ - - cat > conftest.$ac_ext << EOF - --#line 1441 "configure" -+#line 1601 "configure" - #include "confdefs.h" - - main(){return(0);} - EOF --if { (eval echo configure:1446: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:1606: \"$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 -@@ -1468,12 +1628,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:1472: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5 -+echo "configure:1632: 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:1477: checking whether we are using GNU C" >&5 -+echo "configure:1637: 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 -@@ -1482,7 +1642,7 @@ - yes; - #endif - EOF --if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:1486: \"$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:1646: \"$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 -@@ -1501,7 +1661,7 @@ - ac_save_CFLAGS="$CFLAGS" - CFLAGS= - echo $ac_n "checking whether ${CC-cc} accepts -g""... $ac_c" 1>&6 --echo "configure:1505: checking whether ${CC-cc} accepts -g" >&5 -+echo "configure:1665: 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 -@@ -1532,12 +1692,182 @@ - fi - fi - -+ -+echo $ac_n "checking how to run the C preprocessor""... $ac_c" 1>&6 -+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= -+fi -+if test -z "$CPP"; then -+if eval "test \"`echo '$''{'ac_cv_prog_CPP'+set}'`\" = set"; then -+ echo $ac_n "(cached) $ac_c" 1>&6 -+else -+ # This must be in double quotes, not single quotes, because CPP may get -+ # substituted into the Makefile and "${CC-cc}" will confuse make. -+ CPP="${CC-cc} -E" -+ # On the NeXT, cc -E runs the code through the compiler's parser, -+ # not just through cpp. -+ cat > conftest.$ac_ext <<EOF -+#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: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 -+ : -+else -+ echo "$ac_err" >&5 -+ echo "configure: failed program was:" >&5 -+ cat conftest.$ac_ext >&5 -+ rm -rf conftest* -+ CPP="${CC-cc} -E -traditional-cpp" -+ cat > conftest.$ac_ext <<EOF -+#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: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 -+ : -+else -+ echo "$ac_err" >&5 -+ echo "configure: failed program was:" >&5 -+ cat conftest.$ac_ext >&5 -+ rm -rf conftest* -+ CPP="${CC-cc} -nologo -E" -+ cat > conftest.$ac_ext <<EOF -+#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: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 -+ : -+else -+ echo "$ac_err" >&5 -+ echo "configure: failed program was:" >&5 -+ cat conftest.$ac_ext >&5 -+ rm -rf conftest* -+ CPP=/lib/cpp -+fi -+rm -f conftest* -+fi -+rm -f conftest* -+fi -+rm -f conftest* -+ ac_cv_prog_CPP="$CPP" -+fi -+ CPP="$ac_cv_prog_CPP" -+else -+ ac_cv_prog_CPP="$CPP" -+fi -+echo "$ac_t""$CPP" 1>&6 -+ -+am_make=${MAKE-make} -+# BSD make uses .include -+cat > confinc << 'END' -+doit: -+ @echo done -+END -+# If we don't find an include directive, just comment out the code. -+echo $ac_n "checking for style of include used by $am_make""... $ac_c" 1>&6 -+echo "configure:1785: checking for style of include used by $am_make" >&5 -+_am_include='#' -+for am_inc in include .include; do -+ echo "$am_inc confinc" > confmf -+ if test "`$am_make -f confmf 2> /dev/null`" = "done"; then -+ _am_include=$am_inc -+ break -+ fi -+done -+ -+echo "$ac_t""$_am_include" 1>&6 -+rm -f confinc confmf -+ -+ -+depcc="$CC" -+depcpp="$CPP" -+ -+ -+ -+echo $ac_n "checking dependency style of $depcc""... $ac_c" 1>&6 -+echo "configure:1805: checking dependency style of $depcc" >&5 -+if eval "test \"`echo '$''{'am_cv_CC_dependencies_compiler_type'+set}'`\" = set"; then -+ echo $ac_n "(cached) $ac_c" 1>&6 -+else -+ if test -z "$AMDEP"; then -+ # We make a subdir and do the tests there. Otherwise we can end up -+ # making bogus files that we don't know about and never remove. For -+ # instance it was reported that on HP-UX the gcc test will end up -+ # making a dummy file named `D' -- because `-MD' means `put the output -+ # in D'. -+ mkdir confdir -+ # Copy depcomp to subdir because otherwise we won't find it if we're -+ # using a relative directory. -+ cp "$am_depcomp" confdir -+ cd confdir -+ -+ am_cv_CC_dependencies_compiler_type=none -+ for depmode in `sed -n 's/^#*\([a-zA-Z0-9]*\))$/\1/p' < "./depcomp"`; do -+ # We need to recreate these files for each test, as the compiler may -+ # overwrite some of them when testing with obscure command lines. -+ # This happens at least with the AIX C compiler. -+ echo '#include "conftest.h"' > conftest.c -+ echo 'int i;' > conftest.h -+ -+ case "$depmode" in -+ nosideeffect) -+ # after this tag, mechanisms are not by side-effect, so they'll -+ # only be used when explicitly requested -+ if test "x$enable_dependency_tracking" = xyes; then -+ continue -+ else -+ break -+ fi -+ ;; -+ none) break ;; -+ esac -+ # We check with `-c' and `-o' for the sake of the "dashmstdout" -+ # mode. It turns out that the SunPro C++ compiler does not properly -+ # handle `-M -o', and we need to detect this. -+ if depmode="$depmode" \ -+ source=conftest.c object=conftest.o \ -+ depfile=conftest.Po tmpdepfile=conftest.TPo \ -+ $SHELL ./depcomp $depcc -c conftest.c -o conftest.o >/dev/null 2>&1 && -+ grep conftest.h conftest.Po > /dev/null 2>&1; then -+ am_cv_CC_dependencies_compiler_type="$depmode" -+ break -+ fi -+ done -+ -+ cd .. -+ rm -rf confdir -+else -+ am_cv_CC_dependencies_compiler_type=none -+fi -+ -+fi -+ -+echo "$ac_t""$am_cv_CC_dependencies_compiler_type" 1>&6 -+CCDEPMODE="depmode=$am_cv_CC_dependencies_compiler_type" -+ -+ - for ac_prog in $CCC c++ g++ gcc CC cxx cc++ cl - 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:1541: checking for $ac_word" >&5 -+echo "configure:1871: 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 -@@ -1569,7 +1899,7 @@ - - - echo $ac_n "checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) works""... $ac_c" 1>&6 --echo "configure:1573: checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) works" >&5 -+echo "configure:1903: 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. -@@ -1580,12 +1910,12 @@ - - cat > conftest.$ac_ext << EOF - --#line 1584 "configure" -+#line 1914 "configure" - #include "confdefs.h" - - int main(){return(0);} - EOF --if { (eval echo configure:1589: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:1919: \"$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 -@@ -1611,12 +1941,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:1615: checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) is a cross-compiler" >&5 -+echo "configure:1945: 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:1620: checking whether we are using GNU C++" >&5 -+echo "configure:1950: 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 -@@ -1625,7 +1955,7 @@ - yes; - #endif - EOF --if { ac_try='${CXX-g++} -E conftest.C'; { (eval echo configure:1629: \"$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:1959: \"$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 -@@ -1644,7 +1974,7 @@ - ac_save_CXXFLAGS="$CXXFLAGS" - CXXFLAGS= - echo $ac_n "checking whether ${CXX-g++} accepts -g""... $ac_c" 1>&6 --echo "configure:1648: checking whether ${CXX-g++} accepts -g" >&5 -+echo "configure:1978: 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 -@@ -1674,9 +2004,119 @@ - CXXFLAGS= - fi - fi -+echo $ac_n "checking how to run the C++ preprocessor""... $ac_c" 1>&6 -+echo "configure:2009: checking how to run the C++ preprocessor" >&5 -+if test -z "$CXXCPP"; then -+if eval "test \"`echo '$''{'ac_cv_prog_CXXCPP'+set}'`\" = set"; then -+ echo $ac_n "(cached) $ac_c" 1>&6 -+else -+ ac_ext=C -+# CXXFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options. -+ac_cpp='$CXXCPP $CPPFLAGS' -+ac_compile='${CXX-g++} -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext 1>&5' -+ac_link='${CXX-g++} -o conftest${ac_exeext} $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5' -+cross_compiling=$ac_cv_prog_cxx_cross -+ CXXCPP="${CXX-g++} -E" -+ cat > conftest.$ac_ext <<EOF -+#line 2022 "configure" -+#include "confdefs.h" -+#include <stdlib.h> -+EOF -+ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -+{ (eval echo configure:2027: \"$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 -+ : -+else -+ echo "$ac_err" >&5 -+ echo "configure: failed program was:" >&5 -+ cat conftest.$ac_ext >&5 -+ rm -rf conftest* -+ CXXCPP=/lib/cpp -+fi -+rm -f conftest* -+ ac_cv_prog_CXXCPP="$CXXCPP" -+ac_ext=c -+# CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options. -+ac_cpp='$CPP $CPPFLAGS' -+ac_compile='${CC-cc} -c $CFLAGS $CPPFLAGS conftest.$ac_ext 1>&5' -+ac_link='${CC-cc} -o conftest${ac_exeext} $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5' -+cross_compiling=$ac_cv_prog_cc_cross -+fi -+fi -+CXXCPP="$ac_cv_prog_CXXCPP" -+echo "$ac_t""$CXXCPP" 1>&6 -+ -+ -+depcc="$CXX" -+depcpp="$CXXCPP" -+ -+ -+ -+echo $ac_n "checking dependency style of $depcc""... $ac_c" 1>&6 -+echo "configure:2058: checking dependency style of $depcc" >&5 -+if eval "test \"`echo '$''{'am_cv_CXX_dependencies_compiler_type'+set}'`\" = set"; then -+ echo $ac_n "(cached) $ac_c" 1>&6 -+else -+ if test -z "$AMDEP"; then -+ # We make a subdir and do the tests there. Otherwise we can end up -+ # making bogus files that we don't know about and never remove. For -+ # instance it was reported that on HP-UX the gcc test will end up -+ # making a dummy file named `D' -- because `-MD' means `put the output -+ # in D'. -+ mkdir confdir -+ # Copy depcomp to subdir because otherwise we won't find it if we're -+ # using a relative directory. -+ cp "$am_depcomp" confdir -+ cd confdir -+ -+ am_cv_CXX_dependencies_compiler_type=none -+ for depmode in `sed -n 's/^#*\([a-zA-Z0-9]*\))$/\1/p' < "./depcomp"`; do -+ # We need to recreate these files for each test, as the compiler may -+ # overwrite some of them when testing with obscure command lines. -+ # This happens at least with the AIX C compiler. -+ echo '#include "conftest.h"' > conftest.c -+ echo 'int i;' > conftest.h -+ -+ case "$depmode" in -+ nosideeffect) -+ # after this tag, mechanisms are not by side-effect, so they'll -+ # only be used when explicitly requested -+ if test "x$enable_dependency_tracking" = xyes; then -+ continue -+ else -+ break -+ fi -+ ;; -+ none) break ;; -+ esac -+ # We check with `-c' and `-o' for the sake of the "dashmstdout" -+ # mode. It turns out that the SunPro C++ compiler does not properly -+ # handle `-M -o', and we need to detect this. -+ if depmode="$depmode" \ -+ source=conftest.c object=conftest.o \ -+ depfile=conftest.Po tmpdepfile=conftest.TPo \ -+ $SHELL ./depcomp $depcc -c conftest.c -o conftest.o >/dev/null 2>&1 && -+ grep conftest.h conftest.Po > /dev/null 2>&1; then -+ am_cv_CXX_dependencies_compiler_type="$depmode" -+ break -+ fi -+ done -+ -+ cd .. -+ rm -rf confdir -+else -+ am_cv_CXX_dependencies_compiler_type=none -+fi -+ -+fi -+ -+echo "$ac_t""$am_cv_CXX_dependencies_compiler_type" 1>&6 -+CXXDEPMODE="depmode=$am_cv_CXX_dependencies_compiler_type" -+ - - echo $ac_n "checking how to run the C preprocessor""... $ac_c" 1>&6 --echo "configure:1680: checking how to run the C preprocessor" >&5 -+echo "configure:2120: checking how to run the C preprocessor" >&5 - # On Suns, sometimes $CPP names a directory. - if test -n "$CPP" && test -d "$CPP"; then - CPP= -@@ -1691,13 +2131,13 @@ - # On the NeXT, cc -E runs the code through the compiler's parser, - # not just through cpp. - cat > conftest.$ac_ext <<EOF --#line 1695 "configure" -+#line 2135 "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:1701: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } -+{ (eval echo configure:2141: \"$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 - : -@@ -1708,13 +2148,13 @@ - rm -rf conftest* - CPP="${CC-cc} -E -traditional-cpp" - cat > conftest.$ac_ext <<EOF --#line 1712 "configure" -+#line 2152 "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:1718: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } -+{ (eval echo configure:2158: \"$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 - : -@@ -1725,13 +2165,13 @@ - rm -rf conftest* - CPP="${CC-cc} -nologo -E" - cat > conftest.$ac_ext <<EOF --#line 1729 "configure" -+#line 2169 "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:1735: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } -+{ (eval echo configure:2175: \"$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 - : -@@ -1763,7 +2203,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:1767: checking for $ac_word" >&5 -+echo "configure:2207: 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 -@@ -1801,7 +2241,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:1805: checking for $ac_word" >&5 -+echo "configure:2245: 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 -@@ -1910,7 +2350,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:1914: checking for ld used by GCC" >&5 -+echo "configure:2354: checking for ld used by GCC" >&5 - ac_prog=`($CC -print-prog-name=ld) 2>&5` - case "$ac_prog" in - # Accept absolute paths. -@@ -1934,10 +2374,10 @@ - esac - elif test "$with_gnu_ld" = yes; then - echo $ac_n "checking for GNU ld""... $ac_c" 1>&6 --echo "configure:1938: checking for GNU ld" >&5 -+echo "configure:2378: checking for GNU ld" >&5 - else - echo $ac_n "checking for non-GNU ld""... $ac_c" 1>&6 --echo "configure:1941: checking for non-GNU ld" >&5 -+echo "configure:2381: 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 -@@ -1972,7 +2412,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:1976: checking if the linker ($LD) is GNU ld" >&5 -+echo "configure:2416: 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 -@@ -1988,7 +2428,7 @@ - - - echo $ac_n "checking for BSD-compatible nm""... $ac_c" 1>&6 --echo "configure:1992: checking for BSD-compatible nm" >&5 -+echo "configure:2432: 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 -@@ -2024,7 +2464,7 @@ - echo "$ac_t""$NM" 1>&6 - - echo $ac_n "checking whether ln -s works""... $ac_c" 1>&6 --echo "configure:2028: checking whether ln -s works" >&5 -+echo "configure:2468: 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 -@@ -2051,12 +2491,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" -@@ -2078,8 +2513,8 @@ - case "$lt_target" in - *-*-irix6*) - # Find out which ABI we are using. -- echo '#line 2082 "configure"' > conftest.$ac_ext -- if { (eval echo configure:2083: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then -+ echo '#line 2517 "configure"' > conftest.$ac_ext -+ if { (eval echo configure:2518: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then - case "`/usr/bin/file conftest.o`" in - *32-bit*) - LD="${LD-ld} -32" -@@ -2100,19 +2535,19 @@ - SAVE_CFLAGS="$CFLAGS" - CFLAGS="$CFLAGS -belf" - echo $ac_n "checking whether the C compiler needs -belf""... $ac_c" 1>&6 --echo "configure:2104: checking whether the C compiler needs -belf" >&5 -+echo "configure:2539: 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 2109 "configure" -+#line 2544 "configure" - #include "confdefs.h" - - int main() { - - ; return 0; } - EOF --if { (eval echo configure:2116: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:2551: \"$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 -@@ -2229,7 +2664,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:2233: checking for a BSD compatible install" >&5 -+echo "configure:2668: 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 -@@ -2287,7 +2722,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:2291: checking for $ac_word" >&5 -+echo "configure:2726: 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 -@@ -2320,7 +2755,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:2324: checking for $ac_word" >&5 -+echo "configure:2759: 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 -@@ -2348,14 +2783,14 @@ - - - echo $ac_n "checking "return type of sprintf"""... $ac_c" 1>&6 --echo "configure:2352: checking "return type of sprintf"" >&5 -+echo "configure:2787: 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 2359 "configure" -+#line 2794 "configure" - #include "confdefs.h" - - int main() -@@ -2369,7 +2804,7 @@ - } - - EOF --if { (eval echo configure:2373: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null -+if { (eval echo configure:2808: \"$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 -@@ -2383,7 +2818,7 @@ - { echo "configure: error: can not run test program while cross compiling" 1>&2; exit 1; } - else - cat > conftest.$ac_ext <<EOF --#line 2387 "configure" -+#line 2822 "configure" - #include "confdefs.h" - - int main() -@@ -2396,7 +2831,7 @@ - } - - EOF --if { (eval echo configure:2400: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null -+if { (eval echo configure:2835: \"$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 -@@ -2433,7 +2868,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:2437: checking for $ac_word" >&5 -+echo "configure:2872: 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 -@@ -2470,7 +2905,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:2474: checking operating system" >&5 -+echo "configure:2909: checking operating system" >&5 - if eval "test \"`echo '$''{'mysql_cv_sys_os'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else -@@ -2495,7 +2930,7 @@ - *-belf*) - - echo $ac_n "checking -belf""... $ac_c" 1>&6 --echo "configure:2499: checking -belf" >&5 -+echo "configure:2934: 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 -@@ -2506,11 +2941,11 @@ - mysql_cv_option_sco_belf_option=no - else - cat > conftest.$ac_ext <<EOF --#line 2510 "configure" -+#line 2945 "configure" - #include "confdefs.h" - int main(){exit(0);} - EOF --if { (eval echo configure:2514: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null -+if { (eval echo configure:2949: \"$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 -@@ -2548,7 +2983,7 @@ - *) - - echo $ac_n "checking -belf""... $ac_c" 1>&6 --echo "configure:2552: checking -belf" >&5 -+echo "configure:2987: 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 -@@ -2559,11 +2994,11 @@ - mysql_cv_option_sco_belf_option=no - else - cat > conftest.$ac_ext <<EOF --#line 2563 "configure" -+#line 2998 "configure" - #include "confdefs.h" - int main(){exit(0);} - EOF --if { (eval echo configure:2567: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null -+if { (eval echo configure:3002: \"$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 -@@ -2628,7 +3063,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:2632: checking "if we should use 'skip-locking' as default for $target_os"" >&5 -+echo "configure:3067: 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 -@@ -2646,7 +3081,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:2650: checking for $ac_word" >&5 -+echo "configure:3085: 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 -@@ -2683,7 +3118,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:2687: checking for $ac_word" >&5 -+echo "configure:3122: 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 -@@ -2724,7 +3159,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:2728: checking for $ac_word" >&5 -+echo "configure:3163: 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 -@@ -2760,7 +3195,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:2764: checking for $ac_word" >&5 -+echo "configure:3199: 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 -@@ -2796,7 +3231,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:2800: checking for $ac_word" >&5 -+echo "configure:3235: 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 -@@ -2832,7 +3267,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:2836: checking for $ac_word" >&5 -+echo "configure:3271: 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 -@@ -2868,7 +3303,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:2872: checking for $ac_word" >&5 -+echo "configure:3307: 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 -@@ -2904,7 +3339,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:2908: checking for $ac_word" >&5 -+echo "configure:3343: 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 -@@ -2940,7 +3375,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:2944: checking for $ac_word" >&5 -+echo "configure:3379: 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 -@@ -2976,7 +3411,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:2980: checking for $ac_word" >&5 -+echo "configure:3415: 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 -@@ -3016,7 +3451,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:3020: checking for $ac_word" >&5 -+echo "configure:3455: 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 -@@ -3064,7 +3499,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:3068: checking for $ac_word" >&5 -+echo "configure:3503: 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 -@@ -3098,7 +3533,7 @@ - fi - - echo $ac_n "checking "how to check if pid exists"""... $ac_c" 1>&6 --echo "configure:3102: checking "how to check if pid exists"" >&5 -+echo "configure:3537: 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 -@@ -3136,7 +3571,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:3140: checking for $ac_word" >&5 -+echo "configure:3575: 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 -@@ -3170,7 +3605,7 @@ - fi - - echo $ac_n "checking "for kill switches"""... $ac_c" 1>&6 --echo "configure:3174: checking "for kill switches"" >&5 -+echo "configure:3609: 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" -@@ -3187,7 +3622,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:3191: checking for ${CC-cc} option to accept ANSI C" >&5 -+echo "configure:3626: 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 -@@ -3204,7 +3639,7 @@ - do - CC="$ac_save_CC $ac_arg" - cat > conftest.$ac_ext <<EOF --#line 3208 "configure" -+#line 3643 "configure" - #include "confdefs.h" - #if !defined(__STDC__) - choke me -@@ -3222,7 +3657,7 @@ - struct s2 {int (*f) (double a);}; - ; return 0; } - EOF --if { (eval echo configure:3226: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then -+if { (eval echo configure:3661: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then - rm -rf conftest* - am_cv_prog_cc_stdc="$ac_arg"; break - else -@@ -3370,7 +3805,7 @@ - fi - - echo $ac_n "checking whether to use RAID""... $ac_c" 1>&6 --echo "configure:3374: checking whether to use RAID" >&5 -+echo "configure:3809: 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" -@@ -3447,7 +3882,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:3451: checking for $ac_word" >&5 -+echo "configure:3886: 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 -@@ -3477,7 +3912,7 @@ - - - echo $ac_n "checking for CFLAGS value to request large file support""... $ac_c" 1>&6 --echo "configure:3481: checking for CFLAGS value to request large file support" >&5 -+echo "configure:3916: 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 -@@ -3503,14 +3938,14 @@ - ac_save_CC="$CC" - CC="$CC $ac_cv_sys_largefile_CFLAGS" - cat > conftest.$ac_ext <<EOF --#line 3507 "configure" -+#line 3942 "configure" - #include "confdefs.h" - - int main() { - - ; return 0; } - EOF --if { (eval echo configure:3514: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:3949: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - : - else - echo "configure: failed program was:" >&5 -@@ -3527,7 +3962,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:3531: checking for LDFLAGS value to request large file support" >&5 -+echo "configure:3966: 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 -@@ -3543,7 +3978,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:3547: checking for LIBS value to request large file support" >&5 -+echo "configure:3982: 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 -@@ -3602,7 +4037,7 @@ - esac ;; - esac - echo $ac_n "checking for _FILE_OFFSET_BITS""... $ac_c" 1>&6 --echo "configure:3606: checking for _FILE_OFFSET_BITS" >&5 -+echo "configure:4041: 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 -@@ -3631,7 +4066,7 @@ - - fi - echo $ac_n "checking for _LARGEFILE_SOURCE""... $ac_c" 1>&6 --echo "configure:3635: checking for _LARGEFILE_SOURCE" >&5 -+echo "configure:4070: 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 -@@ -3660,7 +4095,7 @@ - - fi - echo $ac_n "checking for _LARGE_FILES""... $ac_c" 1>&6 --echo "configure:3664: checking for _LARGE_FILES" >&5 -+echo "configure:4099: 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 -@@ -3693,12 +4128,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:3697: checking for ANSI C header files" >&5 -+echo "configure:4132: 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 3702 "configure" -+#line 4137 "configure" - #include "confdefs.h" - #include <stdlib.h> - #include <stdarg.h> -@@ -3706,7 +4141,7 @@ - #include <float.h> - EOF - ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" --{ (eval echo configure:3710: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } -+{ (eval echo configure:4145: \"$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* -@@ -3723,7 +4158,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 3727 "configure" -+#line 4162 "configure" - #include "confdefs.h" - #include <string.h> - EOF -@@ -3741,7 +4176,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 3745 "configure" -+#line 4180 "configure" - #include "confdefs.h" - #include <stdlib.h> - EOF -@@ -3762,7 +4197,7 @@ - : - else - cat > conftest.$ac_ext <<EOF --#line 3766 "configure" -+#line 4201 "configure" - #include "confdefs.h" - #include <ctype.h> - #define ISLOWER(c) ('a' <= (c) && (c) <= 'z') -@@ -3773,7 +4208,7 @@ - exit (0); } - - EOF --if { (eval echo configure:3777: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null -+if { (eval echo configure:4212: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null - then - : - else -@@ -3797,12 +4232,12 @@ - fi - - echo $ac_n "checking for size_t""... $ac_c" 1>&6 --echo "configure:3801: checking for size_t" >&5 -+echo "configure:4236: 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 3806 "configure" -+#line 4241 "configure" - #include "confdefs.h" - #include <sys/types.h> - #if STDC_HEADERS -@@ -3839,12 +4274,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:3843: checking for $ac_hdr that defines DIR" >&5 -+echo "configure:4278: 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 3848 "configure" -+#line 4283 "configure" - #include "confdefs.h" - #include <sys/types.h> - #include <$ac_hdr> -@@ -3852,7 +4287,7 @@ - DIR *dirp = 0; - ; return 0; } - EOF --if { (eval echo configure:3856: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then -+if { (eval echo configure:4291: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then - rm -rf conftest* - eval "ac_cv_header_dirent_$ac_safe=yes" - else -@@ -3877,7 +4312,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:3881: checking for opendir in -ldir" >&5 -+echo "configure:4316: 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 -@@ -3885,7 +4320,7 @@ - ac_save_LIBS="$LIBS" - LIBS="-ldir $LIBS" - cat > conftest.$ac_ext <<EOF --#line 3889 "configure" -+#line 4324 "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 -@@ -3896,7 +4331,7 @@ - opendir() - ; return 0; } - EOF --if { (eval echo configure:3900: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:4335: \"$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 -@@ -3918,7 +4353,7 @@ - - else - echo $ac_n "checking for opendir in -lx""... $ac_c" 1>&6 --echo "configure:3922: checking for opendir in -lx" >&5 -+echo "configure:4357: 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 -@@ -3926,7 +4361,7 @@ - ac_save_LIBS="$LIBS" - LIBS="-lx $LIBS" - cat > conftest.$ac_ext <<EOF --#line 3930 "configure" -+#line 4365 "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 -@@ -3937,7 +4372,7 @@ - opendir() - ; return 0; } - EOF --if { (eval echo configure:3941: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:4376: \"$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 -@@ -3960,12 +4395,12 @@ - fi - - echo $ac_n "checking for ANSI C header files""... $ac_c" 1>&6 --echo "configure:3964: checking for ANSI C header files" >&5 -+echo "configure:4399: 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 3969 "configure" -+#line 4404 "configure" - #include "confdefs.h" - #include <stdlib.h> - #include <stdarg.h> -@@ -3973,7 +4408,7 @@ - #include <float.h> - EOF - ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" --{ (eval echo configure:3977: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } -+{ (eval echo configure:4412: \"$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* -@@ -3990,7 +4425,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 3994 "configure" -+#line 4429 "configure" - #include "confdefs.h" - #include <string.h> - EOF -@@ -4008,7 +4443,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 4012 "configure" -+#line 4447 "configure" - #include "confdefs.h" - #include <stdlib.h> - EOF -@@ -4029,7 +4464,7 @@ - : - else - cat > conftest.$ac_ext <<EOF --#line 4033 "configure" -+#line 4468 "configure" - #include "confdefs.h" - #include <ctype.h> - #define ISLOWER(c) ('a' <= (c) && (c) <= 'z') -@@ -4040,7 +4475,7 @@ - exit (0); } - - EOF --if { (eval echo configure:4044: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null -+if { (eval echo configure:4479: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null - then - : - else -@@ -4064,12 +4499,12 @@ - fi - - echo $ac_n "checking for sys/wait.h that is POSIX.1 compatible""... $ac_c" 1>&6 --echo "configure:4068: checking for sys/wait.h that is POSIX.1 compatible" >&5 -+echo "configure:4503: 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 4073 "configure" -+#line 4508 "configure" - #include "confdefs.h" - #include <sys/types.h> - #include <sys/wait.h> -@@ -4085,7 +4520,7 @@ - s = WIFEXITED (s) ? WEXITSTATUS (s) : 1; - ; return 0; } - EOF --if { (eval echo configure:4089: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then -+if { (eval echo configure:4524: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then - rm -rf conftest* - ac_cv_header_sys_wait_h=yes - else -@@ -4115,17 +4550,17 @@ - do - ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` - echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 --echo "configure:4119: checking for $ac_hdr" >&5 -+echo "configure:4554: 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 4124 "configure" -+#line 4559 "configure" - #include "confdefs.h" - #include <$ac_hdr> - EOF - ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" --{ (eval echo configure:4129: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } -+{ (eval echo configure:4564: \"$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* -@@ -4158,7 +4593,7 @@ - #-------------------------------------------------------------------- - - echo $ac_n "checking for floor in -lm""... $ac_c" 1>&6 --echo "configure:4162: checking for floor in -lm" >&5 -+echo "configure:4597: 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 -@@ -4166,7 +4601,7 @@ - ac_save_LIBS="$LIBS" - LIBS="-lm $LIBS" - cat > conftest.$ac_ext <<EOF --#line 4170 "configure" -+#line 4605 "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 -@@ -4177,7 +4612,7 @@ - floor() - ; return 0; } - EOF --if { (eval echo configure:4181: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:4616: \"$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 -@@ -4203,7 +4638,7 @@ - else - echo "$ac_t""no" 1>&6 - echo $ac_n "checking for __infinity in -lm""... $ac_c" 1>&6 --echo "configure:4207: checking for __infinity in -lm" >&5 -+echo "configure:4642: 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 -@@ -4211,7 +4646,7 @@ - ac_save_LIBS="$LIBS" - LIBS="-lm $LIBS" - cat > conftest.$ac_ext <<EOF --#line 4215 "configure" -+#line 4650 "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 -@@ -4222,7 +4657,7 @@ - __infinity() - ; return 0; } - EOF --if { (eval echo configure:4226: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:4661: \"$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 -@@ -4252,12 +4687,12 @@ - fi - - echo $ac_n "checking for gethostbyname_r""... $ac_c" 1>&6 --echo "configure:4256: checking for gethostbyname_r" >&5 -+echo "configure:4691: 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 4261 "configure" -+#line 4696 "configure" - #include "confdefs.h" - /* System header to define __stub macros and hopefully few prototypes, - which can conflict with char gethostbyname_r(); below. */ -@@ -4280,7 +4715,7 @@ - - ; return 0; } - EOF --if { (eval echo configure:4284: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:4719: \"$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 -@@ -4299,7 +4734,7 @@ - echo "$ac_t""no" 1>&6 - - echo $ac_n "checking for gethostbyname_r in -lnsl_r""... $ac_c" 1>&6 --echo "configure:4303: checking for gethostbyname_r in -lnsl_r" >&5 -+echo "configure:4738: 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 -@@ -4307,7 +4742,7 @@ - ac_save_LIBS="$LIBS" - LIBS="-lnsl_r $LIBS" - cat > conftest.$ac_ext <<EOF --#line 4311 "configure" -+#line 4746 "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 -@@ -4318,7 +4753,7 @@ - gethostbyname_r() - ; return 0; } - EOF --if { (eval echo configure:4322: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:4757: \"$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 -@@ -4344,7 +4779,7 @@ - else - echo "$ac_t""no" 1>&6 - echo $ac_n "checking for gethostbyname_r in -lnsl""... $ac_c" 1>&6 --echo "configure:4348: checking for gethostbyname_r in -lnsl" >&5 -+echo "configure:4783: 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 -@@ -4352,7 +4787,7 @@ - ac_save_LIBS="$LIBS" - LIBS="-lnsl $LIBS" - cat > conftest.$ac_ext <<EOF --#line 4356 "configure" -+#line 4791 "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 -@@ -4363,7 +4798,7 @@ - gethostbyname_r() - ; return 0; } - EOF --if { (eval echo configure:4367: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:4802: \"$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 -@@ -4395,12 +4830,12 @@ - fi - - echo $ac_n "checking for setsockopt""... $ac_c" 1>&6 --echo "configure:4399: checking for setsockopt" >&5 -+echo "configure:4834: 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 4404 "configure" -+#line 4839 "configure" - #include "confdefs.h" - /* System header to define __stub macros and hopefully few prototypes, - which can conflict with char setsockopt(); below. */ -@@ -4423,7 +4858,7 @@ - - ; return 0; } - EOF --if { (eval echo configure:4427: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:4862: \"$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 -@@ -4441,7 +4876,7 @@ - else - echo "$ac_t""no" 1>&6 - echo $ac_n "checking for setsockopt in -lsocket""... $ac_c" 1>&6 --echo "configure:4445: checking for setsockopt in -lsocket" >&5 -+echo "configure:4880: 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 -@@ -4449,7 +4884,7 @@ - ac_save_LIBS="$LIBS" - LIBS="-lsocket $LIBS" - cat > conftest.$ac_ext <<EOF --#line 4453 "configure" -+#line 4888 "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 -@@ -4460,7 +4895,7 @@ - setsockopt() - ; return 0; } - EOF --if { (eval echo configure:4464: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:4899: \"$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 -@@ -4490,12 +4925,12 @@ - fi - - echo $ac_n "checking for yp_get_default_domain""... $ac_c" 1>&6 --echo "configure:4494: checking for yp_get_default_domain" >&5 -+echo "configure:4929: 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 4499 "configure" -+#line 4934 "configure" - #include "confdefs.h" - /* System header to define __stub macros and hopefully few prototypes, - which can conflict with char yp_get_default_domain(); below. */ -@@ -4518,7 +4953,7 @@ - - ; return 0; } - EOF --if { (eval echo configure:4522: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:4957: \"$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 -@@ -4536,7 +4971,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:4540: checking for yp_get_default_domain in -lnsl" >&5 -+echo "configure:4975: 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 -@@ -4544,7 +4979,7 @@ - ac_save_LIBS="$LIBS" - LIBS="-lnsl $LIBS" - cat > conftest.$ac_ext <<EOF --#line 4548 "configure" -+#line 4983 "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 -@@ -4555,7 +4990,7 @@ - yp_get_default_domain() - ; return 0; } - EOF --if { (eval echo configure:4559: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:4994: \"$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 -@@ -4585,12 +5020,12 @@ - fi - - echo $ac_n "checking for p2open""... $ac_c" 1>&6 --echo "configure:4589: checking for p2open" >&5 -+echo "configure:5024: 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 4594 "configure" -+#line 5029 "configure" - #include "confdefs.h" - /* System header to define __stub macros and hopefully few prototypes, - which can conflict with char p2open(); below. */ -@@ -4613,7 +5048,7 @@ - - ; return 0; } - EOF --if { (eval echo configure:4617: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:5052: \"$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 -@@ -4631,7 +5066,7 @@ - else - echo "$ac_t""no" 1>&6 - echo $ac_n "checking for p2open in -lgen""... $ac_c" 1>&6 --echo "configure:4635: checking for p2open in -lgen" >&5 -+echo "configure:5070: 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 -@@ -4639,7 +5074,7 @@ - ac_save_LIBS="$LIBS" - LIBS="-lgen $LIBS" - cat > conftest.$ac_ext <<EOF --#line 4643 "configure" -+#line 5078 "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 -@@ -4650,7 +5085,7 @@ - p2open() - ; return 0; } - EOF --if { (eval echo configure:4654: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:5089: \"$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 -@@ -4681,12 +5116,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:4685: checking for bind" >&5 -+echo "configure:5120: 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 4690 "configure" -+#line 5125 "configure" - #include "confdefs.h" - /* System header to define __stub macros and hopefully few prototypes, - which can conflict with char bind(); below. */ -@@ -4709,7 +5144,7 @@ - - ; return 0; } - EOF --if { (eval echo configure:4713: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:5148: \"$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 -@@ -4727,7 +5162,7 @@ - else - echo "$ac_t""no" 1>&6 - echo $ac_n "checking for bind in -lbind""... $ac_c" 1>&6 --echo "configure:4731: checking for bind in -lbind" >&5 -+echo "configure:5166: 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 -@@ -4735,7 +5170,7 @@ - ac_save_LIBS="$LIBS" - LIBS="-lbind $LIBS" - cat > conftest.$ac_ext <<EOF --#line 4739 "configure" -+#line 5174 "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 -@@ -4746,7 +5181,7 @@ - bind() - ; return 0; } - EOF --if { (eval echo configure:4750: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:5185: \"$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 -@@ -4777,7 +5212,7 @@ - - # For crypt() on Linux - echo $ac_n "checking for crypt in -lcrypt""... $ac_c" 1>&6 --echo "configure:4781: checking for crypt in -lcrypt" >&5 -+echo "configure:5216: 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 -@@ -4785,7 +5220,7 @@ - ac_save_LIBS="$LIBS" - LIBS="-lcrypt $LIBS" - cat > conftest.$ac_ext <<EOF --#line 4789 "configure" -+#line 5224 "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 -@@ -4796,7 +5231,7 @@ - crypt() - ; return 0; } - EOF --if { (eval echo configure:4800: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:5235: \"$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 -@@ -4824,12 +5259,12 @@ - fi - - echo $ac_n "checking for crypt""... $ac_c" 1>&6 --echo "configure:4828: checking for crypt" >&5 -+echo "configure:5263: 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 4833 "configure" -+#line 5268 "configure" - #include "confdefs.h" - /* System header to define __stub macros and hopefully few prototypes, - which can conflict with char crypt(); below. */ -@@ -4852,7 +5287,7 @@ - - ; return 0; } - EOF --if { (eval echo configure:4856: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:5291: \"$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 -@@ -4880,12 +5315,12 @@ - save_LIBS="$LIBS" - LIBS="-l$with_named_zlib $LIBS" - echo $ac_n "checking if libz with compress""... $ac_c" 1>&6 --echo "configure:4884: checking if libz with compress" >&5 -+echo "configure:5319: 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 4889 "configure" -+#line 5324 "configure" - #include "confdefs.h" - #include <zlib.h> - #ifdef __cplusplus -@@ -4897,7 +5332,7 @@ - - ; return 0; } - EOF --if { (eval echo configure:4901: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:5336: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* - mysql_cv_compress=yes - else -@@ -4943,17 +5378,17 @@ - _libs=${LIBS} - ac_safe=`echo "tcpd.h" | sed 'y%./+-%__p_%'` - echo $ac_n "checking for tcpd.h""... $ac_c" 1>&6 --echo "configure:4947: checking for tcpd.h" >&5 -+echo "configure:5382: 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 4952 "configure" -+#line 5387 "configure" - #include "confdefs.h" - #include <tcpd.h> - EOF - ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" --{ (eval echo configure:4957: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } -+{ (eval echo configure:5392: \"$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* -@@ -4971,9 +5406,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:4975: checking for TCP wrappers library -lwrap" >&5 -+echo "configure:5410: checking for TCP wrappers library -lwrap" >&5 - cat > conftest.$ac_ext <<EOF --#line 4977 "configure" -+#line 5412 "configure" - #include "confdefs.h" - #include <tcpd.h> - int allow_severity = 0; -@@ -4985,7 +5420,7 @@ - hosts_access (req) - ; return 0; } - EOF --if { (eval echo configure:4989: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:5424: \"$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 -@@ -5020,14 +5455,14 @@ - - if test "$IS_LINUX" = "true"; then - echo $ac_n "checking for atomic operations""... $ac_c" 1>&6 --echo "configure:5024: checking for atomic operations" >&5 -+echo "configure:5459: 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 5031 "configure" -+#line 5466 "configure" - #include "confdefs.h" - - #include <asm/atomic.h> -@@ -5041,7 +5476,7 @@ - } - - EOF --if { (eval echo configure:5045: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null -+if { (eval echo configure:5480: \"$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 -@@ -5058,7 +5493,7 @@ - { echo "configure: error: can not run test program while cross compiling" 1>&2; exit 1; } - else - cat > conftest.$ac_ext <<EOF --#line 5062 "configure" -+#line 5497 "configure" - #include "confdefs.h" - - #include <asm/atomic.h> -@@ -5072,7 +5507,7 @@ - } - - EOF --if { (eval echo configure:5076: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null -+if { (eval echo configure:5511: \"$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 -@@ -5094,12 +5529,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:5098: checking for gtty" >&5 -+echo "configure:5533: 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 5103 "configure" -+#line 5538 "configure" - #include "confdefs.h" - /* System header to define __stub macros and hopefully few prototypes, - which can conflict with char gtty(); below. */ -@@ -5122,7 +5557,7 @@ - - ; return 0; } - EOF --if { (eval echo configure:5126: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:5561: \"$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 -@@ -5140,7 +5575,7 @@ - else - echo "$ac_t""no" 1>&6 - echo $ac_n "checking for gtty in -lcompat""... $ac_c" 1>&6 --echo "configure:5144: checking for gtty in -lcompat" >&5 -+echo "configure:5579: 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 -@@ -5148,7 +5583,7 @@ - ac_save_LIBS="$LIBS" - LIBS="-lcompat $LIBS" - cat > conftest.$ac_ext <<EOF --#line 5152 "configure" -+#line 5587 "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 -@@ -5159,7 +5594,7 @@ - gtty() - ; return 0; } - EOF --if { (eval echo configure:5163: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:5598: \"$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 -@@ -5196,12 +5631,12 @@ - NON_THREADED_CLIENT_LIBS="$LIBS" - - echo $ac_n "checking for int8""... $ac_c" 1>&6 --echo "configure:5200: checking for int8" >&5 -+echo "configure:5635: 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 5205 "configure" -+#line 5640 "configure" - #include "confdefs.h" - - #ifdef HAVE_STDLIB_H -@@ -5223,7 +5658,7 @@ - } - - EOF --if { (eval echo configure:5227: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null -+if { (eval echo configure:5662: \"$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 -@@ -5364,7 +5799,7 @@ - then - # Look for LinuxThreads. - echo $ac_n "checking "LinuxThreads"""... $ac_c" 1>&6 --echo "configure:5368: checking "LinuxThreads"" >&5 -+echo "configure:5803: checking "LinuxThreads"" >&5 - res=`grep Linuxthreads /usr/include/pthread.h 2>/dev/null | wc -l` - if test "$res" -gt 0 - then -@@ -5375,14 +5810,14 @@ - - # Linux 2.0 sanity check - cat > conftest.$ac_ext <<EOF --#line 5379 "configure" -+#line 5814 "configure" - #include "confdefs.h" - #include <sched.h> - int main() { - int a = sched_get_priority_min(1); - ; return 0; } - EOF --if { (eval echo configure:5386: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then -+if { (eval echo configure:5821: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then - : - else - echo "configure: failed program was:" >&5 -@@ -5405,7 +5840,7 @@ - Reference Manual." 1>&2; exit 1; } - else - echo $ac_n "checking "DEC threads"""... $ac_c" 1>&6 --echo "configure:5409: checking "DEC threads"" >&5 -+echo "configure:5844: 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" -@@ -5418,7 +5853,7 @@ - else - echo "$ac_t"""no"" 1>&6 - echo $ac_n "checking "DEC 3.2 threads"""... $ac_c" 1>&6 --echo "configure:5422: checking "DEC 3.2 threads"" >&5 -+echo "configure:5857: 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" -@@ -5444,7 +5879,7 @@ - if test "$with_named_thread" = "no" - then - echo $ac_n "checking "SCO threads"""... $ac_c" 1>&6 --echo "configure:5448: checking "SCO threads"" >&5 -+echo "configure:5883: 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 -@@ -5470,7 +5905,7 @@ - # touch ./include/sched.h - - echo $ac_n "checking "for gcc"""... $ac_c" 1>&6 --echo "configure:5474: checking "for gcc"" >&5 -+echo "configure:5909: checking "for gcc"" >&5 - # We must have gcc - if expr "$CC" : ".*gcc.*" - then -@@ -5485,7 +5920,7 @@ - then - echo "$ac_t"""no"" 1>&6 - echo $ac_n "checking "SCO UnixWare 7.1 native threads"""... $ac_c" 1>&6 --echo "configure:5489: checking "SCO UnixWare 7.1 native threads"" >&5 -+echo "configure:5924: 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 -@@ -5512,7 +5947,7 @@ - echo "$ac_t"""yes"" 1>&6 - # We must have cc - echo $ac_n "checking "for gcc"""... $ac_c" 1>&6 --echo "configure:5516: checking "for gcc"" >&5 -+echo "configure:5951: checking "for gcc"" >&5 - if expr "$CC" : ".*gcc.*" - then - CC="$CC -pthread -DUNIXWARE_7"; -@@ -5539,7 +5974,7 @@ - if test "$with_named_thread" = "no" - then - echo $ac_n "checking "SCO UnixWare7 native threads"""... $ac_c" 1>&6 --echo "configure:5543: checking "SCO UnixWare7 native threads"" >&5 -+echo "configure:5978: 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 -@@ -5560,7 +5995,7 @@ - fi - # We must have cc - echo $ac_n "checking "for gcc"""... $ac_c" 1>&6 --echo "configure:5564: checking "for gcc"" >&5 -+echo "configure:5999: 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; }; -@@ -5581,7 +6016,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:5585: checking "Siemens threads"" >&5 -+echo "configure:6020: checking "Siemens threads"" >&5 - if test -f /usr/lib/libxnet.so -a "$SYSTEM_TYPE" = "sni-sysv4" - then - LIBS="$LIBS_BEFORE_SOCKET -lxnet $LIBS_AFTER_SOCKET" -@@ -5610,7 +6045,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:5614: checking "Solaris threads"" >&5 -+echo "configure:6049: checking "Solaris threads"" >&5 - if test -f /usr/lib/libpthread.so -a -f /usr/lib/libthread.so - then - with_named_thread="-lpthread -lthread" -@@ -5622,7 +6057,7 @@ - - # Should we use named pthread library ? - echo $ac_n "checking "named thread libs:"""... $ac_c" 1>&6 --echo "configure:5626: checking "named thread libs:"" >&5 -+echo "configure:6061: checking "named thread libs:"" >&5 - if test "$with_named_thread" != "no" - then - LIBS="$LIBS $with_named_thread" -@@ -5635,16 +6070,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:5639: checking "for pthread_create in -libc"" >&5; -+echo "configure:6074: checking "for pthread_create in -libc"" >&5; - cat > conftest.$ac_ext <<EOF --#line 5641 "configure" -+#line 6076 "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:5648: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:6083: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* - with_posix_threads=yes - else -@@ -5658,18 +6093,18 @@ - if test "$with_posix_threads" = "no" - then - echo $ac_n "checking "for pthread_create in -lpthread"""... $ac_c" 1>&6 --echo "configure:5662: checking "for pthread_create in -lpthread"" >&5; -+echo "configure:6097: checking "for pthread_create in -lpthread"" >&5; - ac_save_LIBS="$LIBS" - LIBS="$LIBS -lpthread" - cat > conftest.$ac_ext <<EOF --#line 5666 "configure" -+#line 6101 "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:5673: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:6108: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* - with_posix_threads=yes - else -@@ -5684,16 +6119,16 @@ - then - LIBS=" $ac_save_LIBS -lpthreads" - echo $ac_n "checking "for pthread_create in -lpthreads"""... $ac_c" 1>&6 --echo "configure:5688: checking "for pthread_create in -lpthreads"" >&5; -+echo "configure:6123: checking "for pthread_create in -lpthreads"" >&5; - cat > conftest.$ac_ext <<EOF --#line 5690 "configure" -+#line 6125 "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:5697: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:6132: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* - with_posix_threads=yes - else -@@ -5709,16 +6144,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:5713: checking "for pthread_create in -pthread"" >&5; -+echo "configure:6148: checking "for pthread_create in -pthread"" >&5; - cat > conftest.$ac_ext <<EOF --#line 5715 "configure" -+#line 6150 "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:5722: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:6157: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* - with_posix_threads=yes - else -@@ -5746,7 +6181,7 @@ - - my_save_LIBS="$LIBS" - echo $ac_n "checking for strtok_r in -lpthread""... $ac_c" 1>&6 --echo "configure:5750: checking for strtok_r in -lpthread" >&5 -+echo "configure:6185: 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 -@@ -5754,7 +6189,7 @@ - ac_save_LIBS="$LIBS" - LIBS="-lpthread $LIBS" - cat > conftest.$ac_ext <<EOF --#line 5758 "configure" -+#line 6193 "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 -@@ -5765,7 +6200,7 @@ - strtok_r() - ; return 0; } - EOF --if { (eval echo configure:5769: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:6204: \"$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 -@@ -5797,7 +6232,7 @@ - then - my_save_LIBS="$LIBS" - echo $ac_n "checking for strtok_r in -lc_r""... $ac_c" 1>&6 --echo "configure:5801: checking for strtok_r in -lc_r" >&5 -+echo "configure:6236: 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 -@@ -5805,7 +6240,7 @@ - ac_save_LIBS="$LIBS" - LIBS="-lc_r $LIBS" - cat > conftest.$ac_ext <<EOF --#line 5809 "configure" -+#line 6244 "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 -@@ -5816,7 +6251,7 @@ - strtok_r() - ; return 0; } - EOF --if { (eval echo configure:5820: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:6255: \"$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 -@@ -5850,12 +6285,12 @@ - for ac_func in strtok_r pthread_init - do - echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 --echo "configure:5854: checking for $ac_func" >&5 -+echo "configure:6289: 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 5859 "configure" -+#line 6294 "configure" - #include "confdefs.h" - /* System header to define __stub macros and hopefully few prototypes, - which can conflict with char $ac_func(); below. */ -@@ -5878,7 +6313,7 @@ - - ; return 0; } - EOF --if { (eval echo configure:5882: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:6317: \"$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 -@@ -5906,12 +6341,12 @@ - for ac_func in strtok_r - do - echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 --echo "configure:5910: checking for $ac_func" >&5 -+echo "configure:6345: 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 5915 "configure" -+#line 6350 "configure" - #include "confdefs.h" - /* System header to define __stub macros and hopefully few prototypes, - which can conflict with char $ac_func(); below. */ -@@ -5934,7 +6369,7 @@ - - ; return 0; } - EOF --if { (eval echo configure:5938: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:6373: \"$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 -@@ -5963,7 +6398,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:5967: checking for dlopen in -ldl" >&5 -+echo "configure:6402: 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 -@@ -5971,7 +6406,7 @@ - ac_save_LIBS="$LIBS" - LIBS="-ldl $LIBS" - cat > conftest.$ac_ext <<EOF --#line 5975 "configure" -+#line 6410 "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 -@@ -5982,7 +6417,7 @@ - dlopen() - ; return 0; } - EOF --if { (eval echo configure:5986: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:6421: \"$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 -@@ -6012,7 +6447,7 @@ - - # System characteristics - echo $ac_n "checking for restartable system calls""... $ac_c" 1>&6 --echo "configure:6016: checking for restartable system calls" >&5 -+echo "configure:6451: 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 -@@ -6020,7 +6455,7 @@ - { echo "configure: error: can not run test program while cross compiling" 1>&2; exit 1; } - else - cat > conftest.$ac_ext <<EOF --#line 6024 "configure" -+#line 6459 "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 -@@ -6038,7 +6473,7 @@ - } - - EOF --if { (eval echo configure:6042: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null -+if { (eval echo configure:6477: \"$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 -@@ -6167,7 +6602,7 @@ - - - echo $ac_n "checking "need of special linking flags"""... $ac_c" 1>&6 --echo "configure:6171: checking "need of special linking flags"" >&5 -+echo "configure:6606: checking "need of special linking flags"" >&5 - if test "$IS_LINUX" = "true" - then - LDFLAGS="$LDFLAGS -rdynamic" -@@ -6177,12 +6612,12 @@ - fi - - echo $ac_n "checking for working const""... $ac_c" 1>&6 --echo "configure:6181: checking for working const" >&5 -+echo "configure:6616: 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 6186 "configure" -+#line 6621 "configure" - #include "confdefs.h" - - int main() { -@@ -6231,7 +6666,7 @@ - - ; return 0; } - EOF --if { (eval echo configure:6235: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then -+if { (eval echo configure:6670: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then - rm -rf conftest* - ac_cv_c_const=yes - else -@@ -6252,21 +6687,21 @@ - fi - - echo $ac_n "checking for inline""... $ac_c" 1>&6 --echo "configure:6256: checking for inline" >&5 -+echo "configure:6691: 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 6263 "configure" -+#line 6698 "configure" - #include "confdefs.h" - - int main() { - } $ac_kw foo() { - ; return 0; } - EOF --if { (eval echo configure:6270: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then -+if { (eval echo configure:6705: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then - rm -rf conftest* - ac_cv_c_inline=$ac_kw; break - else -@@ -6292,12 +6727,12 @@ - esac - - echo $ac_n "checking for off_t""... $ac_c" 1>&6 --echo "configure:6296: checking for off_t" >&5 -+echo "configure:6731: 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 6301 "configure" -+#line 6736 "configure" - #include "confdefs.h" - #include <sys/types.h> - #if STDC_HEADERS -@@ -6325,12 +6760,12 @@ - fi - - echo $ac_n "checking for st_rdev in struct stat""... $ac_c" 1>&6 --echo "configure:6329: checking for st_rdev in struct stat" >&5 -+echo "configure:6764: 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 6334 "configure" -+#line 6769 "configure" - #include "confdefs.h" - #include <sys/types.h> - #include <sys/stat.h> -@@ -6338,7 +6773,7 @@ - struct stat s; s.st_rdev; - ; return 0; } - EOF --if { (eval echo configure:6342: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then -+if { (eval echo configure:6777: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then - rm -rf conftest* - ac_cv_struct_st_rdev=yes - else -@@ -6359,12 +6794,12 @@ - fi - - echo $ac_n "checking whether time.h and sys/time.h may both be included""... $ac_c" 1>&6 --echo "configure:6363: checking whether time.h and sys/time.h may both be included" >&5 -+echo "configure:6798: 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 6368 "configure" -+#line 6803 "configure" - #include "confdefs.h" - #include <sys/types.h> - #include <sys/time.h> -@@ -6373,7 +6808,7 @@ - struct tm *tp; - ; return 0; } - EOF --if { (eval echo configure:6377: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then -+if { (eval echo configure:6812: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then - rm -rf conftest* - ac_cv_header_time=yes - else -@@ -6394,12 +6829,12 @@ - fi - - echo $ac_n "checking whether struct tm is in sys/time.h or time.h""... $ac_c" 1>&6 --echo "configure:6398: checking whether struct tm is in sys/time.h or time.h" >&5 -+echo "configure:6833: 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 6403 "configure" -+#line 6838 "configure" - #include "confdefs.h" - #include <sys/types.h> - #include <time.h> -@@ -6407,7 +6842,7 @@ - struct tm *tp; tp->tm_sec; - ; return 0; } - EOF --if { (eval echo configure:6411: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then -+if { (eval echo configure:6846: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then - rm -rf conftest* - ac_cv_struct_tm=time.h - else -@@ -6430,7 +6865,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:6434: checking size of char" >&5 -+echo "configure:6869: 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 -@@ -6438,7 +6873,7 @@ - ac_cv_sizeof_char=1 - else - cat > conftest.$ac_ext <<EOF --#line 6442 "configure" -+#line 6877 "configure" - #include "confdefs.h" - #include <stdio.h> - main() -@@ -6449,7 +6884,7 @@ - exit(0); - } - EOF --if { (eval echo configure:6453: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null -+if { (eval echo configure:6888: \"$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 -@@ -6479,7 +6914,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:6483: checking size of int" >&5 -+echo "configure:6918: 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 -@@ -6487,7 +6922,7 @@ - ac_cv_sizeof_int=4 - else - cat > conftest.$ac_ext <<EOF --#line 6491 "configure" -+#line 6926 "configure" - #include "confdefs.h" - #include <stdio.h> - main() -@@ -6498,7 +6933,7 @@ - exit(0); - } - EOF --if { (eval echo configure:6502: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null -+if { (eval echo configure:6937: \"$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 -@@ -6522,7 +6957,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:6526: checking size of long" >&5 -+echo "configure:6961: 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 -@@ -6530,7 +6965,7 @@ - ac_cv_sizeof_long=4 - else - cat > conftest.$ac_ext <<EOF --#line 6534 "configure" -+#line 6969 "configure" - #include "confdefs.h" - #include <stdio.h> - main() -@@ -6541,7 +6976,7 @@ - exit(0); - } - EOF --if { (eval echo configure:6545: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null -+if { (eval echo configure:6980: \"$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 -@@ -6565,7 +7000,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:6569: checking size of long long" >&5 -+echo "configure:7004: 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 -@@ -6573,7 +7008,7 @@ - ac_cv_sizeof_long_long=8 - else - cat > conftest.$ac_ext <<EOF --#line 6577 "configure" -+#line 7012 "configure" - #include "confdefs.h" - #include <stdio.h> - main() -@@ -6584,7 +7019,7 @@ - exit(0); - } - EOF --if { (eval echo configure:6588: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null -+if { (eval echo configure:7023: \"$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 -@@ -6609,7 +7044,7 @@ - fi - # off_t is not a builtin type - echo $ac_n "checking size of off_t""... $ac_c" 1>&6 --echo "configure:6613: checking size of off_t" >&5 -+echo "configure:7048: 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 -@@ -6617,7 +7052,7 @@ - ac_cv_sizeof_off_t=4 - else - cat > conftest.$ac_ext <<EOF --#line 6621 "configure" -+#line 7056 "configure" - #include "confdefs.h" - #include <stdio.h> - #include <sys/types.h> -@@ -6633,7 +7068,7 @@ - exit(0); - } - EOF --if { (eval echo configure:6637: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null -+if { (eval echo configure:7072: \"$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 -@@ -6658,14 +7093,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:6662: checking whether byte ordering is bigendian" >&5 -+echo "configure:7097: 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 6669 "configure" -+#line 7104 "configure" - #include "confdefs.h" - #include <sys/types.h> - #include <sys/param.h> -@@ -6676,11 +7111,11 @@ - #endif - ; return 0; } - EOF --if { (eval echo configure:6680: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then -+if { (eval echo configure:7115: \"$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 6684 "configure" -+#line 7119 "configure" - #include "confdefs.h" - #include <sys/types.h> - #include <sys/param.h> -@@ -6691,7 +7126,7 @@ - #endif - ; return 0; } - EOF --if { (eval echo configure:6695: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then -+if { (eval echo configure:7130: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then - rm -rf conftest* - ac_cv_c_bigendian=yes - else -@@ -6711,7 +7146,7 @@ - { echo "configure: error: can not run test program while cross compiling" 1>&2; exit 1; } - else - cat > conftest.$ac_ext <<EOF --#line 6715 "configure" -+#line 7150 "configure" - #include "confdefs.h" - main () { - /* Are we little or big endian? From Harbison&Steele. */ -@@ -6724,7 +7159,7 @@ - exit (u.c[sizeof (long) - 1] == 1); - } - EOF --if { (eval echo configure:6728: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null -+if { (eval echo configure:7163: \"$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 -@@ -6751,7 +7186,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:6755: checking base type of last arg to accept" >&5 -+echo "configure:7190: 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 -@@ -6769,7 +7204,7 @@ - fi - mysql_cv_btype_last_arg_accept=none - cat > conftest.$ac_ext <<EOF --#line 6773 "configure" -+#line 7208 "configure" - #include "confdefs.h" - #if defined(inline) - #undef inline -@@ -6782,7 +7217,7 @@ - int a = accept(1, (struct sockaddr *) 0, (socklen_t *) 0); return (a != 0); - ; return 0; } - EOF --if { (eval echo configure:6786: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then -+if { (eval echo configure:7221: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then - rm -rf conftest* - mysql_cv_btype_last_arg_accept=socklen_t - else -@@ -6792,7 +7227,7 @@ - rm -f conftest* - if test $mysql_cv_btype_last_arg_accept = none; then - cat > conftest.$ac_ext <<EOF --#line 6796 "configure" -+#line 7231 "configure" - #include "confdefs.h" - #if defined(inline) - #undef inline -@@ -6805,7 +7240,7 @@ - int a = accept(1, (struct sockaddr *) 0, (size_t *) 0); return (a != 0); - ; return 0; } - EOF --if { (eval echo configure:6809: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then -+if { (eval echo configure:7244: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then - rm -rf conftest* - mysql_cv_btype_last_arg_accept=size_t - else -@@ -6837,7 +7272,7 @@ - #---END: - # Find where the stack goes - echo $ac_n "checking stack direction for C alloca""... $ac_c" 1>&6 --echo "configure:6841: checking stack direction for C alloca" >&5 -+echo "configure:7276: 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 -@@ -6845,7 +7280,7 @@ - ac_cv_c_stack_direction=0 - else - cat > conftest.$ac_ext <<EOF --#line 6849 "configure" -+#line 7284 "configure" - #include "confdefs.h" - find_stack_direction () - { -@@ -6864,7 +7299,7 @@ - exit (find_stack_direction() < 0); - } - EOF --if { (eval echo configure:6868: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null -+if { (eval echo configure:7303: \"$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 -@@ -6892,19 +7327,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:6896: checking for working alloca.h" >&5 -+echo "configure:7331: 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 6901 "configure" -+#line 7336 "configure" - #include "confdefs.h" - #include <alloca.h> - int main() { - char *p = alloca(2 * sizeof(int)); - ; return 0; } - EOF --if { (eval echo configure:6908: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:7343: \"$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 -@@ -6926,12 +7361,12 @@ - fi - - echo $ac_n "checking for alloca""... $ac_c" 1>&6 --echo "configure:6930: checking for alloca" >&5 -+echo "configure:7365: 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 6935 "configure" -+#line 7370 "configure" - #include "confdefs.h" - - #ifdef __GNUC__ -@@ -6954,7 +7389,7 @@ - char *p = (char *) alloca(1); - ; return 0; } - EOF --if { (eval echo configure:6958: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:7393: \"$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 -@@ -6986,12 +7421,12 @@ - - - echo $ac_n "checking whether alloca needs Cray hooks""... $ac_c" 1>&6 --echo "configure:6990: checking whether alloca needs Cray hooks" >&5 -+echo "configure:7425: 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 6995 "configure" -+#line 7430 "configure" - #include "confdefs.h" - #if defined(CRAY) && ! defined(CRAY2) - webecray -@@ -7016,12 +7451,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:7020: checking for $ac_func" >&5 -+echo "configure:7455: 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 7025 "configure" -+#line 7460 "configure" - #include "confdefs.h" - /* System header to define __stub macros and hopefully few prototypes, - which can conflict with char $ac_func(); below. */ -@@ -7044,7 +7479,7 @@ - - ; return 0; } - EOF --if { (eval echo configure:7048: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:7483: \"$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 -@@ -7076,12 +7511,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:7080: checking if struct timespec has a ts_sec member" >&5 -+echo "configure:7515: 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 7085 "configure" -+#line 7520 "configure" - #include "confdefs.h" - #include <pthread.h> - #ifdef __cplusplus -@@ -7096,7 +7531,7 @@ - - ; return 0; } - EOF --if { (eval echo configure:7100: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then -+if { (eval echo configure:7535: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then - rm -rf conftest* - mysql_cv_timespec_ts=yes - else -@@ -7119,12 +7554,12 @@ - - # Do we have the tzname variable - echo $ac_n "checking if we have tzname variable""... $ac_c" 1>&6 --echo "configure:7123: checking if we have tzname variable" >&5 -+echo "configure:7558: 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 7128 "configure" -+#line 7563 "configure" - #include "confdefs.h" - #include <time.h> - #ifdef __cplusplus -@@ -7137,7 +7572,7 @@ - - ; return 0; } - EOF --if { (eval echo configure:7141: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then -+if { (eval echo configure:7576: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then - rm -rf conftest* - mysql_cv_tzname=yes - else -@@ -7160,7 +7595,7 @@ - - # Do the system files define ulong - echo $ac_n "checking for type ulong""... $ac_c" 1>&6 --echo "configure:7164: checking for type ulong" >&5 -+echo "configure:7599: checking for type ulong" >&5 - if eval "test \"`echo '$''{'ac_cv_ulong'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else -@@ -7168,7 +7603,7 @@ - ac_cv_ulong=no - else - cat > conftest.$ac_ext <<EOF --#line 7172 "configure" -+#line 7607 "configure" - #include "confdefs.h" - #include <stdio.h> - #include <sys/types.h> -@@ -7179,7 +7614,7 @@ - exit(0); - } - EOF --if { (eval echo configure:7183: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null -+if { (eval echo configure:7618: \"$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 -@@ -7204,7 +7639,7 @@ - - # Do the system files define uchar - echo $ac_n "checking for type uchar""... $ac_c" 1>&6 --echo "configure:7208: checking for type uchar" >&5 -+echo "configure:7643: checking for type uchar" >&5 - if eval "test \"`echo '$''{'ac_cv_uchar'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else -@@ -7212,7 +7647,7 @@ - ac_cv_uchar=no - else - cat > conftest.$ac_ext <<EOF --#line 7216 "configure" -+#line 7651 "configure" - #include "confdefs.h" - #include <stdio.h> - #include <sys/types.h> -@@ -7223,7 +7658,7 @@ - exit(0); - } - EOF --if { (eval echo configure:7227: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null -+if { (eval echo configure:7662: \"$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 -@@ -7248,7 +7683,7 @@ - - # Do the system files define uint - echo $ac_n "checking for type uint""... $ac_c" 1>&6 --echo "configure:7252: checking for type uint" >&5 -+echo "configure:7687: checking for type uint" >&5 - if eval "test \"`echo '$''{'ac_cv_uint'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else -@@ -7256,7 +7691,7 @@ - ac_cv_uint=no - else - cat > conftest.$ac_ext <<EOF --#line 7260 "configure" -+#line 7695 "configure" - #include "confdefs.h" - #include <stdio.h> - #include <sys/types.h> -@@ -7267,7 +7702,7 @@ - exit(0); - } - EOF --if { (eval echo configure:7271: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null -+if { (eval echo configure:7706: \"$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 -@@ -7292,7 +7727,7 @@ - - #Check for fp_except in ieeefp.h - echo $ac_n "checking for type fp_except""... $ac_c" 1>&6 --echo "configure:7296: checking for type fp_except" >&5 -+echo "configure:7731: 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 -@@ -7300,7 +7735,7 @@ - ac_cv_fp_except=no - else - cat > conftest.$ac_ext <<EOF --#line 7304 "configure" -+#line 7739 "configure" - #include "confdefs.h" - #include <stdio.h> - #include <sys/types.h> -@@ -7312,7 +7747,7 @@ - exit(0); - } - EOF --if { (eval echo configure:7316: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null -+if { (eval echo configure:7751: \"$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 -@@ -7339,7 +7774,7 @@ - - - echo $ac_n "checking if ${CXX} supports bool types""... $ac_c" 1>&6 --echo "configure:7343: checking if ${CXX} supports bool types" >&5 -+echo "configure:7778: 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 -@@ -7353,14 +7788,14 @@ - cross_compiling=$ac_cv_prog_cxx_cross - - cat > conftest.$ac_ext <<EOF --#line 7357 "configure" -+#line 7792 "configure" - #include "confdefs.h" - - int main() { - bool b = true; - ; return 0; } - EOF --if { (eval echo configure:7364: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then -+if { (eval echo configure:7799: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then - rm -rf conftest* - mysql_cv_have_bool=yes - else -@@ -7391,7 +7826,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:7395: checking if conversion of longlong to float works" >&5 -+echo "configure:7830: 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 -@@ -7399,7 +7834,7 @@ - { echo "configure: error: can not run test program while cross compiling" 1>&2; exit 1; } - else - cat > conftest.$ac_ext <<EOF --#line 7403 "configure" -+#line 7838 "configure" - #include "confdefs.h" - #include <stdio.h> - typedef long long longlong; -@@ -7414,7 +7849,7 @@ - exit (0); - } - EOF --if { (eval echo configure:7418: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null -+if { (eval echo configure:7853: \"$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 -@@ -7457,17 +7892,17 @@ - do - ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` - echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 --echo "configure:7461: checking for $ac_hdr" >&5 -+echo "configure:7896: 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 7466 "configure" -+#line 7901 "configure" - #include "confdefs.h" - #include <$ac_hdr> - EOF - ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" --{ (eval echo configure:7471: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } -+{ (eval echo configure:7906: \"$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* -@@ -7498,12 +7933,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:7502: checking for $ac_func" >&5 -+echo "configure:7937: 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 7507 "configure" -+#line 7942 "configure" - #include "confdefs.h" - /* System header to define __stub macros and hopefully few prototypes, - which can conflict with char $ac_func(); below. */ -@@ -7526,7 +7961,7 @@ - - ; return 0; } - EOF --if { (eval echo configure:7530: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:7965: \"$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 -@@ -7552,12 +7987,12 @@ - - - echo $ac_n "checking whether stat file-mode macros are broken""... $ac_c" 1>&6 --echo "configure:7556: checking whether stat file-mode macros are broken" >&5 -+echo "configure:7991: 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 7561 "configure" -+#line 7996 "configure" - #include "confdefs.h" - #include <sys/types.h> - #include <sys/stat.h> -@@ -7608,12 +8043,12 @@ - fi - - echo $ac_n "checking return type of signal handlers""... $ac_c" 1>&6 --echo "configure:7612: checking return type of signal handlers" >&5 -+echo "configure:8047: 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 7617 "configure" -+#line 8052 "configure" - #include "confdefs.h" - #include <sys/types.h> - #include <signal.h> -@@ -7630,7 +8065,7 @@ - int i; - ; return 0; } - EOF --if { (eval echo configure:7634: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then -+if { (eval echo configure:8069: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then - rm -rf conftest* - ac_cv_type_signal=void - else -@@ -7650,13 +8085,13 @@ - - - echo $ac_n "checking for type of signal functions""... $ac_c" 1>&6 --echo "configure:7654: checking for type of signal functions" >&5 -+echo "configure:8089: 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 7660 "configure" -+#line 8095 "configure" - #include "confdefs.h" - #include <signal.h> - int main() { -@@ -7669,7 +8104,7 @@ - - ; return 0; } - EOF --if { (eval echo configure:7673: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:8108: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* - mysql_cv_signal_vintage=posix - else -@@ -7678,7 +8113,7 @@ - rm -rf conftest* - - cat > conftest.$ac_ext <<EOF --#line 7682 "configure" -+#line 8117 "configure" - #include "confdefs.h" - #include <signal.h> - int main() { -@@ -7688,7 +8123,7 @@ - - ; return 0; } - EOF --if { (eval echo configure:7692: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:8127: \"$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 -@@ -7697,7 +8132,7 @@ - rm -rf conftest* - - cat > conftest.$ac_ext <<EOF --#line 7701 "configure" -+#line 8136 "configure" - #include "confdefs.h" - - #include <signal.h> -@@ -7710,7 +8145,7 @@ - - ; return 0; } - EOF --if { (eval echo configure:7714: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:8149: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* - mysql_cv_signal_vintage=svr3 - else -@@ -7749,12 +8184,12 @@ - fi - - echo $ac_n "checking whether programs are able to redeclare getpw functions""... $ac_c" 1>&6 --echo "configure:7753: checking whether programs are able to redeclare getpw functions" >&5 -+echo "configure:8188: 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 7758 "configure" -+#line 8193 "configure" - #include "confdefs.h" - #include <sys/types.h> - #include <pwd.h> -@@ -7763,7 +8198,7 @@ - struct passwd *z; z = getpwent(); - ; return 0; } - EOF --if { (eval echo configure:7767: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then -+if { (eval echo configure:8202: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then - rm -rf conftest* - mysql_cv_can_redecl_getpw=yes - else -@@ -7784,12 +8219,12 @@ - fi - - echo $ac_n "checking for TIOCGWINSZ in sys/ioctl.h""... $ac_c" 1>&6 --echo "configure:7788: checking for TIOCGWINSZ in sys/ioctl.h" >&5 -+echo "configure:8223: 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 7793 "configure" -+#line 8228 "configure" - #include "confdefs.h" - #include <sys/types.h> - #include <sys/ioctl.h> -@@ -7797,7 +8232,7 @@ - int x = TIOCGWINSZ; - ; return 0; } - EOF --if { (eval echo configure:7801: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then -+if { (eval echo configure:8236: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then - rm -rf conftest* - mysql_cv_tiocgwinsz_in_ioctl=yes - else -@@ -7818,12 +8253,12 @@ - fi - - echo $ac_n "checking for FIONREAD in sys/ioctl.h""... $ac_c" 1>&6 --echo "configure:7822: checking for FIONREAD in sys/ioctl.h" >&5 -+echo "configure:8257: 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 7827 "configure" -+#line 8262 "configure" - #include "confdefs.h" - #include <sys/types.h> - #include <sys/ioctl.h> -@@ -7831,7 +8266,7 @@ - int x = FIONREAD; - ; return 0; } - EOF --if { (eval echo configure:7835: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then -+if { (eval echo configure:8270: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then - rm -rf conftest* - mysql_cv_fionread_in_ioctl=yes - else -@@ -7852,12 +8287,12 @@ - fi - - echo $ac_n "checking for TIOCSTAT in sys/ioctl.h""... $ac_c" 1>&6 --echo "configure:7856: checking for TIOCSTAT in sys/ioctl.h" >&5 -+echo "configure:8291: 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 7861 "configure" -+#line 8296 "configure" - #include "confdefs.h" - #include <sys/types.h> - #include <sys/ioctl.h> -@@ -7865,7 +8300,7 @@ - int x = TIOCSTAT; - ; return 0; } - EOF --if { (eval echo configure:7869: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then -+if { (eval echo configure:8304: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then - rm -rf conftest* - mysql_cv_tiocstat_in_ioctl=yes - else -@@ -7887,12 +8322,12 @@ - - - echo $ac_n "checking if struct dirent has a d_ino member""... $ac_c" 1>&6 --echo "configure:7891: checking if struct dirent has a d_ino member" >&5 -+echo "configure:8326: 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 7896 "configure" -+#line 8331 "configure" - #include "confdefs.h" - - #include <stdio.h> -@@ -7921,7 +8356,7 @@ - - ; return 0; } - EOF --if { (eval echo configure:7925: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then -+if { (eval echo configure:8360: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then - rm -rf conftest* - mysql_cv_dirent_has_dino=yes - else -@@ -7942,12 +8377,12 @@ - fi - - echo $ac_n "checking whether signal handlers are of type void""... $ac_c" 1>&6 --echo "configure:7946: checking whether signal handlers are of type void" >&5 -+echo "configure:8381: 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 7951 "configure" -+#line 8386 "configure" - #include "confdefs.h" - #include <sys/types.h> - #include <signal.h> -@@ -7962,7 +8397,7 @@ - int i; - ; return 0; } - EOF --if { (eval echo configure:7966: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then -+if { (eval echo configure:8401: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then - rm -rf conftest* - mysql_cv_void_sighandler=yes - else -@@ -7988,7 +8423,7 @@ - echo $ac_n "(cached) $ac_c" 1>&6 - else - echo $ac_n "checking for tgetent in -lncurses""... $ac_c" 1>&6 --echo "configure:7992: checking for tgetent in -lncurses" >&5 -+echo "configure:8427: 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 -@@ -7996,7 +8431,7 @@ - ac_save_LIBS="$LIBS" - LIBS="-lncurses $LIBS" - cat > conftest.$ac_ext <<EOF --#line 8000 "configure" -+#line 8435 "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 -@@ -8007,7 +8442,7 @@ - tgetent() - ; return 0; } - EOF --if { (eval echo configure:8011: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:8446: \"$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 -@@ -8026,7 +8461,7 @@ - else - echo "$ac_t""no" 1>&6 - echo $ac_n "checking for tgetent in -lcurses""... $ac_c" 1>&6 --echo "configure:8030: checking for tgetent in -lcurses" >&5 -+echo "configure:8465: 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 -@@ -8034,7 +8469,7 @@ - ac_save_LIBS="$LIBS" - LIBS="-lcurses $LIBS" - cat > conftest.$ac_ext <<EOF --#line 8038 "configure" -+#line 8473 "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 -@@ -8045,7 +8480,7 @@ - tgetent() - ; return 0; } - EOF --if { (eval echo configure:8049: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:8484: \"$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 -@@ -8064,7 +8499,7 @@ - else - echo "$ac_t""no" 1>&6 - echo $ac_n "checking for tgetent in -ltermcap""... $ac_c" 1>&6 --echo "configure:8068: checking for tgetent in -ltermcap" >&5 -+echo "configure:8503: 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 -@@ -8072,7 +8507,7 @@ - ac_save_LIBS="$LIBS" - LIBS="-ltermcap $LIBS" - cat > conftest.$ac_ext <<EOF --#line 8076 "configure" -+#line 8511 "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 -@@ -8083,7 +8518,7 @@ - tgetent() - ; return 0; } - EOF --if { (eval echo configure:8087: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:8522: \"$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 -@@ -8111,7 +8546,7 @@ - fi - - echo $ac_n "checking for termcap functions library""... $ac_c" 1>&6 --echo "configure:8115: checking for termcap functions library" >&5 -+echo "configure:8550: 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 -@@ -8135,17 +8570,17 @@ - do - ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` - echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 --echo "configure:8139: checking for $ac_hdr" >&5 -+echo "configure:8574: 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 8144 "configure" -+#line 8579 "configure" - #include "confdefs.h" - #include <$ac_hdr> - EOF - ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" --{ (eval echo configure:8149: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } -+{ (eval echo configure:8584: \"$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* -@@ -8174,12 +8609,12 @@ - for ac_func in getpagesize - do - echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 --echo "configure:8178: checking for $ac_func" >&5 -+echo "configure:8613: 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 8183 "configure" -+#line 8618 "configure" - #include "confdefs.h" - /* System header to define __stub macros and hopefully few prototypes, - which can conflict with char $ac_func(); below. */ -@@ -8202,7 +8637,7 @@ - - ; return 0; } - EOF --if { (eval echo configure:8206: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:8641: \"$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 -@@ -8227,7 +8662,7 @@ - done - - echo $ac_n "checking for working mmap""... $ac_c" 1>&6 --echo "configure:8231: checking for working mmap" >&5 -+echo "configure:8666: 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 -@@ -8235,7 +8670,7 @@ - ac_cv_func_mmap_fixed_mapped=no - else - cat > conftest.$ac_ext <<EOF --#line 8239 "configure" -+#line 8674 "configure" - #include "confdefs.h" - - /* Thanks to Mike Haertel and Jim Avera for this test. -@@ -8375,7 +8810,7 @@ - } - - EOF --if { (eval echo configure:8379: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null -+if { (eval echo configure:8814: \"$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 -@@ -8398,12 +8833,12 @@ - fi - - echo $ac_n "checking return type of signal handlers""... $ac_c" 1>&6 --echo "configure:8402: checking return type of signal handlers" >&5 -+echo "configure:8837: 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 8407 "configure" -+#line 8842 "configure" - #include "confdefs.h" - #include <sys/types.h> - #include <signal.h> -@@ -8420,7 +8855,7 @@ - int i; - ; return 0; } - EOF --if { (eval echo configure:8424: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then -+if { (eval echo configure:8859: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then - rm -rf conftest* - ac_cv_type_signal=void - else -@@ -8439,12 +8874,12 @@ - - - echo $ac_n "checking return type of qsort""... $ac_c" 1>&6 --echo "configure:8443: checking return type of qsort" >&5 -+echo "configure:8878: 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 8448 "configure" -+#line 8883 "configure" - #include "confdefs.h" - #include <stdlib.h> - #ifdef __cplusplus -@@ -8457,7 +8892,7 @@ - int i; - ; return 0; } - EOF --if { (eval echo configure:8461: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then -+if { (eval echo configure:8896: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then - rm -rf conftest* - mysql_cv_type_qsort=void - else -@@ -8483,7 +8918,7 @@ - fi - - echo $ac_n "checking whether utime accepts a null argument""... $ac_c" 1>&6 --echo "configure:8487: checking whether utime accepts a null argument" >&5 -+echo "configure:8922: 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 -@@ -8493,7 +8928,7 @@ - ac_cv_func_utime_null=no - else - cat > conftest.$ac_ext <<EOF --#line 8497 "configure" -+#line 8932 "configure" - #include "confdefs.h" - #include <sys/types.h> - #include <sys/stat.h> -@@ -8504,7 +8939,7 @@ - && t.st_mtime - s.st_mtime < 120)); - } - EOF --if { (eval echo configure:8508: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null -+if { (eval echo configure:8943: \"$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 -@@ -8528,12 +8963,12 @@ - fi - - echo $ac_n "checking for vprintf""... $ac_c" 1>&6 --echo "configure:8532: checking for vprintf" >&5 -+echo "configure:8967: 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 8537 "configure" -+#line 8972 "configure" - #include "confdefs.h" - /* System header to define __stub macros and hopefully few prototypes, - which can conflict with char vprintf(); below. */ -@@ -8556,7 +8991,7 @@ - - ; return 0; } - EOF --if { (eval echo configure:8560: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:8995: \"$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 -@@ -8580,12 +9015,12 @@ - - if test "$ac_cv_func_vprintf" != yes; then - echo $ac_n "checking for _doprnt""... $ac_c" 1>&6 --echo "configure:8584: checking for _doprnt" >&5 -+echo "configure:9019: 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 8589 "configure" -+#line 9024 "configure" - #include "confdefs.h" - /* System header to define __stub macros and hopefully few prototypes, - which can conflict with char _doprnt(); below. */ -@@ -8608,7 +9043,7 @@ - - ; return 0; } - EOF --if { (eval echo configure:8612: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:9047: \"$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 -@@ -8650,12 +9085,12 @@ - dlopen dlerror fchmod getpass getpassphrase initgroups mlockall - do - echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 --echo "configure:8654: checking for $ac_func" >&5 -+echo "configure:9089: 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 8659 "configure" -+#line 9094 "configure" - #include "confdefs.h" - /* System header to define __stub macros and hopefully few prototypes, - which can conflict with char $ac_func(); below. */ -@@ -8678,7 +9113,7 @@ - - ; return 0; } - EOF --if { (eval echo configure:8682: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:9117: \"$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 -@@ -8708,12 +9143,12 @@ - for ac_func in fseeko - do - echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 --echo "configure:8712: checking for $ac_func" >&5 -+echo "configure:9147: 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 8717 "configure" -+#line 9152 "configure" - #include "confdefs.h" - /* System header to define __stub macros and hopefully few prototypes, - which can conflict with char $ac_func(); below. */ -@@ -8736,7 +9171,7 @@ - - ; return 0; } - EOF --if { (eval echo configure:8740: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:9175: \"$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 -@@ -8768,7 +9203,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:8772: checking style of gethost* routines" >&5 -+echo "configure:9207: 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 -@@ -8785,7 +9220,7 @@ - CXXFLAGS="$CXXFLAGS -Werror" - fi - cat > conftest.$ac_ext <<EOF --#line 8789 "configure" -+#line 9224 "configure" - #include "confdefs.h" - #if !defined(SCO) && !defined(__osf__) - #define _REENTRANT -@@ -8802,7 +9237,7 @@ - 0, 0, (struct hostent *) 0, (char *) NULL, 0, &skr); return (foo == 0); - ; return 0; } - EOF --if { (eval echo configure:8806: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then -+if { (eval echo configure:9241: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then - rm -rf conftest* - mysql_cv_gethost_style=solaris - else -@@ -8836,7 +9271,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:8840: checking style of gethostname_r routines" >&5 -+echo "configure:9275: 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 -@@ -8853,7 +9288,7 @@ - CXXFLAGS="$CXXFLAGS -Werror" - fi - cat > conftest.$ac_ext <<EOF --#line 8857 "configure" -+#line 9292 "configure" - #include "confdefs.h" - #if !defined(SCO) && !defined(__osf__) - #define _REENTRANT -@@ -8871,7 +9306,7 @@ - (struct hostent*) 0, (char*) 0, 0, (struct hostent **) 0, &skr); - ; return 0; } - EOF --if { (eval echo configure:8875: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then -+if { (eval echo configure:9310: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then - rm -rf conftest* - mysql_cv_gethostname_style=glibc2 - else -@@ -8903,7 +9338,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:8907: checking 3 argument to gethostname_r routines" >&5 -+echo "configure:9342: 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 -@@ -8920,7 +9355,7 @@ - CXXFLAGS="$CXXFLAGS -Werror" - fi - cat > conftest.$ac_ext <<EOF --#line 8924 "configure" -+#line 9359 "configure" - #include "confdefs.h" - #if !defined(SCO) && !defined(__osf__) - #define _REENTRANT -@@ -8937,7 +9372,7 @@ - skr = gethostbyname_r((const char *) 0, (struct hostent*) 0, (hostent_data*) 0); - ; return 0; } - EOF --if { (eval echo configure:8941: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then -+if { (eval echo configure:9376: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then - rm -rf conftest* - mysql_cv_gethostname_arg=hostent_data - else -@@ -8971,12 +9406,12 @@ - then - # Check definition of pthread_getspecific - echo $ac_n "checking "args to pthread_getspecific"""... $ac_c" 1>&6 --echo "configure:8975: checking "args to pthread_getspecific"" >&5 -+echo "configure:9410: 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 8980 "configure" -+#line 9415 "configure" - #include "confdefs.h" - #if !defined(SCO) && !defined(__osf__) - #define _REENTRANT -@@ -8988,7 +9423,7 @@ - pthread_getspecific((pthread_key_t) NULL); - ; return 0; } - EOF --if { (eval echo configure:8992: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then -+if { (eval echo configure:9427: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then - rm -rf conftest* - mysql_cv_getspecific_args=POSIX - else -@@ -9011,12 +9446,12 @@ - - # Check definition of pthread_mutex_init - echo $ac_n "checking "args to pthread_mutex_init"""... $ac_c" 1>&6 --echo "configure:9015: checking "args to pthread_mutex_init"" >&5 -+echo "configure:9450: 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 9020 "configure" -+#line 9455 "configure" - #include "confdefs.h" - #if !defined(SCO) && !defined(__osf__) - #define _REENTRANT -@@ -9030,7 +9465,7 @@ - pthread_mutex_init(&mp,&attr); - ; return 0; } - EOF --if { (eval echo configure:9034: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then -+if { (eval echo configure:9469: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then - rm -rf conftest* - mysql_cv_mutex_init_args=POSIX - else -@@ -9056,12 +9491,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:9060: checking "args to readdir_r"" >&5 -+echo "configure:9495: 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 9065 "configure" -+#line 9500 "configure" - #include "confdefs.h" - #if !defined(SCO) && !defined(__osf__) - #define _REENTRANT -@@ -9074,7 +9509,7 @@ - readdir_r((DIR *) NULL, (struct dirent *) NULL, (struct dirent **) NULL); - ; return 0; } - EOF --if { (eval echo configure:9078: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:9513: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* - mysql_cv_readdir_r=POSIX - else -@@ -9097,12 +9532,12 @@ - - # Check definition av posix sigwait() - echo $ac_n "checking "style of sigwait"""... $ac_c" 1>&6 --echo "configure:9101: checking "style of sigwait"" >&5 -+echo "configure:9536: 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 9106 "configure" -+#line 9541 "configure" - #include "confdefs.h" - #if !defined(SCO) && !defined(__osf__) - #define _REENTRANT -@@ -9118,7 +9553,7 @@ - #endif - ; return 0; } - EOF --if { (eval echo configure:9122: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:9557: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* - mysql_cv_sigwait=POSIX - else -@@ -9144,12 +9579,12 @@ - unset mysql_cv_sigwait - # Check definition av posix sigwait() - echo $ac_n "checking "style of sigwait"""... $ac_c" 1>&6 --echo "configure:9148: checking "style of sigwait"" >&5 -+echo "configure:9583: 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 9153 "configure" -+#line 9588 "configure" - #include "confdefs.h" - #if !defined(SCO) && !defined(__osf__) - #define _REENTRANT -@@ -9163,7 +9598,7 @@ - sigwait(&set); - ; return 0; } - EOF --if { (eval echo configure:9167: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:9602: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* - mysql_cv_sigwait=NONPOSIX - else -@@ -9188,12 +9623,12 @@ - - # Check if pthread_attr_setscope() exists - echo $ac_n "checking "for pthread_attr_setscope"""... $ac_c" 1>&6 --echo "configure:9192: checking "for pthread_attr_setscope"" >&5 -+echo "configure:9627: 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 9197 "configure" -+#line 9632 "configure" - #include "confdefs.h" - #if !defined(SCO) && !defined(__osf__) - #define _REENTRANT -@@ -9205,7 +9640,7 @@ - pthread_attr_setscope(&thr_attr,0); - ; return 0; } - EOF --if { (eval echo configure:9209: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:9644: \"$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 -@@ -9228,9 +9663,9 @@ - - # Check for bad includes - echo $ac_n "checking "can netinet files be included"""... $ac_c" 1>&6 --echo "configure:9232: checking "can netinet files be included"" >&5 -+echo "configure:9667: checking "can netinet files be included"" >&5 - cat > conftest.$ac_ext <<EOF --#line 9234 "configure" -+#line 9669 "configure" - #include "confdefs.h" - #include <sys/types.h> - #include <sys/socket.h> -@@ -9242,7 +9677,7 @@ - printf("1\n"); - ; return 0; } - EOF --if { (eval echo configure:9246: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then -+if { (eval echo configure:9681: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then - rm -rf conftest* - netinet_inc=yes - else -@@ -9357,7 +9792,7 @@ - - - echo $ac_n "checking "character sets"""... $ac_c" 1>&6 --echo "configure:9361: checking "character sets"" >&5 -+echo "configure:9796: checking "character sets"" >&5 - - if test "$extra_charsets" = none; then - CHARSETS="" -@@ -9595,7 +10030,7 @@ - - - echo $ac_n "checking for BerkeleyDB""... $ac_c" 1>&6 --echo "configure:9599: checking for BerkeleyDB" >&5 -+echo "configure:10034: checking for BerkeleyDB" >&5 - - have_berkeley_db=no - case "$bdb" in -@@ -9667,16 +10102,16 @@ - if test X"$bdb_version_ok" = Xyes; then - save_LDFLAGS="$LDFLAGS" - LDFLAGS="-L$lib $LDFLAGS" -- echo $ac_n "checking for db_env_create in -ldb""... $ac_c" 1>&6 --echo "configure:9672: checking for db_env_create in -ldb" >&5 --ac_lib_var=`echo db'_'db_env_create | sed 'y%./+-%__p_%'` -+ echo $ac_n "checking for db_env_create in -ldb-3.2""... $ac_c" 1>&6 -+echo "configure:10107: checking for db_env_create in -ldb-3.2" >&5 -+ac_lib_var=`echo db-3.2'_'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 - else - ac_save_LIBS="$LIBS" --LIBS="-ldb $LIBS" -+LIBS="-ldb-3.2 $LIBS" - cat > conftest.$ac_ext <<EOF --#line 9680 "configure" -+#line 10115 "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 -@@ -9687,7 +10122,7 @@ - db_env_create() - ; return 0; } - EOF --if { (eval echo configure:9691: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:10126: \"$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 -@@ -9725,7 +10160,7 @@ - fi - - bdb_includes="-I$inc" -- bdb_libs="-L$lib -ldb" -+ bdb_libs="-L$lib -ldb-3.2" - - else - echo "$ac_t""no" 1>&6 -@@ -9784,16 +10219,16 @@ - if test X"$bdb_version_ok" = Xyes; then - save_LDFLAGS="$LDFLAGS" - LDFLAGS="-L$lib $LDFLAGS" -- echo $ac_n "checking for db_env_create in -ldb""... $ac_c" 1>&6 --echo "configure:9789: checking for db_env_create in -ldb" >&5 --ac_lib_var=`echo db'_'db_env_create | sed 'y%./+-%__p_%'` -+ echo $ac_n "checking for db_env_create in -ldb-3.2""... $ac_c" 1>&6 -+echo "configure:10224: checking for db_env_create in -ldb-3.2" >&5 -+ac_lib_var=`echo db-3.2'_'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 - else - ac_save_LIBS="$LIBS" --LIBS="-ldb $LIBS" -+LIBS="-ldb-3.2 $LIBS" - cat > conftest.$ac_ext <<EOF --#line 9797 "configure" -+#line 10232 "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 -@@ -9804,7 +10239,7 @@ - db_env_create() - ; return 0; } - EOF --if { (eval echo configure:9808: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:10243: \"$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 -@@ -9842,7 +10277,7 @@ - fi - - bdb_includes="-I$inc" -- bdb_libs="-L$lib -ldb" -+ bdb_libs="-L$lib -ldb-3.2" - - else - echo "$ac_t""no" 1>&6 -@@ -9902,7 +10337,7 @@ - fi - - bdb_includes="-I$dir/build_unix" -- bdb_libs="-L$dir/build_unix -ldb" -+ bdb_libs="-L$dir/build_unix -ldb-3.2" - else - bdb_dir_ok="$bdb_version_ok" - fi -@@ -9961,16 +10396,16 @@ - if test X"$bdb_version_ok" = Xyes; then - save_LDFLAGS="$LDFLAGS" - LDFLAGS="-L$lib $LDFLAGS" -- echo $ac_n "checking for db_env_create in -ldb""... $ac_c" 1>&6 --echo "configure:9966: checking for db_env_create in -ldb" >&5 --ac_lib_var=`echo db'_'db_env_create | sed 'y%./+-%__p_%'` -+ echo $ac_n "checking for db_env_create in -ldb-3.2""... $ac_c" 1>&6 -+echo "configure:10401: checking for db_env_create in -ldb-3.2" >&5 -+ac_lib_var=`echo db-3.2'_'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 - else - ac_save_LIBS="$LIBS" --LIBS="-ldb $LIBS" -+LIBS="-ldb-3.2 $LIBS" - cat > conftest.$ac_ext <<EOF --#line 9974 "configure" -+#line 10409 "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 -@@ -9981,7 +10416,7 @@ - db_env_create() - ; return 0; } - EOF --if { (eval echo configure:9985: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:10420: \"$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 -@@ -10019,7 +10454,7 @@ - fi - - bdb_includes="-I$inc" -- bdb_libs="-L$lib -ldb" -+ bdb_libs="-L$lib -ldb-3.2" - - else - echo "$ac_t""no" 1>&6 -@@ -10079,7 +10514,7 @@ - fi - - bdb_includes="-I$dir/build_unix" -- bdb_libs="-L$dir/build_unix -ldb" -+ bdb_libs="-L$dir/build_unix -ldb-3.2" - else - bdb_dir_ok="$bdb_version_ok" - fi -@@ -10416,7 +10851,13 @@ - s%@AUTOMAKE@%$AUTOMAKE%g - s%@AUTOHEADER@%$AUTOHEADER%g - s%@MAKEINFO@%$MAKEINFO%g -+s%@AMTAR@%$AMTAR%g -+s%@install_sh@%$install_sh%g -+s%@AWK@%$AWK%g - s%@SET_MAKE@%$SET_MAKE%g -+s%@AMDEP@%$AMDEP%g -+s%@AMDEPBACKSLASH@%$AMDEPBACKSLASH%g -+s%@DEPDIR@%$DEPDIR%g - s%@MYSQL_NO_DASH_VERSION@%$MYSQL_NO_DASH_VERSION%g - s%@MYSQL_BASE_VERSION@%$MYSQL_BASE_VERSION%g - s%@MYSQL_VERSION_ID@%$MYSQL_VERSION_ID%g -@@ -10440,10 +10881,13 @@ - s%@MAINT@%$MAINT%g - s%@LOCAL_TRUE@%$LOCAL_TRUE%g - s%@LOCAL_FALSE@%$LOCAL_FALSE%g --s%@AWK@%$AWK%g - s%@CC@%$CC%g --s%@CXX@%$CXX%g - s%@CPP@%$CPP%g -+s%@_am_include@%$_am_include%g -+s%@CCDEPMODE@%$CCDEPMODE%g -+s%@CXX@%$CXX%g -+s%@CXXCPP@%$CXXCPP%g -+s%@CXXDEPMODE@%$CXXDEPMODE%g - s%@AS@%$AS%g - s%@RANLIB@%$RANLIB%g - s%@LN_S@%$LN_S%g -@@ -10730,14 +11174,63 @@ - - EOF - cat >> $CONFIG_STATUS <<EOF -- -+am_indx=1 -+ for am_file in config.h; do -+ case " $CONFIG_HEADERS " in -+ *" $am_file "*) -+ echo timestamp > `echo $am_file | sed 's%:.*%%;s%[^/]*$%%'`stamp-h$am_indx -+ ;; -+ esac -+ am_indx=\`expr \$am_indx + 1\` -+ done -+AMDEP="$AMDEP" -+ac_aux_dir="$ac_aux_dir" - - test -z "$CONFIG_HEADERS" || echo timestamp > stamp-h - rm -f $AVAILABLE_LANGUAGES_ERRORS_RULES - - EOF - cat >> $CONFIG_STATUS <<\EOF --test -z "$CONFIG_HEADERS" || echo timestamp > stamp-h -+test -z "$CONFIG_HEADERS" || echo timestamp > stamp-h -+ -+test x"$AMDEP" != x"" || -+for mf in $CONFIG_FILES; do -+ case "$mf" in -+ Makefile) dirpart=.;; -+ */Makefile) dirpart=`echo "$mf" | sed -e 's|/[^/]*$||'`;; -+ *) continue;; -+ esac -+ grep '^DEP_FILES *= *[^ #]' < "$mf" > /dev/null || continue -+ # Extract the definition of DEP_FILES from the Makefile without -+ # running `make'. -+ DEPDIR=`sed -n -e '/^DEPDIR = / s///p' < "$mf"` -+ test -z "$DEPDIR" && continue -+ # When using ansi2knr, U may be empty or an underscore; expand it -+ U=`sed -n -e '/^U = / s///p' < "$mf"` -+ test -d "$dirpart/$DEPDIR" || mkdir "$dirpart/$DEPDIR" -+ # We invoke sed twice because it is the simplest approach to -+ # changing $(DEPDIR) to its actual value in the expansion. -+ for file in `sed -n -e ' -+ /^DEP_FILES = .*\\\\$/ { -+ s/^DEP_FILES = // -+ :loop -+ s/\\\\$// -+ p -+ n -+ /\\\\$/ b loop -+ p -+ } -+ /^DEP_FILES = / s/^DEP_FILES = //p' < "$mf" | \ -+ sed -e 's/\$(DEPDIR)/'"$DEPDIR"'/g' -e 's/\$U/'"$U"'/g'`; do -+ # Make sure the directory exists. -+ test -f "$dirpart/$file" && continue -+ fdir=`echo "$file" | sed -e 's|/[^/]*$||'` -+ $ac_aux_dir/mkinstalldirs "$dirpart/$fdir" > /dev/null 2>&1 -+ # echo "creating $dirpart/$file" -+ echo '# dummy' > "$dirpart/$file" -+ done -+done -+ - - exit 0 - EOF -diff -r -N -U3 mysql-3.23.32.orig/dbug/Makefile.in mysql-3.23.32/dbug/Makefile.in ---- mysql-3.23.32.orig/dbug/Makefile.in Mon Jan 22 14:44:03 2001 -+++ mysql-3.23.32/dbug/Makefile.in Thu Mar 1 17:01:04 2001 -@@ -1,6 +1,7 @@ --# Makefile.in generated automatically by automake 1.4 from Makefile.am -+# Makefile.in generated automatically by automake 1.4d from Makefile.am - --# Copyright (C) 1994, 1995-8, 1999 Free Software Foundation, Inc. -+# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001 -+# Free Software Foundation, Inc. - # This Makefile.in is free software; the Free Software Foundation - # gives unlimited permission to copy and/or distribute it, - # with or without modifications, as long as this notice is preserved. -@@ -10,24 +11,6 @@ - # even the implied warranty of MERCHANTABILITY or FITNESS FOR A - # PARTICULAR PURPOSE. - --# Copyright (C) 2000 MySQL AB & MySQL Finland AB & TCX DataKonsult AB --# --# This library is free software; you can redistribute it and/or --# modify it under the terms of the GNU Library General Public --# License as published by the Free Software Foundation; either --# version 2 of the License, or (at your option) any later version. --# --# This library is distributed in the hope that it will be useful, --# but WITHOUT ANY WARRANTY; without even the implied warranty of --# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU --# Library General Public License for more details. --# --# You should have received a copy of the GNU Library General Public --# License along with this library; if not, write to the Free --# Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, --# MA 02111-1307, USA -- -- - SHELL = @SHELL@ - - srcdir = @srcdir@ -@@ -49,8 +32,6 @@ - includedir = @includedir@ - oldincludedir = /usr/include - --DESTDIR = -- - pkgdatadir = $(datadir)/@PACKAGE@ - pkglibdir = $(libdir)/@PACKAGE@ - pkgincludedir = $(includedir)/@PACKAGE@ -@@ -63,9 +44,11 @@ - AUTOHEADER = @AUTOHEADER@ - - INSTALL = @INSTALL@ --INSTALL_PROGRAM = @INSTALL_PROGRAM@ $(AM_INSTALL_PROGRAM_FLAGS) -+INSTALL_PROGRAM = @INSTALL_PROGRAM@ - INSTALL_DATA = @INSTALL_DATA@ - INSTALL_SCRIPT = @INSTALL_SCRIPT@ -+INSTALL_STRIP_FLAG = -+INSTALL_HEADER = $(INSTALL_DATA) - transform = @program_transform_name@ - - NORMAL_INSTALL = : -@@ -74,6 +57,8 @@ - NORMAL_UNINSTALL = : - PRE_UNINSTALL = : - POST_UNINSTALL = : -+ -+@SET_MAKE@ - build_alias = @build_alias@ - build_triplet = @build@ - host_alias = @host_alias@ -@@ -81,6 +66,8 @@ - target_alias = @target_alias@ - target_triplet = @target@ - ALLOCA = @ALLOCA@ -+AMDEP = @AMDEP@ -+AMTAR = @AMTAR@ - AS = @AS@ - AVAILABLE_LANGUAGES = @AVAILABLE_LANGUAGES@ - AVAILABLE_LANGUAGES_ERRORS = @AVAILABLE_LANGUAGES_ERRORS@ -@@ -102,6 +89,7 @@ - CXX = @CXX@ - CXXFLAGS = @CXXFLAGS@ - CXXLDFLAGS = @CXXLDFLAGS@ -+DEPDIR = @DEPDIR@ - DLLTOOL = @DLLTOOL@ - DOT_FRM_VERSION = @DOT_FRM_VERSION@ - FIND_PROC = @FIND_PROC@ -@@ -155,11 +143,13 @@ - VERSION = @VERSION@ - WRAPLIBS = @WRAPLIBS@ - YACC = @YACC@ -+_am_include = @_am_include@ - bdb_includes = @bdb_includes@ - bdb_libs = @bdb_libs@ - bench_dirs = @bench_dirs@ - default_charset = @default_charset@ - docs_dirs = @docs_dirs@ -+install_sh = @install_sh@ - linked_client_targets = @linked_client_targets@ - readline_dir = @readline_dir@ - readline_link = @readline_link@ -@@ -169,16 +159,43 @@ - thread_dirs = @thread_dirs@ - uname_prog = @uname_prog@ - -+# Copyright (C) 2000 MySQL AB & MySQL Finland AB & TCX DataKonsult AB -+# -+# This library is free software; you can redistribute it and/or -+# modify it under the terms of the GNU Library General Public -+# License as published by the Free Software Foundation; either -+# version 2 of the License, or (at your option) any later version. -+# -+# This library is distributed in the hope that it will be useful, -+# but WITHOUT ANY WARRANTY; without even the implied warranty of -+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -+# Library General Public License for more details. -+# -+# You should have received a copy of the GNU Library General Public -+# License along with this library; if not, write to the Free -+# Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, -+# MA 02111-1307, USA -+ -+ - INCLUDES = @MT_INCLUDES@ -I$(srcdir)/../include -I../include - LDADD = libdbug.a ../strings/libmystrings.a - pkglib_LIBRARIES = libdbug.a - noinst_HEADERS = dbug_long.h - libdbug_a_SOURCES = dbug.c sanity.c --EXTRA_DIST = example1.c example2.c example3.c user.r monty.doc readme.prof main.c factorial.c -+EXTRA_DIST = example1.c example2.c example3.c user.r monty.doc readme.prof \ -+ main.c factorial.c - - --OMIT_DEPENDENCIES = pthread.h stdio.h __stdio.h stdlib.h __stdlib.h math.h __math.h time.h __time.h unistd.h __unistd.h types.h xtypes.h ac-types.h posix.h string.h __string.h errno.h socket.h inet.h dirent.h netdb.h cleanup.h cond.h debug_out.h fd.h kernel.h mutex.h prio_queue.h pthread_attr.h pthread_once.h queue.h sleep.h specific.h version.h pwd.h timers.h uio.h cdefs.h machdep.h signal.h __signal.h util.h -+OMIT_DEPENDENCIES = pthread.h stdio.h __stdio.h stdlib.h __stdlib.h math.h\ -+ __math.h time.h __time.h unistd.h __unistd.h types.h \ -+ xtypes.h ac-types.h posix.h string.h __string.h \ -+ errno.h socket.h inet.h dirent.h netdb.h \ -+ cleanup.h cond.h debug_out.h fd.h kernel.h mutex.h \ -+ prio_queue.h pthread_attr.h pthread_once.h queue.h\ -+ sleep.h specific.h version.h pwd.h timers.h uio.h \ -+ cdefs.h machdep.h signal.h __signal.h util.h - -+subdir = dbug - mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs - CONFIG_HEADER = ../config.h - CONFIG_CLEAN_FILES = -@@ -189,34 +206,38 @@ - CPPFLAGS = @CPPFLAGS@ - LDFLAGS = @LDFLAGS@ - LIBS = @LIBS@ -+libdbug_a_AR = $(AR) cru - libdbug_a_LIBADD = --libdbug_a_OBJECTS = dbug.o sanity.o -+am_libdbug_a_OBJECTS = dbug.o sanity.o -+libdbug_a_OBJECTS = $(am_libdbug_a_OBJECTS) - AR = ar - COMPILE = $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) - LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) - CCLD = $(CC) --LINK = $(LIBTOOL) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(LDFLAGS) -o $@ -+LINK = $(LIBTOOL) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@ -+DIST_SOURCES = $(libdbug_a_SOURCES) - HEADERS = $(noinst_HEADERS) - --DIST_COMMON = Makefile.am Makefile.in -+depcomp = $(SHELL) $(top_srcdir)/depcomp -+@AMDEP@DEP_FILES = $(DEPDIR)/dbug.Po $(DEPDIR)/sanity.Po -+DIST_COMMON = $(noinst_HEADERS) Makefile.am Makefile.in - - --DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST) -+DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) - --TAR = gtar - GZIP_ENV = --best - SOURCES = $(libdbug_a_SOURCES) --OBJECTS = $(libdbug_a_OBJECTS) -+OBJECTS = $(am_libdbug_a_OBJECTS) - --all: all-redirect -+all: all-am - .SUFFIXES: --.SUFFIXES: .S .c .lo .o .s -+.SUFFIXES: .c .lo .o - $(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 - cd $(top_builddir) \ -- && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status -+ && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= CONFIG_LINKS= $(SHELL) ./config.status - - - mostlyclean-pkglibLIBRARIES: -@@ -247,38 +268,17 @@ - - uninstall-pkglibLIBRARIES: - @$(NORMAL_UNINSTALL) -- list='$(pkglib_LIBRARIES)'; for p in $$list; do \ -+ @list='$(pkglib_LIBRARIES)'; for p in $$list; do \ -+ echo " rm -f $(DESTDIR)$(pkglibdir)/$$p"; \ - rm -f $(DESTDIR)$(pkglibdir)/$$p; \ - done - --.c.o: -- $(COMPILE) -c $< -- --.s.o: -- $(COMPILE) -c $< -- --.S.o: -- $(COMPILE) -c $< -- - mostlyclean-compile: - -rm -f *.o core *.core - --clean-compile: -- - distclean-compile: - -rm -f *.tab.c - --maintainer-clean-compile: -- --.c.lo: -- $(LIBTOOL) --mode=compile $(COMPILE) -c $< -- --.s.lo: -- $(LIBTOOL) --mode=compile $(COMPILE) -c $< -- --.S.lo: -- $(LIBTOOL) --mode=compile $(COMPILE) -c $< -- - mostlyclean-libtool: - -rm -f *.lo - -@@ -286,68 +286,81 @@ - -rm -rf .libs _libs - - distclean-libtool: -- --maintainer-clean-libtool: -+ -rm -f libtool - - libdbug.a: $(libdbug_a_OBJECTS) $(libdbug_a_DEPENDENCIES) - -rm -f libdbug.a -- $(AR) cru libdbug.a $(libdbug_a_OBJECTS) $(libdbug_a_LIBADD) -+ $(libdbug_a_AR) libdbug.a $(libdbug_a_OBJECTS) $(libdbug_a_LIBADD) - $(RANLIB) libdbug.a - - tags: TAGS - --ID: $(HEADERS) $(SOURCES) $(LISP) -- list='$(SOURCES) $(HEADERS)'; \ -- unique=`for i in $$list; do echo $$i; done | \ -- awk ' { files[$$0] = 1; } \ -+ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) -+ list='$(SOURCES) $(HEADERS) $(TAGS_FILES)'; \ -+ unique=`for i in $$list; do \ -+ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ -+ done | \ -+ $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ -- here=`pwd` && cd $(srcdir) \ -- && mkid -f$$here/ID $$unique $(LISP) -+ mkid -fID $$unique $(LISP) - --TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) $(LISP) -+TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ -+ $(TAGS_FILES) $(LISP) - tags=; \ - here=`pwd`; \ -- list='$(SOURCES) $(HEADERS)'; \ -- unique=`for i in $$list; do echo $$i; done | \ -- awk ' { files[$$0] = 1; } \ -+ list='$(SOURCES) $(HEADERS) $(TAGS_FILES)'; \ -+ unique=`for i in $$list; do \ -+ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ -+ done | \ -+ $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ - test -z "$(ETAGS_ARGS)$$unique$(LISP)$$tags" \ -- || (cd $(srcdir) && etags $(ETAGS_ARGS) $$tags $$unique $(LISP) -o $$here/TAGS) -- --mostlyclean-tags: -+ || etags $(ETAGS_ARGS) $$tags $$unique $(LISP) - --clean-tags: -+GTAGS: -+ here=`CDPATH=: && cd $(top_builddir) && pwd` \ -+ && cd $(top_srcdir) \ -+ && gtags -i $$here - - distclean-tags: - -rm -f TAGS ID - --maintainer-clean-tags: -+@AMDEP@@_am_include@ $(DEPDIR)/dbug.Po -+@AMDEP@@_am_include@ $(DEPDIR)/sanity.Po -+ -+distclean-depend: -+ -rm -rf $(DEPDIR) -+ -+@AMDEP@CCDEPMODE = @CCDEPMODE@ -+ -+.c.o: -+@AMDEP@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ -+@AMDEP@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@ -+@AMDEP@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -+ $(COMPILE) -c -o $@ `test -f $< || echo '$(srcdir)/'`$< -+ -+.c.lo: -+@AMDEP@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ -+@AMDEP@ depfile='$(DEPDIR)/$*.Plo' tmpdepfile='$(DEPDIR)/$*.TPlo' @AMDEPBACKSLASH@ -+@AMDEP@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -+ $(LTCOMPILE) -c -o $@ `test -f $< || echo '$(srcdir)/'`$< -+ - - distdir = $(top_builddir)/$(PACKAGE)-$(VERSION)/$(subdir) - --subdir = dbug - - distdir: $(DISTFILES) - @for file in $(DISTFILES); do \ - d=$(srcdir); \ - if test -d $$d/$$file; then \ -- cp -pr $$d/$$file $(distdir)/$$file; \ -+ cp -pR $$d/$$file $(distdir) \ -+ || exit 1; \ - else \ - test -f $(distdir)/$$file \ -- || ln $$d/$$file $(distdir)/$$file 2> /dev/null \ -- || cp -p $$d/$$file $(distdir)/$$file || :; \ -+ || cp -p $$d/$$file $(distdir)/$$file \ -+ || exit 1; \ - 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 -- - info-am: - info: info-am - dvi-am: -@@ -368,9 +381,8 @@ - uninstall-am: uninstall-pkglibLIBRARIES - uninstall: uninstall-am - all-am: Makefile $(LIBRARIES) $(HEADERS) --all-redirect: all-am - install-strip: -- $(MAKE) $(AM_MAKEFLAGS) AM_INSTALL_PROGRAM_FLAGS=-s install -+ $(MAKE) $(AM_MAKEFLAGS) INSTALL_STRIP_FLAG=-s install - installdirs: - $(mkinstalldirs) $(DESTDIR)$(pkglibdir) - -@@ -384,45 +396,42 @@ - -rm -f config.cache config.log stamp-h stamp-h[0-9]* - - maintainer-clean-generic: --mostlyclean-am: mostlyclean-pkglibLIBRARIES mostlyclean-compile \ -- mostlyclean-libtool mostlyclean-tags \ -- mostlyclean-generic -- --mostlyclean: mostlyclean-am -- --clean-am: clean-pkglibLIBRARIES clean-compile clean-libtool clean-tags \ -- clean-generic mostlyclean-am -- -+ @echo "This command is intended for maintainers to use" -+ @echo "it deletes files that may require special tools to rebuild." -+ -rm -f Makefile.in - clean: clean-am - --distclean-am: distclean-pkglibLIBRARIES distclean-compile \ -- distclean-libtool distclean-tags distclean-generic \ -- clean-am -- -rm -f libtool -+clean-am: clean-generic clean-libtool clean-pkglibLIBRARIES \ -+ mostlyclean-am - - distclean: distclean-am - --maintainer-clean-am: maintainer-clean-pkglibLIBRARIES \ -- maintainer-clean-compile maintainer-clean-libtool \ -- maintainer-clean-tags 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." -+distclean-am: clean-am distclean-compile distclean-depend \ -+ distclean-generic distclean-libtool distclean-pkglibLIBRARIES \ -+ distclean-tags - - maintainer-clean: maintainer-clean-am - --.PHONY: mostlyclean-pkglibLIBRARIES distclean-pkglibLIBRARIES \ --clean-pkglibLIBRARIES maintainer-clean-pkglibLIBRARIES \ --uninstall-pkglibLIBRARIES install-pkglibLIBRARIES 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 -+maintainer-clean-am: distclean-am maintainer-clean-generic \ -+ maintainer-clean-pkglibLIBRARIES -+ -+mostlyclean: mostlyclean-am -+ -+mostlyclean-am: mostlyclean-compile mostlyclean-generic \ -+ mostlyclean-libtool mostlyclean-pkglibLIBRARIES -+ -+.PHONY: check check-am clean clean-generic clean-libtool \ -+ clean-pkglibLIBRARIES distclean distclean-compile \ -+ distclean-depend distclean-generic distclean-libtool \ -+ distclean-pkglibLIBRARIES distclean-tags distdir dvi dvi-am \ -+ info info-am install install-am install-data install-data-am \ -+ install-exec install-exec-am install-pkglibLIBRARIES \ -+ install-strip installcheck installcheck-am installdirs \ -+ maintainer-clean maintainer-clean-generic \ -+ maintainer-clean-pkglibLIBRARIES mostlyclean \ -+ mostlyclean-compile mostlyclean-generic mostlyclean-libtool \ -+ mostlyclean-pkglibLIBRARIES tags uninstall uninstall-am \ -+ uninstall-pkglibLIBRARIES - - - # Must be linked with libs thta are not compiled yet -diff -r -N -U3 mysql-3.23.32.orig/extra/Makefile.in mysql-3.23.32/extra/Makefile.in ---- mysql-3.23.32.orig/extra/Makefile.in Mon Jan 22 14:44:05 2001 -+++ mysql-3.23.32/extra/Makefile.in Thu Mar 1 17:00:50 2001 -@@ -1,6 +1,7 @@ --# Makefile.in generated automatically by automake 1.4 from Makefile.am -+# Makefile.in generated automatically by automake 1.4d from Makefile.am - --# Copyright (C) 1994, 1995-8, 1999 Free Software Foundation, Inc. -+# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001 -+# Free Software Foundation, Inc. - # This Makefile.in is free software; the Free Software Foundation - # gives unlimited permission to copy and/or distribute it, - # with or without modifications, as long as this notice is preserved. -@@ -10,23 +11,6 @@ - # even the implied warranty of MERCHANTABILITY or FITNESS FOR A - # PARTICULAR PURPOSE. - --# Copyright (C) 2000 MySQL AB & MySQL Finland AB & TCX DataKonsult AB --# --# This program is free software; you can redistribute it and/or modify --# it under the terms of the GNU General Public License as published by --# the Free Software Foundation; either version 2 of the License, or --# (at your option) any later version. --# --# This program is distributed in the hope that it will be useful, --# but WITHOUT ANY WARRANTY; without even the implied warranty of --# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the --# GNU General Public License for more details. --# --# You should have received a copy of the GNU General Public License --# along with this program; if not, write to the Free Software --# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -- -- - SHELL = @SHELL@ - - srcdir = @srcdir@ -@@ -48,8 +32,6 @@ - includedir = @includedir@ - oldincludedir = /usr/include - --DESTDIR = -- - pkgdatadir = $(datadir)/@PACKAGE@ - pkglibdir = $(libdir)/@PACKAGE@ - pkgincludedir = $(includedir)/@PACKAGE@ -@@ -62,9 +44,11 @@ - AUTOHEADER = @AUTOHEADER@ - - INSTALL = @INSTALL@ --INSTALL_PROGRAM = @INSTALL_PROGRAM@ $(AM_INSTALL_PROGRAM_FLAGS) -+INSTALL_PROGRAM = @INSTALL_PROGRAM@ - INSTALL_DATA = @INSTALL_DATA@ - INSTALL_SCRIPT = @INSTALL_SCRIPT@ -+INSTALL_STRIP_FLAG = -+INSTALL_HEADER = $(INSTALL_DATA) - transform = @program_transform_name@ - - NORMAL_INSTALL = : -@@ -73,6 +57,8 @@ - NORMAL_UNINSTALL = : - PRE_UNINSTALL = : - POST_UNINSTALL = : -+ -+@SET_MAKE@ - build_alias = @build_alias@ - build_triplet = @build@ - host_alias = @host_alias@ -@@ -80,6 +66,8 @@ - target_alias = @target_alias@ - target_triplet = @target@ - ALLOCA = @ALLOCA@ -+AMDEP = @AMDEP@ -+AMTAR = @AMTAR@ - AS = @AS@ - AVAILABLE_LANGUAGES = @AVAILABLE_LANGUAGES@ - AVAILABLE_LANGUAGES_ERRORS = @AVAILABLE_LANGUAGES_ERRORS@ -@@ -101,6 +89,7 @@ - CXX = @CXX@ - CXXFLAGS = @CXXFLAGS@ - CXXLDFLAGS = @CXXLDFLAGS@ -+DEPDIR = @DEPDIR@ - DLLTOOL = @DLLTOOL@ - DOT_FRM_VERSION = @DOT_FRM_VERSION@ - FIND_PROC = @FIND_PROC@ -@@ -154,11 +143,13 @@ - VERSION = @VERSION@ - WRAPLIBS = @WRAPLIBS@ - YACC = @YACC@ -+_am_include = @_am_include@ - bdb_includes = @bdb_includes@ - bdb_libs = @bdb_libs@ - bench_dirs = @bench_dirs@ - default_charset = @default_charset@ - docs_dirs = @docs_dirs@ -+install_sh = @install_sh@ - linked_client_targets = @linked_client_targets@ - readline_dir = @readline_dir@ - readline_link = @readline_link@ -@@ -168,14 +159,41 @@ - thread_dirs = @thread_dirs@ - uname_prog = @uname_prog@ - -+# Copyright (C) 2000 MySQL AB & MySQL Finland AB & TCX DataKonsult AB -+# -+# This program is free software; you can redistribute it and/or modify -+# it under the terms of the GNU General Public License as published by -+# the Free Software Foundation; either version 2 of the License, or -+# (at your option) any later version. -+# -+# This program is distributed in the hope that it will be useful, -+# but WITHOUT ANY WARRANTY; without even the implied warranty of -+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -+# GNU General Public License for more details. -+# -+# You should have received a copy of the GNU General Public License -+# along with this program; if not, write to the Free Software -+# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -+ -+ - INCLUDES = @MT_INCLUDES@ -I$(srcdir)/../include -I../include -I.. --LDADD = @CLIENT_EXTRA_LDFLAGS@ ../mysys/libmysys.a ../dbug/libdbug.a ../strings/libmystrings.a -+LDADD = @CLIENT_EXTRA_LDFLAGS@ ../mysys/libmysys.a \ -+ ../dbug/libdbug.a ../strings/libmystrings.a - --bin_PROGRAMS = replace comp_err perror resolveip my_print_defaults resolve_stack_dump -+bin_PROGRAMS = replace comp_err perror resolveip my_print_defaults \ -+resolve_stack_dump - - --OMIT_DEPENDENCIES = pthread.h stdio.h __stdio.h stdlib.h __stdlib.h math.h __math.h time.h __time.h unistd.h __unistd.h types.h xtypes.h ac-types.h posix.h string.h __string.h errno.h socket.h inet.h dirent.h netdb.h cleanup.h cond.h debug_out.h fd.h kernel.h mutex.h prio_queue.h pthread_attr.h pthread_once.h queue.h sleep.h specific.h version.h pwd.h timers.h uio.h cdefs.h machdep.h signal.h __signal.h -+OMIT_DEPENDENCIES = pthread.h stdio.h __stdio.h stdlib.h __stdlib.h math.h\ -+ __math.h time.h __time.h unistd.h __unistd.h types.h \ -+ xtypes.h ac-types.h posix.h string.h __string.h \ -+ errno.h socket.h inet.h dirent.h netdb.h \ -+ cleanup.h cond.h debug_out.h fd.h kernel.h mutex.h \ -+ prio_queue.h pthread_attr.h pthread_once.h queue.h\ -+ sleep.h specific.h version.h pwd.h timers.h uio.h \ -+ cdefs.h machdep.h signal.h __signal.h - -+subdir = extra - mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs - CONFIG_HEADER = ../config.h - CONFIG_CLEAN_FILES = -@@ -186,65 +204,70 @@ - CPPFLAGS = @CPPFLAGS@ - LDFLAGS = @LDFLAGS@ - LIBS = @LIBS@ --replace_SOURCES = replace.c --replace_OBJECTS = replace.o --replace_LDADD = $(LDADD) --replace_DEPENDENCIES = ../mysys/libmysys.a ../dbug/libdbug.a \ --../strings/libmystrings.a --replace_LDFLAGS = - comp_err_SOURCES = comp_err.c - comp_err_OBJECTS = comp_err.o - comp_err_LDADD = $(LDADD) - comp_err_DEPENDENCIES = ../mysys/libmysys.a ../dbug/libdbug.a \ - ../strings/libmystrings.a - comp_err_LDFLAGS = -+my_print_defaults_SOURCES = my_print_defaults.c -+my_print_defaults_OBJECTS = my_print_defaults.o -+my_print_defaults_LDADD = $(LDADD) -+my_print_defaults_DEPENDENCIES = ../mysys/libmysys.a ../dbug/libdbug.a \ -+../strings/libmystrings.a -+my_print_defaults_LDFLAGS = - perror_SOURCES = perror.c - perror_OBJECTS = perror.o - perror_LDADD = $(LDADD) - perror_DEPENDENCIES = ../mysys/libmysys.a ../dbug/libdbug.a \ - ../strings/libmystrings.a - perror_LDFLAGS = --resolveip_SOURCES = resolveip.c --resolveip_OBJECTS = resolveip.o --resolveip_LDADD = $(LDADD) --resolveip_DEPENDENCIES = ../mysys/libmysys.a ../dbug/libdbug.a \ --../strings/libmystrings.a --resolveip_LDFLAGS = --my_print_defaults_SOURCES = my_print_defaults.c --my_print_defaults_OBJECTS = my_print_defaults.o --my_print_defaults_LDADD = $(LDADD) --my_print_defaults_DEPENDENCIES = ../mysys/libmysys.a ../dbug/libdbug.a \ -+replace_SOURCES = replace.c -+replace_OBJECTS = replace.o -+replace_LDADD = $(LDADD) -+replace_DEPENDENCIES = ../mysys/libmysys.a ../dbug/libdbug.a \ - ../strings/libmystrings.a --my_print_defaults_LDFLAGS = -+replace_LDFLAGS = - resolve_stack_dump_SOURCES = resolve_stack_dump.c - resolve_stack_dump_OBJECTS = resolve_stack_dump.o - resolve_stack_dump_LDADD = $(LDADD) - resolve_stack_dump_DEPENDENCIES = ../mysys/libmysys.a ../dbug/libdbug.a \ - ../strings/libmystrings.a - resolve_stack_dump_LDFLAGS = -+resolveip_SOURCES = resolveip.c -+resolveip_OBJECTS = resolveip.o -+resolveip_LDADD = $(LDADD) -+resolveip_DEPENDENCIES = ../mysys/libmysys.a ../dbug/libdbug.a \ -+../strings/libmystrings.a -+resolveip_LDFLAGS = - COMPILE = $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) - LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) - CCLD = $(CC) --LINK = $(LIBTOOL) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(LDFLAGS) -o $@ -+LINK = $(LIBTOOL) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@ -+DIST_SOURCES = comp_err.c my_print_defaults.c perror.c replace.c \ -+resolve_stack_dump.c resolveip.c -+depcomp = $(SHELL) $(top_srcdir)/depcomp -+@AMDEP@DEP_FILES = $(DEPDIR)/comp_err.Po $(DEPDIR)/my_print_defaults.Po \ -+@AMDEP@$(DEPDIR)/perror.Po $(DEPDIR)/replace.Po \ -+@AMDEP@$(DEPDIR)/resolve_stack_dump.Po $(DEPDIR)/resolveip.Po - DIST_COMMON = Makefile.am Makefile.in - - --DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST) -+DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) - --TAR = gtar - GZIP_ENV = --best --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 -+SOURCES = comp_err.c my_print_defaults.c perror.c replace.c resolve_stack_dump.c resolveip.c -+OBJECTS = comp_err.o my_print_defaults.o perror.o replace.o resolve_stack_dump.o resolveip.o - --all: all-redirect -+all: all-am - .SUFFIXES: --.SUFFIXES: .S .c .lo .o .s -+.SUFFIXES: .c .lo .o - $(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 - cd $(top_builddir) \ -- && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status -+ && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= CONFIG_LINKS= $(SHELL) ./config.status - - - mostlyclean-binPROGRAMS: -@@ -261,45 +284,26 @@ - $(mkinstalldirs) $(DESTDIR)$(bindir) - @list='$(bin_PROGRAMS)'; for p in $$list; do \ - if test -f $$p; then \ -- echo " $(LIBTOOL) --mode=install $(INSTALL_PROGRAM) $$p $(DESTDIR)$(bindir)/`echo $$p|sed 's/$(EXEEXT)$$//'|sed '$(transform)'|sed 's/$$/$(EXEEXT)/'`"; \ -- $(LIBTOOL) --mode=install $(INSTALL_PROGRAM) $$p $(DESTDIR)$(bindir)/`echo $$p|sed 's/$(EXEEXT)$$//'|sed '$(transform)'|sed 's/$$/$(EXEEXT)/'`; \ -+ f="`echo $$p|sed -e 's/$(EXEEXT)$$//' -e '$(transform)' -e 's/$$/$(EXEEXT)/'`"; \ -+ echo " $(LIBTOOL) --mode=install $(INSTALL_PROGRAM) $(INSTALL_STRIP_FLAG) $$p $(DESTDIR)$(bindir)/$$f"; \ -+ $(LIBTOOL) --mode=install $(INSTALL_PROGRAM) $(INSTALL_STRIP_FLAG) $$p $(DESTDIR)$(bindir)/$$f; \ - else :; fi; \ - done - - uninstall-binPROGRAMS: - @$(NORMAL_UNINSTALL) -- list='$(bin_PROGRAMS)'; for p in $$list; do \ -- rm -f $(DESTDIR)$(bindir)/`echo $$p|sed 's/$(EXEEXT)$$//'|sed '$(transform)'|sed 's/$$/$(EXEEXT)/'`; \ -+ @list='$(bin_PROGRAMS)'; for p in $$list; do \ -+ f="`echo $$p|sed -e 's/$(EXEEXT)$$//' -e '$(transform)' -e 's/$$/$(EXEEXT)/'`"; \ -+ echo " rm -f $(DESTDIR)$(bindir)/$$f"; \ -+ rm -f $(DESTDIR)$(bindir)/$$f; \ - done - --.c.o: -- $(COMPILE) -c $< -- --.s.o: -- $(COMPILE) -c $< -- --.S.o: -- $(COMPILE) -c $< -- - mostlyclean-compile: - -rm -f *.o core *.core - --clean-compile: -- - distclean-compile: - -rm -f *.tab.c - --maintainer-clean-compile: -- --.c.lo: -- $(LIBTOOL) --mode=compile $(COMPILE) -c $< -- --.s.lo: -- $(LIBTOOL) --mode=compile $(COMPILE) -c $< -- --.S.lo: -- $(LIBTOOL) --mode=compile $(COMPILE) -c $< -- - mostlyclean-libtool: - -rm -f *.lo - -@@ -307,131 +311,104 @@ - -rm -rf .libs _libs - - distclean-libtool: -- --maintainer-clean-libtool: -- --replace: $(replace_OBJECTS) $(replace_DEPENDENCIES) -- @rm -f replace -- $(LINK) $(replace_LDFLAGS) $(replace_OBJECTS) $(replace_LDADD) $(LIBS) -+ -rm -f libtool - - comp_err: $(comp_err_OBJECTS) $(comp_err_DEPENDENCIES) - @rm -f comp_err - $(LINK) $(comp_err_LDFLAGS) $(comp_err_OBJECTS) $(comp_err_LDADD) $(LIBS) - -+my_print_defaults: $(my_print_defaults_OBJECTS) $(my_print_defaults_DEPENDENCIES) -+ @rm -f my_print_defaults -+ $(LINK) $(my_print_defaults_LDFLAGS) $(my_print_defaults_OBJECTS) $(my_print_defaults_LDADD) $(LIBS) -+ - perror: $(perror_OBJECTS) $(perror_DEPENDENCIES) - @rm -f perror - $(LINK) $(perror_LDFLAGS) $(perror_OBJECTS) $(perror_LDADD) $(LIBS) - --resolveip: $(resolveip_OBJECTS) $(resolveip_DEPENDENCIES) -- @rm -f resolveip -- $(LINK) $(resolveip_LDFLAGS) $(resolveip_OBJECTS) $(resolveip_LDADD) $(LIBS) -- --my_print_defaults: $(my_print_defaults_OBJECTS) $(my_print_defaults_DEPENDENCIES) -- @rm -f my_print_defaults -- $(LINK) $(my_print_defaults_LDFLAGS) $(my_print_defaults_OBJECTS) $(my_print_defaults_LDADD) $(LIBS) -+replace: $(replace_OBJECTS) $(replace_DEPENDENCIES) -+ @rm -f replace -+ $(LINK) $(replace_LDFLAGS) $(replace_OBJECTS) $(replace_LDADD) $(LIBS) - - resolve_stack_dump: $(resolve_stack_dump_OBJECTS) $(resolve_stack_dump_DEPENDENCIES) - @rm -f resolve_stack_dump - $(LINK) $(resolve_stack_dump_LDFLAGS) $(resolve_stack_dump_OBJECTS) $(resolve_stack_dump_LDADD) $(LIBS) - -+resolveip: $(resolveip_OBJECTS) $(resolveip_DEPENDENCIES) -+ @rm -f resolveip -+ $(LINK) $(resolveip_LDFLAGS) $(resolveip_OBJECTS) $(resolveip_LDADD) $(LIBS) -+ - tags: TAGS - --ID: $(HEADERS) $(SOURCES) $(LISP) -- list='$(SOURCES) $(HEADERS)'; \ -- unique=`for i in $$list; do echo $$i; done | \ -- awk ' { files[$$0] = 1; } \ -+ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) -+ list='$(SOURCES) $(HEADERS) $(TAGS_FILES)'; \ -+ unique=`for i in $$list; do \ -+ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ -+ done | \ -+ $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ -- here=`pwd` && cd $(srcdir) \ -- && mkid -f$$here/ID $$unique $(LISP) -+ mkid -fID $$unique $(LISP) - --TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) $(LISP) -+TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ -+ $(TAGS_FILES) $(LISP) - tags=; \ - here=`pwd`; \ -- list='$(SOURCES) $(HEADERS)'; \ -- unique=`for i in $$list; do echo $$i; done | \ -- awk ' { files[$$0] = 1; } \ -+ list='$(SOURCES) $(HEADERS) $(TAGS_FILES)'; \ -+ unique=`for i in $$list; do \ -+ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ -+ done | \ -+ $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ - test -z "$(ETAGS_ARGS)$$unique$(LISP)$$tags" \ -- || (cd $(srcdir) && etags $(ETAGS_ARGS) $$tags $$unique $(LISP) -o $$here/TAGS) -+ || etags $(ETAGS_ARGS) $$tags $$unique $(LISP) - --mostlyclean-tags: -- --clean-tags: -+GTAGS: -+ here=`CDPATH=: && cd $(top_builddir) && pwd` \ -+ && cd $(top_srcdir) \ -+ && gtags -i $$here - - distclean-tags: - -rm -f TAGS ID - --maintainer-clean-tags: -+@AMDEP@@_am_include@ $(DEPDIR)/comp_err.Po -+@AMDEP@@_am_include@ $(DEPDIR)/my_print_defaults.Po -+@AMDEP@@_am_include@ $(DEPDIR)/perror.Po -+@AMDEP@@_am_include@ $(DEPDIR)/replace.Po -+@AMDEP@@_am_include@ $(DEPDIR)/resolve_stack_dump.Po -+@AMDEP@@_am_include@ $(DEPDIR)/resolveip.Po -+ -+distclean-depend: -+ -rm -rf $(DEPDIR) -+ -+@AMDEP@CCDEPMODE = @CCDEPMODE@ -+ -+.c.o: -+@AMDEP@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ -+@AMDEP@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@ -+@AMDEP@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -+ $(COMPILE) -c -o $@ `test -f $< || echo '$(srcdir)/'`$< -+ -+.c.lo: -+@AMDEP@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ -+@AMDEP@ depfile='$(DEPDIR)/$*.Plo' tmpdepfile='$(DEPDIR)/$*.TPlo' @AMDEPBACKSLASH@ -+@AMDEP@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -+ $(LTCOMPILE) -c -o $@ `test -f $< || echo '$(srcdir)/'`$< -+ - - distdir = $(top_builddir)/$(PACKAGE)-$(VERSION)/$(subdir) - --subdir = extra - - distdir: $(DISTFILES) - @for file in $(DISTFILES); do \ - d=$(srcdir); \ - if test -d $$d/$$file; then \ -- cp -pr $$d/$$file $(distdir)/$$file; \ -+ cp -pR $$d/$$file $(distdir) \ -+ || exit 1; \ - else \ - test -f $(distdir)/$$file \ -- || ln $$d/$$file $(distdir)/$$file 2> /dev/null \ -- || cp -p $$d/$$file $(distdir)/$$file || :; \ -+ || cp -p $$d/$$file $(distdir)/$$file \ -+ || exit 1; \ - 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 -- - info-am: - info: info-am - dvi-am: -@@ -452,9 +429,8 @@ - uninstall-am: uninstall-binPROGRAMS - uninstall: uninstall-am - all-am: Makefile $(PROGRAMS) --all-redirect: all-am - install-strip: -- $(MAKE) $(AM_MAKEFLAGS) AM_INSTALL_PROGRAM_FLAGS=-s install -+ $(MAKE) $(AM_MAKEFLAGS) INSTALL_STRIP_FLAG=-s install - installdirs: - $(mkinstalldirs) $(DESTDIR)$(bindir) - -@@ -468,43 +444,40 @@ - -rm -f config.cache config.log stamp-h stamp-h[0-9]* - - maintainer-clean-generic: --mostlyclean-am: mostlyclean-binPROGRAMS mostlyclean-compile \ -- mostlyclean-libtool mostlyclean-tags \ -- mostlyclean-generic -- --mostlyclean: mostlyclean-am -- --clean-am: clean-binPROGRAMS clean-compile clean-libtool clean-tags \ -- clean-generic mostlyclean-am -- -+ @echo "This command is intended for maintainers to use" -+ @echo "it deletes files that may require special tools to rebuild." -+ -rm -f Makefile.in - clean: clean-am - --distclean-am: distclean-binPROGRAMS distclean-compile distclean-libtool \ -- distclean-tags distclean-generic clean-am -- -rm -f libtool -+clean-am: clean-binPROGRAMS clean-generic clean-libtool mostlyclean-am - - distclean: distclean-am - --maintainer-clean-am: maintainer-clean-binPROGRAMS \ -- maintainer-clean-compile maintainer-clean-libtool \ -- maintainer-clean-tags 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." -+distclean-am: clean-am distclean-binPROGRAMS distclean-compile \ -+ distclean-depend distclean-generic distclean-libtool \ -+ distclean-tags - - maintainer-clean: maintainer-clean-am - --.PHONY: mostlyclean-binPROGRAMS distclean-binPROGRAMS clean-binPROGRAMS \ --maintainer-clean-binPROGRAMS uninstall-binPROGRAMS install-binPROGRAMS \ --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 -+maintainer-clean-am: distclean-am maintainer-clean-binPROGRAMS \ -+ maintainer-clean-generic -+ -+mostlyclean: mostlyclean-am -+ -+mostlyclean-am: mostlyclean-binPROGRAMS mostlyclean-compile \ -+ mostlyclean-generic mostlyclean-libtool -+ -+.PHONY: check check-am clean clean-binPROGRAMS clean-generic \ -+ clean-libtool distclean distclean-binPROGRAMS distclean-compile \ -+ distclean-depend distclean-generic distclean-libtool \ -+ distclean-tags distdir dvi dvi-am info info-am install \ -+ install-am install-binPROGRAMS install-data install-data-am \ -+ install-exec install-exec-am install-strip installcheck \ -+ installcheck-am installdirs maintainer-clean \ -+ maintainer-clean-binPROGRAMS maintainer-clean-generic \ -+ mostlyclean mostlyclean-binPROGRAMS mostlyclean-compile \ -+ mostlyclean-generic mostlyclean-libtool tags uninstall \ -+ uninstall-am uninstall-binPROGRAMS - - - # Don't update the files from bitkeeper -diff -r -N -U3 mysql-3.23.32.orig/heap/Makefile.in mysql-3.23.32/heap/Makefile.in ---- mysql-3.23.32.orig/heap/Makefile.in Mon Jan 22 14:44:13 2001 -+++ mysql-3.23.32/heap/Makefile.in Thu Mar 1 17:00:55 2001 -@@ -1,6 +1,7 @@ --# Makefile.in generated automatically by automake 1.4 from Makefile.am -+# Makefile.in generated automatically by automake 1.4d from Makefile.am - --# Copyright (C) 1994, 1995-8, 1999 Free Software Foundation, Inc. -+# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001 -+# Free Software Foundation, Inc. - # This Makefile.in is free software; the Free Software Foundation - # gives unlimited permission to copy and/or distribute it, - # with or without modifications, as long as this notice is preserved. -@@ -10,23 +11,6 @@ - # even the implied warranty of MERCHANTABILITY or FITNESS FOR A - # PARTICULAR PURPOSE. - --# Copyright (C) 2000 MySQL AB & MySQL Finland AB & TCX DataKonsult AB --# --# This program is free software; you can redistribute it and/or modify --# it under the terms of the GNU General Public License as published by --# the Free Software Foundation; either version 2 of the License, or --# (at your option) any later version. --# --# This program is distributed in the hope that it will be useful, --# but WITHOUT ANY WARRANTY; without even the implied warranty of --# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the --# GNU General Public License for more details. --# --# You should have received a copy of the GNU General Public License --# along with this program; if not, write to the Free Software --# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -- -- - SHELL = @SHELL@ - - srcdir = @srcdir@ -@@ -48,8 +32,6 @@ - includedir = @includedir@ - oldincludedir = /usr/include - --DESTDIR = -- - pkgdatadir = $(datadir)/@PACKAGE@ - pkglibdir = $(libdir)/@PACKAGE@ - pkgincludedir = $(includedir)/@PACKAGE@ -@@ -62,9 +44,11 @@ - AUTOHEADER = @AUTOHEADER@ - - INSTALL = @INSTALL@ --INSTALL_PROGRAM = @INSTALL_PROGRAM@ $(AM_INSTALL_PROGRAM_FLAGS) -+INSTALL_PROGRAM = @INSTALL_PROGRAM@ - INSTALL_DATA = @INSTALL_DATA@ - INSTALL_SCRIPT = @INSTALL_SCRIPT@ -+INSTALL_STRIP_FLAG = -+INSTALL_HEADER = $(INSTALL_DATA) - transform = @program_transform_name@ - - NORMAL_INSTALL = : -@@ -73,6 +57,8 @@ - NORMAL_UNINSTALL = : - PRE_UNINSTALL = : - POST_UNINSTALL = : -+ -+@SET_MAKE@ - build_alias = @build_alias@ - build_triplet = @build@ - host_alias = @host_alias@ -@@ -80,6 +66,8 @@ - target_alias = @target_alias@ - target_triplet = @target@ - ALLOCA = @ALLOCA@ -+AMDEP = @AMDEP@ -+AMTAR = @AMTAR@ - AS = @AS@ - AVAILABLE_LANGUAGES = @AVAILABLE_LANGUAGES@ - AVAILABLE_LANGUAGES_ERRORS = @AVAILABLE_LANGUAGES_ERRORS@ -@@ -101,6 +89,7 @@ - CXX = @CXX@ - CXXFLAGS = @CXXFLAGS@ - CXXLDFLAGS = @CXXLDFLAGS@ -+DEPDIR = @DEPDIR@ - DLLTOOL = @DLLTOOL@ - DOT_FRM_VERSION = @DOT_FRM_VERSION@ - FIND_PROC = @FIND_PROC@ -@@ -154,11 +143,13 @@ - VERSION = @VERSION@ - WRAPLIBS = @WRAPLIBS@ - YACC = @YACC@ -+_am_include = @_am_include@ - bdb_includes = @bdb_includes@ - bdb_libs = @bdb_libs@ - bench_dirs = @bench_dirs@ - default_charset = @default_charset@ - docs_dirs = @docs_dirs@ -+install_sh = @install_sh@ - linked_client_targets = @linked_client_targets@ - readline_dir = @readline_dir@ - readline_link = @readline_link@ -@@ -168,17 +159,48 @@ - thread_dirs = @thread_dirs@ - uname_prog = @uname_prog@ - -+# Copyright (C) 2000 MySQL AB & MySQL Finland AB & TCX DataKonsult AB -+# -+# This program is free software; you can redistribute it and/or modify -+# it under the terms of the GNU General Public License as published by -+# the Free Software Foundation; either version 2 of the License, or -+# (at your option) any later version. -+# -+# This program is distributed in the hope that it will be useful, -+# but WITHOUT ANY WARRANTY; without even the implied warranty of -+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -+# GNU General Public License for more details. -+# -+# You should have received a copy of the GNU General Public License -+# along with this program; if not, write to the Free Software -+# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -+ -+ - INCLUDES = @MT_INCLUDES@ -I$(srcdir)/../include -I../include --LDADD = libheap.a ../mysys/libmysys.a ../dbug/libdbug.a ../strings/libmystrings.a -+LDADD = libheap.a ../mysys/libmysys.a ../dbug/libdbug.a \ -+ ../strings/libmystrings.a - - pkglib_LIBRARIES = libheap.a - noinst_PROGRAMS = hp_test1 hp_test2 - noinst_HEADERS = heapdef.h --libheap_a_SOURCES = hp_open.c hp_extra.c hp_close.c hp_panic.c hp_info.c hp_rrnd.c hp_scan.c hp_update.c hp_write.c hp_delete.c hp_rsame.c hp_create.c hp_rename.c hp_rfirst.c hp_rnext.c hp_rlast.c hp_rprev.c hp_clear.c hp_rkey.c hp_block.c hp_hash.c _check.c _rectest.c hp_static.c -- -- --OMIT_DEPENDENCIES = pthread.h stdio.h __stdio.h stdlib.h __stdlib.h math.h __math.h time.h __time.h unistd.h __unistd.h types.h xtypes.h ac-types.h posix.h string.h __string.h errno.h socket.h inet.h dirent.h netdb.h cleanup.h cond.h debug_out.h fd.h kernel.h mutex.h prio_queue.h pthread_attr.h pthread_once.h queue.h sleep.h specific.h version.h pwd.h timers.h uio.h cdefs.h machdep.h signal.h __signal.h util.h -+libheap_a_SOURCES = hp_open.c hp_extra.c hp_close.c hp_panic.c hp_info.c \ -+ hp_rrnd.c hp_scan.c hp_update.c hp_write.c hp_delete.c \ -+ hp_rsame.c hp_create.c hp_rename.c hp_rfirst.c \ -+ hp_rnext.c hp_rlast.c hp_rprev.c hp_clear.c \ -+ hp_rkey.c hp_block.c \ -+ hp_hash.c _check.c _rectest.c hp_static.c -+ -+ -+OMIT_DEPENDENCIES = pthread.h stdio.h __stdio.h stdlib.h __stdlib.h math.h\ -+ __math.h time.h __time.h unistd.h __unistd.h types.h \ -+ xtypes.h ac-types.h posix.h string.h __string.h \ -+ errno.h socket.h inet.h dirent.h netdb.h \ -+ cleanup.h cond.h debug_out.h fd.h kernel.h mutex.h \ -+ prio_queue.h pthread_attr.h pthread_once.h queue.h\ -+ sleep.h specific.h version.h pwd.h timers.h uio.h \ -+ cdefs.h machdep.h signal.h __signal.h util.h - -+subdir = heap - mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs - CONFIG_HEADER = ../config.h - CONFIG_CLEAN_FILES = -@@ -189,12 +211,14 @@ - CPPFLAGS = @CPPFLAGS@ - LDFLAGS = @LDFLAGS@ - LIBS = @LIBS@ -+libheap_a_AR = $(AR) cru - libheap_a_LIBADD = --libheap_a_OBJECTS = hp_open.o hp_extra.o hp_close.o hp_panic.o \ -+am_libheap_a_OBJECTS = hp_open.o hp_extra.o hp_close.o hp_panic.o \ - hp_info.o hp_rrnd.o hp_scan.o hp_update.o hp_write.o hp_delete.o \ - hp_rsame.o hp_create.o hp_rename.o hp_rfirst.o hp_rnext.o hp_rlast.o \ - hp_rprev.o hp_clear.o hp_rkey.o hp_block.o hp_hash.o _check.o \ - _rectest.o hp_static.o -+libheap_a_OBJECTS = $(am_libheap_a_OBJECTS) - AR = ar - PROGRAMS = $(noinst_PROGRAMS) - -@@ -213,28 +237,41 @@ - COMPILE = $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) - LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) - CCLD = $(CC) --LINK = $(LIBTOOL) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(LDFLAGS) -o $@ -+LINK = $(LIBTOOL) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@ -+DIST_SOURCES = $(libheap_a_SOURCES) hp_test1.c hp_test2.c - HEADERS = $(noinst_HEADERS) - --DIST_COMMON = ChangeLog Makefile.am Makefile.in -+depcomp = $(SHELL) $(top_srcdir)/depcomp -+@AMDEP@DEP_FILES = $(DEPDIR)/_check.Po $(DEPDIR)/_rectest.Po \ -+@AMDEP@$(DEPDIR)/hp_block.Po $(DEPDIR)/hp_clear.Po \ -+@AMDEP@$(DEPDIR)/hp_close.Po $(DEPDIR)/hp_create.Po \ -+@AMDEP@$(DEPDIR)/hp_delete.Po $(DEPDIR)/hp_extra.Po \ -+@AMDEP@$(DEPDIR)/hp_hash.Po $(DEPDIR)/hp_info.Po $(DEPDIR)/hp_open.Po \ -+@AMDEP@$(DEPDIR)/hp_panic.Po $(DEPDIR)/hp_rename.Po \ -+@AMDEP@$(DEPDIR)/hp_rfirst.Po $(DEPDIR)/hp_rkey.Po \ -+@AMDEP@$(DEPDIR)/hp_rlast.Po $(DEPDIR)/hp_rnext.Po \ -+@AMDEP@$(DEPDIR)/hp_rprev.Po $(DEPDIR)/hp_rrnd.Po $(DEPDIR)/hp_rsame.Po \ -+@AMDEP@$(DEPDIR)/hp_scan.Po $(DEPDIR)/hp_static.Po \ -+@AMDEP@$(DEPDIR)/hp_test1.Po $(DEPDIR)/hp_test2.Po \ -+@AMDEP@$(DEPDIR)/hp_update.Po $(DEPDIR)/hp_write.Po -+DIST_COMMON = $(noinst_HEADERS) ChangeLog Makefile.am Makefile.in - - --DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST) -+DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) - --TAR = gtar - GZIP_ENV = --best - SOURCES = $(libheap_a_SOURCES) hp_test1.c hp_test2.c --OBJECTS = $(libheap_a_OBJECTS) hp_test1.o hp_test2.o -+OBJECTS = $(am_libheap_a_OBJECTS) hp_test1.o hp_test2.o - --all: all-redirect -+all: all-am - .SUFFIXES: --.SUFFIXES: .S .c .lo .o .s -+.SUFFIXES: .c .lo .o - $(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 - cd $(top_builddir) \ -- && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status -+ && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= CONFIG_LINKS= $(SHELL) ./config.status - - - mostlyclean-pkglibLIBRARIES: -@@ -265,38 +302,17 @@ - - uninstall-pkglibLIBRARIES: - @$(NORMAL_UNINSTALL) -- list='$(pkglib_LIBRARIES)'; for p in $$list; do \ -+ @list='$(pkglib_LIBRARIES)'; for p in $$list; do \ -+ echo " rm -f $(DESTDIR)$(pkglibdir)/$$p"; \ - rm -f $(DESTDIR)$(pkglibdir)/$$p; \ - done - --.c.o: -- $(COMPILE) -c $< -- --.s.o: -- $(COMPILE) -c $< -- --.S.o: -- $(COMPILE) -c $< -- - mostlyclean-compile: - -rm -f *.o core *.core - --clean-compile: -- - distclean-compile: - -rm -f *.tab.c - --maintainer-clean-compile: -- --.c.lo: -- $(LIBTOOL) --mode=compile $(COMPILE) -c $< -- --.s.lo: -- $(LIBTOOL) --mode=compile $(COMPILE) -c $< -- --.S.lo: -- $(LIBTOOL) --mode=compile $(COMPILE) -c $< -- - mostlyclean-libtool: - -rm -f *.lo - -@@ -304,12 +320,11 @@ - -rm -rf .libs _libs - - distclean-libtool: -- --maintainer-clean-libtool: -+ -rm -f libtool - - libheap.a: $(libheap_a_OBJECTS) $(libheap_a_DEPENDENCIES) - -rm -f libheap.a -- $(AR) cru libheap.a $(libheap_a_OBJECTS) $(libheap_a_LIBADD) -+ $(libheap_a_AR) libheap.a $(libheap_a_OBJECTS) $(libheap_a_LIBADD) - $(RANLIB) libheap.a - - mostlyclean-noinstPROGRAMS: -@@ -331,275 +346,96 @@ - - tags: TAGS - --ID: $(HEADERS) $(SOURCES) $(LISP) -- list='$(SOURCES) $(HEADERS)'; \ -- unique=`for i in $$list; do echo $$i; done | \ -- awk ' { files[$$0] = 1; } \ -+ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) -+ list='$(SOURCES) $(HEADERS) $(TAGS_FILES)'; \ -+ unique=`for i in $$list; do \ -+ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ -+ done | \ -+ $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ -- here=`pwd` && cd $(srcdir) \ -- && mkid -f$$here/ID $$unique $(LISP) -+ mkid -fID $$unique $(LISP) - --TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) $(LISP) -+TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ -+ $(TAGS_FILES) $(LISP) - tags=; \ - here=`pwd`; \ -- list='$(SOURCES) $(HEADERS)'; \ -- unique=`for i in $$list; do echo $$i; done | \ -- awk ' { files[$$0] = 1; } \ -+ list='$(SOURCES) $(HEADERS) $(TAGS_FILES)'; \ -+ unique=`for i in $$list; do \ -+ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ -+ done | \ -+ $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ - test -z "$(ETAGS_ARGS)$$unique$(LISP)$$tags" \ -- || (cd $(srcdir) && etags $(ETAGS_ARGS) $$tags $$unique $(LISP) -o $$here/TAGS) -+ || etags $(ETAGS_ARGS) $$tags $$unique $(LISP) - --mostlyclean-tags: -- --clean-tags: -+GTAGS: -+ here=`CDPATH=: && cd $(top_builddir) && pwd` \ -+ && cd $(top_srcdir) \ -+ && gtags -i $$here - - distclean-tags: - -rm -f TAGS ID - --maintainer-clean-tags: -+@AMDEP@@_am_include@ $(DEPDIR)/_check.Po -+@AMDEP@@_am_include@ $(DEPDIR)/_rectest.Po -+@AMDEP@@_am_include@ $(DEPDIR)/hp_block.Po -+@AMDEP@@_am_include@ $(DEPDIR)/hp_clear.Po -+@AMDEP@@_am_include@ $(DEPDIR)/hp_close.Po -+@AMDEP@@_am_include@ $(DEPDIR)/hp_create.Po -+@AMDEP@@_am_include@ $(DEPDIR)/hp_delete.Po -+@AMDEP@@_am_include@ $(DEPDIR)/hp_extra.Po -+@AMDEP@@_am_include@ $(DEPDIR)/hp_hash.Po -+@AMDEP@@_am_include@ $(DEPDIR)/hp_info.Po -+@AMDEP@@_am_include@ $(DEPDIR)/hp_open.Po -+@AMDEP@@_am_include@ $(DEPDIR)/hp_panic.Po -+@AMDEP@@_am_include@ $(DEPDIR)/hp_rename.Po -+@AMDEP@@_am_include@ $(DEPDIR)/hp_rfirst.Po -+@AMDEP@@_am_include@ $(DEPDIR)/hp_rkey.Po -+@AMDEP@@_am_include@ $(DEPDIR)/hp_rlast.Po -+@AMDEP@@_am_include@ $(DEPDIR)/hp_rnext.Po -+@AMDEP@@_am_include@ $(DEPDIR)/hp_rprev.Po -+@AMDEP@@_am_include@ $(DEPDIR)/hp_rrnd.Po -+@AMDEP@@_am_include@ $(DEPDIR)/hp_rsame.Po -+@AMDEP@@_am_include@ $(DEPDIR)/hp_scan.Po -+@AMDEP@@_am_include@ $(DEPDIR)/hp_static.Po -+@AMDEP@@_am_include@ $(DEPDIR)/hp_test1.Po -+@AMDEP@@_am_include@ $(DEPDIR)/hp_test2.Po -+@AMDEP@@_am_include@ $(DEPDIR)/hp_update.Po -+@AMDEP@@_am_include@ $(DEPDIR)/hp_write.Po -+ -+distclean-depend: -+ -rm -rf $(DEPDIR) -+ -+@AMDEP@CCDEPMODE = @CCDEPMODE@ -+ -+.c.o: -+@AMDEP@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ -+@AMDEP@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@ -+@AMDEP@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -+ $(COMPILE) -c -o $@ `test -f $< || echo '$(srcdir)/'`$< -+ -+.c.lo: -+@AMDEP@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ -+@AMDEP@ depfile='$(DEPDIR)/$*.Plo' tmpdepfile='$(DEPDIR)/$*.TPlo' @AMDEPBACKSLASH@ -+@AMDEP@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -+ $(LTCOMPILE) -c -o $@ `test -f $< || echo '$(srcdir)/'`$< -+ - - distdir = $(top_builddir)/$(PACKAGE)-$(VERSION)/$(subdir) - --subdir = heap - - distdir: $(DISTFILES) - @for file in $(DISTFILES); do \ - d=$(srcdir); \ - if test -d $$d/$$file; then \ -- cp -pr $$d/$$file $(distdir)/$$file; \ -+ cp -pR $$d/$$file $(distdir) \ -+ || exit 1; \ - else \ - test -f $(distdir)/$$file \ -- || ln $$d/$$file $(distdir)/$$file 2> /dev/null \ -- || cp -p $$d/$$file $(distdir)/$$file || :; \ -+ || cp -p $$d/$$file $(distdir)/$$file \ -+ || exit 1; \ - 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 -- - info-am: - info: info-am - dvi-am: -@@ -620,9 +456,8 @@ - uninstall-am: uninstall-pkglibLIBRARIES - uninstall: uninstall-am - all-am: Makefile $(LIBRARIES) $(PROGRAMS) $(HEADERS) --all-redirect: all-am - install-strip: -- $(MAKE) $(AM_MAKEFLAGS) AM_INSTALL_PROGRAM_FLAGS=-s install -+ $(MAKE) $(AM_MAKEFLAGS) INSTALL_STRIP_FLAG=-s install - installdirs: - $(mkinstalldirs) $(DESTDIR)$(pkglibdir) - -@@ -636,48 +471,46 @@ - -rm -f config.cache config.log stamp-h stamp-h[0-9]* - - maintainer-clean-generic: --mostlyclean-am: mostlyclean-pkglibLIBRARIES mostlyclean-compile \ -- mostlyclean-libtool mostlyclean-noinstPROGRAMS \ -- mostlyclean-tags mostlyclean-generic -- --mostlyclean: mostlyclean-am -- --clean-am: clean-pkglibLIBRARIES clean-compile clean-libtool \ -- clean-noinstPROGRAMS clean-tags clean-generic \ -- mostlyclean-am -- -+ @echo "This command is intended for maintainers to use" -+ @echo "it deletes files that may require special tools to rebuild." -+ -rm -f Makefile.in - clean: clean-am - --distclean-am: distclean-pkglibLIBRARIES distclean-compile \ -- distclean-libtool distclean-noinstPROGRAMS \ -- distclean-tags distclean-generic clean-am -- -rm -f libtool -+clean-am: clean-generic clean-libtool clean-noinstPROGRAMS \ -+ clean-pkglibLIBRARIES mostlyclean-am - - distclean: distclean-am - --maintainer-clean-am: maintainer-clean-pkglibLIBRARIES \ -- maintainer-clean-compile maintainer-clean-libtool \ -- maintainer-clean-noinstPROGRAMS maintainer-clean-tags \ -- 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." -+distclean-am: clean-am distclean-compile distclean-depend \ -+ distclean-generic distclean-libtool distclean-noinstPROGRAMS \ -+ distclean-pkglibLIBRARIES distclean-tags - - maintainer-clean: maintainer-clean-am - --.PHONY: mostlyclean-pkglibLIBRARIES distclean-pkglibLIBRARIES \ --clean-pkglibLIBRARIES maintainer-clean-pkglibLIBRARIES \ --uninstall-pkglibLIBRARIES install-pkglibLIBRARIES mostlyclean-compile \ --distclean-compile clean-compile maintainer-clean-compile \ --mostlyclean-libtool distclean-libtool 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 -+maintainer-clean-am: distclean-am maintainer-clean-generic \ -+ maintainer-clean-noinstPROGRAMS \ -+ maintainer-clean-pkglibLIBRARIES -+ -+mostlyclean: mostlyclean-am -+ -+mostlyclean-am: mostlyclean-compile mostlyclean-generic \ -+ mostlyclean-libtool mostlyclean-noinstPROGRAMS \ -+ mostlyclean-pkglibLIBRARIES -+ -+.PHONY: check check-am clean clean-generic clean-libtool \ -+ clean-noinstPROGRAMS clean-pkglibLIBRARIES distclean \ -+ distclean-compile distclean-depend distclean-generic \ -+ distclean-libtool distclean-noinstPROGRAMS \ -+ distclean-pkglibLIBRARIES distclean-tags distdir dvi dvi-am \ -+ info info-am install install-am install-data install-data-am \ -+ install-exec install-exec-am install-pkglibLIBRARIES \ -+ install-strip installcheck installcheck-am installdirs \ -+ maintainer-clean maintainer-clean-generic \ -+ maintainer-clean-noinstPROGRAMS \ -+ maintainer-clean-pkglibLIBRARIES mostlyclean \ -+ mostlyclean-compile mostlyclean-generic mostlyclean-libtool \ -+ mostlyclean-noinstPROGRAMS mostlyclean-pkglibLIBRARIES tags \ -+ uninstall uninstall-am uninstall-pkglibLIBRARIES - - - # Don't update the files from bitkeeper -diff -r -N -U3 mysql-3.23.32.orig/include/Makefile.in mysql-3.23.32/include/Makefile.in ---- mysql-3.23.32.orig/include/Makefile.in Mon Jan 22 14:43:55 2001 -+++ mysql-3.23.32/include/Makefile.in Thu Mar 1 17:01:06 2001 -@@ -1,6 +1,7 @@ --# Makefile.in generated automatically by automake 1.4 from Makefile.am -+# Makefile.in generated automatically by automake 1.4d from Makefile.am - --# Copyright (C) 1994, 1995-8, 1999 Free Software Foundation, Inc. -+# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001 -+# Free Software Foundation, Inc. - # This Makefile.in is free software; the Free Software Foundation - # gives unlimited permission to copy and/or distribute it, - # with or without modifications, as long as this notice is preserved. -@@ -10,24 +11,6 @@ - # even the implied warranty of MERCHANTABILITY or FITNESS FOR A - # PARTICULAR PURPOSE. - --# Copyright (C) 2000 MySQL AB & MySQL Finland AB & TCX DataKonsult AB --# --# This library is free software; you can redistribute it and/or --# modify it under the terms of the GNU Library General Public --# License as published by the Free Software Foundation; either --# version 2 of the License, or (at your option) any later version. --# --# This library is distributed in the hope that it will be useful, --# but WITHOUT ANY WARRANTY; without even the implied warranty of --# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU --# Library General Public License for more details. --# --# You should have received a copy of the GNU Library General Public --# License along with this library; if not, write to the Free --# Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, --# MA 02111-1307, USA -- -- - SHELL = @SHELL@ - - srcdir = @srcdir@ -@@ -49,8 +32,6 @@ - includedir = @includedir@ - oldincludedir = /usr/include - --DESTDIR = -- - pkgdatadir = $(datadir)/@PACKAGE@ - pkglibdir = $(libdir)/@PACKAGE@ - pkgincludedir = $(includedir)/@PACKAGE@ -@@ -63,9 +44,11 @@ - AUTOHEADER = @AUTOHEADER@ - - INSTALL = @INSTALL@ --INSTALL_PROGRAM = @INSTALL_PROGRAM@ $(AM_INSTALL_PROGRAM_FLAGS) -+INSTALL_PROGRAM = @INSTALL_PROGRAM@ - INSTALL_DATA = @INSTALL_DATA@ - INSTALL_SCRIPT = @INSTALL_SCRIPT@ -+INSTALL_STRIP_FLAG = -+INSTALL_HEADER = $(INSTALL_DATA) - transform = @program_transform_name@ - - NORMAL_INSTALL = : -@@ -74,6 +57,8 @@ - NORMAL_UNINSTALL = : - PRE_UNINSTALL = : - POST_UNINSTALL = : -+ -+@SET_MAKE@ - build_alias = @build_alias@ - build_triplet = @build@ - host_alias = @host_alias@ -@@ -81,6 +66,8 @@ - target_alias = @target_alias@ - target_triplet = @target@ - ALLOCA = @ALLOCA@ -+AMDEP = @AMDEP@ -+AMTAR = @AMTAR@ - AS = @AS@ - AVAILABLE_LANGUAGES = @AVAILABLE_LANGUAGES@ - AVAILABLE_LANGUAGES_ERRORS = @AVAILABLE_LANGUAGES_ERRORS@ -@@ -102,6 +89,7 @@ - CXX = @CXX@ - CXXFLAGS = @CXXFLAGS@ - CXXLDFLAGS = @CXXLDFLAGS@ -+DEPDIR = @DEPDIR@ - DLLTOOL = @DLLTOOL@ - DOT_FRM_VERSION = @DOT_FRM_VERSION@ - FIND_PROC = @FIND_PROC@ -@@ -155,11 +143,13 @@ - VERSION = @VERSION@ - WRAPLIBS = @WRAPLIBS@ - YACC = @YACC@ -+_am_include = @_am_include@ - bdb_includes = @bdb_includes@ - bdb_libs = @bdb_libs@ - bench_dirs = @bench_dirs@ - default_charset = @default_charset@ - docs_dirs = @docs_dirs@ -+install_sh = @install_sh@ - linked_client_targets = @linked_client_targets@ - readline_dir = @readline_dir@ - readline_link = @readline_link@ -@@ -169,10 +159,40 @@ - thread_dirs = @thread_dirs@ - uname_prog = @uname_prog@ - --BUILT_SOURCES = mysql_version.h m_ctype.h my_config.h --pkginclude_HEADERS = dbug.h m_string.h my_sys.h mysql.h mysql_com.h mysqld_error.h my_list.h my_pthread.h my_no_pthread.h raid.h errmsg.h my_global.h my_net.h sslopt-case.h sslopt-longopts.h sslopt-usage.h sslopt-vars.h $(BUILT_SOURCES) -+# Copyright (C) 2000 MySQL AB & MySQL Finland AB & TCX DataKonsult AB -+# -+# This library is free software; you can redistribute it and/or -+# modify it under the terms of the GNU Library General Public -+# License as published by the Free Software Foundation; either -+# version 2 of the License, or (at your option) any later version. -+# -+# This library is distributed in the hope that it will be useful, -+# but WITHOUT ANY WARRANTY; without even the implied warranty of -+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -+# Library General Public License for more details. -+# -+# You should have received a copy of the GNU Library General Public -+# License along with this library; if not, write to the Free -+# Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, -+# MA 02111-1307, USA - --noinst_HEADERS = global.h config-win.h nisam.h heap.h merge.h myisam.h myisampack.h myisammrg.h ft_global.h my_dir.h mysys_err.h my_base.h my_nosys.h my_alarm.h queues.h my_tree.h hash.h thr_alarm.h thr_lock.h getopt.h t_ctype.h violite.h mysql_version.h.in -+ -+BUILT_SOURCES = mysql_version.h m_ctype.h my_config.h -+pkginclude_HEADERS = dbug.h m_string.h my_sys.h mysql.h mysql_com.h \ -+ mysqld_error.h my_list.h \ -+ my_pthread.h my_no_pthread.h raid.h errmsg.h \ -+ my_global.h my_net.h \ -+ sslopt-case.h sslopt-longopts.h sslopt-usage.h \ -+ sslopt-vars.h $(BUILT_SOURCES) -+ -+noinst_HEADERS = global.h config-win.h \ -+ nisam.h heap.h merge.h \ -+ myisam.h myisampack.h myisammrg.h ft_global.h\ -+ my_dir.h mysys_err.h my_base.h \ -+ my_nosys.h my_alarm.h queues.h \ -+ my_tree.h hash.h thr_alarm.h thr_lock.h \ -+ getopt.h t_ctype.h violite.h \ -+ mysql_version.h.in - - - # mysql_version.h are generated -@@ -180,91 +200,95 @@ - - # Some include files that may be moved and patched by configure - DISTCLEANFILES = sched.h -+subdir = include - mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs - CONFIG_HEADER = ../config.h - CONFIG_CLEAN_FILES = mysql_version.h --COMPILE = $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) --LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) --CCLD = $(CC) --LINK = $(LIBTOOL) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(LDFLAGS) -o $@ -+DIST_SOURCES = - HEADERS = $(noinst_HEADERS) $(pkginclude_HEADERS) - --DIST_COMMON = Makefile.am Makefile.in mysql_version.h.in -+DIST_COMMON = $(noinst_HEADERS) $(pkginclude_HEADERS) Makefile.am \ -+Makefile.in mysql_version.h.in - - --DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST) -+DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) - --TAR = gtar - 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 - cd $(top_builddir) \ -- && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status -+ && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= CONFIG_LINKS= $(SHELL) ./config.status - - mysql_version.h: $(top_builddir)/config.status mysql_version.h.in -- cd $(top_builddir) && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status -+ cd $(top_builddir) && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= CONFIG_LINKS= $(SHELL) ./config.status - - install-pkgincludeHEADERS: $(pkginclude_HEADERS) - @$(NORMAL_INSTALL) - $(mkinstalldirs) $(DESTDIR)$(pkgincludedir) - @list='$(pkginclude_HEADERS)'; for p in $$list; do \ -- if test -f "$$p"; then d= ; else d="$(srcdir)/"; fi; \ -- echo " $(INSTALL_DATA) $$d$$p $(DESTDIR)$(pkgincludedir)/$$p"; \ -- $(INSTALL_DATA) $$d$$p $(DESTDIR)$(pkgincludedir)/$$p; \ -+ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ -+ f="`echo $$p | sed -e 's|^.*/||'`"; \ -+ echo " $(INSTALL_HEADER) $$d$$p $(DESTDIR)$(pkgincludedir)/$$f"; \ -+ $(INSTALL_HEADER) $$d$$p $(DESTDIR)$(pkgincludedir)/$$f; \ - done - - uninstall-pkgincludeHEADERS: - @$(NORMAL_UNINSTALL) -- list='$(pkginclude_HEADERS)'; for p in $$list; do \ -- rm -f $(DESTDIR)$(pkgincludedir)/$$p; \ -+ @list='$(pkginclude_HEADERS)'; for p in $$list; do \ -+ f="`echo $$p | sed -e 's|^.*/||'`"; \ -+ echo " rm -f $(DESTDIR)$(pkgincludedir)/$$f"; \ -+ rm -f $(DESTDIR)$(pkgincludedir)/$$f; \ - done - - tags: TAGS - --ID: $(HEADERS) $(SOURCES) $(LISP) -- list='$(SOURCES) $(HEADERS)'; \ -- unique=`for i in $$list; do echo $$i; done | \ -- awk ' { files[$$0] = 1; } \ -+ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) -+ list='$(SOURCES) $(HEADERS) $(TAGS_FILES)'; \ -+ unique=`for i in $$list; do \ -+ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ -+ done | \ -+ $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ -- here=`pwd` && cd $(srcdir) \ -- && mkid -f$$here/ID $$unique $(LISP) -+ mkid -fID $$unique $(LISP) - --TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) $(LISP) -+TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ -+ $(TAGS_FILES) $(LISP) - tags=; \ - here=`pwd`; \ -- list='$(SOURCES) $(HEADERS)'; \ -- unique=`for i in $$list; do echo $$i; done | \ -- awk ' { files[$$0] = 1; } \ -+ list='$(SOURCES) $(HEADERS) $(TAGS_FILES)'; \ -+ unique=`for i in $$list; do \ -+ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ -+ done | \ -+ $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ - test -z "$(ETAGS_ARGS)$$unique$(LISP)$$tags" \ -- || (cd $(srcdir) && etags $(ETAGS_ARGS) $$tags $$unique $(LISP) -o $$here/TAGS) -- --mostlyclean-tags: -+ || etags $(ETAGS_ARGS) $$tags $$unique $(LISP) - --clean-tags: -+GTAGS: -+ here=`CDPATH=: && cd $(top_builddir) && pwd` \ -+ && cd $(top_srcdir) \ -+ && gtags -i $$here - - distclean-tags: - -rm -f TAGS ID - --maintainer-clean-tags: -- - distdir = $(top_builddir)/$(PACKAGE)-$(VERSION)/$(subdir) - --subdir = include - - distdir: $(DISTFILES) - @for file in $(DISTFILES); do \ - d=$(srcdir); \ - if test -d $$d/$$file; then \ -- cp -pr $$d/$$file $(distdir)/$$file; \ -+ cp -pR $$d/$$file $(distdir) \ -+ || exit 1; \ - else \ - test -f $(distdir)/$$file \ -- || ln $$d/$$file $(distdir)/$$file 2> /dev/null \ -- || cp -p $$d/$$file $(distdir)/$$file || :; \ -+ || cp -p $$d/$$file $(distdir)/$$file \ -+ || exit 1; \ - fi; \ - done - $(MAKE) $(AM_MAKEFLAGS) top_distdir="$(top_distdir)" distdir="$(distdir)" dist-hook -@@ -276,6 +300,9 @@ - check: check-am - installcheck-am: - installcheck: installcheck-am -+all-redirect: $(BUILT_SOURCES) -+ $(MAKE) $(AM_MAKEFLAGS) all-am -+ - install-exec-am: - install-exec: install-exec-am - -@@ -288,9 +315,8 @@ - uninstall-am: uninstall-pkgincludeHEADERS - uninstall: uninstall-am - all-am: Makefile $(HEADERS) all-local --all-redirect: all-am - install-strip: -- $(MAKE) $(AM_MAKEFLAGS) AM_INSTALL_PROGRAM_FLAGS=-s install -+ $(MAKE) $(AM_MAKEFLAGS) INSTALL_STRIP_FLAG=-s install - installdirs: - $(mkinstalldirs) $(DESTDIR)$(pkgincludedir) - -@@ -305,34 +331,34 @@ - -test -z "$(DISTCLEANFILES)" || rm -f $(DISTCLEANFILES) - - maintainer-clean-generic: -+ @echo "This command is intended for maintainers to use" -+ @echo "it deletes files that may require special tools to rebuild." -+ -rm -f Makefile.in - -test -z "$(BUILT_SOURCES)" || rm -f $(BUILT_SOURCES) --mostlyclean-am: mostlyclean-tags mostlyclean-generic -- --mostlyclean: mostlyclean-am -- --clean-am: clean-tags clean-generic mostlyclean-am -- - clean: clean-am - --distclean-am: distclean-tags distclean-generic clean-am -- -rm -f libtool -+clean-am: clean-generic mostlyclean-am - - distclean: distclean-am - --maintainer-clean-am: maintainer-clean-tags 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." -+distclean-am: clean-am distclean-generic distclean-tags - - maintainer-clean: maintainer-clean-am - --.PHONY: 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-local all-redirect all-am \ --all installdirs mostlyclean-generic distclean-generic clean-generic \ --maintainer-clean-generic clean mostlyclean distclean maintainer-clean -+maintainer-clean-am: distclean-am maintainer-clean-generic -+ -+mostlyclean: mostlyclean-am -+ -+mostlyclean-am: mostlyclean-generic -+ -+.PHONY: all-local all-redirect check check-am clean clean-generic \ -+ distclean distclean-generic distclean-tags distdir dvi dvi-am \ -+ info info-am install install-am install-data install-data-am \ -+ install-exec install-exec-am install-pkgincludeHEADERS \ -+ install-strip installcheck installcheck-am installdirs \ -+ maintainer-clean maintainer-clean-generic mostlyclean \ -+ mostlyclean-generic tags uninstall uninstall-am \ -+ uninstall-pkgincludeHEADERS - - - all-local: my_global.h my_config.h -diff -r -N -U3 mysql-3.23.32.orig/isam/Makefile.in mysql-3.23.32/isam/Makefile.in ---- mysql-3.23.32.orig/isam/Makefile.in Mon Jan 22 14:44:08 2001 -+++ mysql-3.23.32/isam/Makefile.in Thu Mar 1 17:00:52 2001 -@@ -1,6 +1,7 @@ --# Makefile.in generated automatically by automake 1.4 from Makefile.am -+# Makefile.in generated automatically by automake 1.4d from Makefile.am - --# Copyright (C) 1994, 1995-8, 1999 Free Software Foundation, Inc. -+# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001 -+# Free Software Foundation, Inc. - # This Makefile.in is free software; the Free Software Foundation - # gives unlimited permission to copy and/or distribute it, - # with or without modifications, as long as this notice is preserved. -@@ -10,23 +11,6 @@ - # even the implied warranty of MERCHANTABILITY or FITNESS FOR A - # PARTICULAR PURPOSE. - --# Copyright (C) 2000 MySQL AB & MySQL Finland AB & TCX DataKonsult AB --# --# This program is free software; you can redistribute it and/or modify --# it under the terms of the GNU General Public License as published by --# the Free Software Foundation; either version 2 of the License, or --# (at your option) any later version. --# --# This program is distributed in the hope that it will be useful, --# but WITHOUT ANY WARRANTY; without even the implied warranty of --# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the --# GNU General Public License for more details. --# --# You should have received a copy of the GNU General Public License --# along with this program; if not, write to the Free Software --# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -- -- - SHELL = @SHELL@ - - srcdir = @srcdir@ -@@ -48,8 +32,6 @@ - includedir = @includedir@ - oldincludedir = /usr/include - --DESTDIR = -- - pkgdatadir = $(datadir)/@PACKAGE@ - pkglibdir = $(libdir)/@PACKAGE@ - pkgincludedir = $(includedir)/@PACKAGE@ -@@ -62,9 +44,11 @@ - AUTOHEADER = @AUTOHEADER@ - - INSTALL = @INSTALL@ --INSTALL_PROGRAM = @INSTALL_PROGRAM@ $(AM_INSTALL_PROGRAM_FLAGS) -+INSTALL_PROGRAM = @INSTALL_PROGRAM@ - INSTALL_DATA = @INSTALL_DATA@ - INSTALL_SCRIPT = @INSTALL_SCRIPT@ -+INSTALL_STRIP_FLAG = -+INSTALL_HEADER = $(INSTALL_DATA) - transform = @program_transform_name@ - - NORMAL_INSTALL = : -@@ -73,6 +57,8 @@ - NORMAL_UNINSTALL = : - PRE_UNINSTALL = : - POST_UNINSTALL = : -+ -+@SET_MAKE@ - build_alias = @build_alias@ - build_triplet = @build@ - host_alias = @host_alias@ -@@ -80,6 +66,8 @@ - target_alias = @target_alias@ - target_triplet = @target@ - ALLOCA = @ALLOCA@ -+AMDEP = @AMDEP@ -+AMTAR = @AMTAR@ - AS = @AS@ - AVAILABLE_LANGUAGES = @AVAILABLE_LANGUAGES@ - AVAILABLE_LANGUAGES_ERRORS = @AVAILABLE_LANGUAGES_ERRORS@ -@@ -101,6 +89,7 @@ - CXX = @CXX@ - CXXFLAGS = @CXXFLAGS@ - CXXLDFLAGS = @CXXLDFLAGS@ -+DEPDIR = @DEPDIR@ - DLLTOOL = @DLLTOOL@ - DOT_FRM_VERSION = @DOT_FRM_VERSION@ - FIND_PROC = @FIND_PROC@ -@@ -154,11 +143,13 @@ - VERSION = @VERSION@ - WRAPLIBS = @WRAPLIBS@ - YACC = @YACC@ -+_am_include = @_am_include@ - bdb_includes = @bdb_includes@ - bdb_libs = @bdb_libs@ - bench_dirs = @bench_dirs@ - default_charset = @default_charset@ - docs_dirs = @docs_dirs@ -+install_sh = @install_sh@ - linked_client_targets = @linked_client_targets@ - readline_dir = @readline_dir@ - readline_link = @readline_link@ -@@ -168,8 +159,26 @@ - thread_dirs = @thread_dirs@ - uname_prog = @uname_prog@ - -+# Copyright (C) 2000 MySQL AB & MySQL Finland AB & TCX DataKonsult AB -+# -+# This program is free software; you can redistribute it and/or modify -+# it under the terms of the GNU General Public License as published by -+# the Free Software Foundation; either version 2 of the License, or -+# (at your option) any later version. -+# -+# This program is distributed in the hope that it will be useful, -+# but WITHOUT ANY WARRANTY; without even the implied warranty of -+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -+# GNU General Public License for more details. -+# -+# You should have received a copy of the GNU General Public License -+# along with this program; if not, write to the Free Software -+# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -+ -+ - INCLUDES = @MT_INCLUDES@ -I$(srcdir)/../include -I../include --LDADD = @CLIENT_EXTRA_LDFLAGS@ libnisam.a ../mysys/libmysys.a ../dbug/libdbug.a ../strings/libmystrings.a -+LDADD = @CLIENT_EXTRA_LDFLAGS@ libnisam.a ../mysys/libmysys.a \ -+ ../dbug/libdbug.a ../strings/libmystrings.a - - pkglib_LIBRARIES = libnisam.a - bin_PROGRAMS = isamchk isamlog pack_isam -@@ -181,13 +190,27 @@ - test1_DEPENDENCIES = $(LIBRARIES) - test2_DEPENDENCIES = $(LIBRARIES) - test3_DEPENDENCIES = $(LIBRARIES) --libnisam_a_SOURCES = open.c extra.c info.c rkey.c rnext.c _search.c _page.c _key.c _locking.c rrnd.c _cache.c _statrec.c _packrec.c _dynrec.c update.c write.c delete.c rprev.c rfirst.c rlast.c rsame.c rsamepos.c panic.c close.c create.c range.c _dbug.c log.c changed.c static.c -+libnisam_a_SOURCES = open.c extra.c info.c rkey.c rnext.c \ -+ _search.c _page.c _key.c _locking.c \ -+ rrnd.c _cache.c _statrec.c _packrec.c \ -+ _dynrec.c update.c write.c delete.c \ -+ rprev.c rfirst.c rlast.c rsame.c rsamepos.c \ -+ panic.c close.c create.c range.c _dbug.c \ -+ log.c changed.c static.c - - isamchk_SOURCES = isamchk.c sort.c - CLEANFILES = test?.IS? isam.log - # Omit dependency for ../mit-pthreads/include/ things --OMIT_DEPENDENCIES = pthread.h stdio.h __stdio.h stdlib.h __stdlib.h math.h __math.h time.h __time.h unistd.h __unistd.h types.h xtypes.h ac-types.h posix.h string.h __string.h errno.h socket.h inet.h dirent.h netdb.h cleanup.h cond.h debug_out.h fd.h kernel.h mutex.h prio_queue.h pthread_attr.h pthread_once.h queue.h sleep.h specific.h version.h pwd.h timers.h uio.h cdefs.h machdep.h signal.h __signal.h util.h wait.h -+OMIT_DEPENDENCIES = pthread.h stdio.h __stdio.h stdlib.h __stdlib.h math.h\ -+ __math.h time.h __time.h unistd.h __unistd.h types.h \ -+ xtypes.h ac-types.h posix.h string.h __string.h \ -+ errno.h socket.h inet.h dirent.h netdb.h \ -+ cleanup.h cond.h debug_out.h fd.h kernel.h mutex.h \ -+ prio_queue.h pthread_attr.h pthread_once.h queue.h\ -+ sleep.h specific.h version.h pwd.h timers.h uio.h \ -+ cdefs.h machdep.h signal.h __signal.h util.h wait.h - -+subdir = isam - mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs - CONFIG_HEADER = ../config.h - CONFIG_CLEAN_FILES = -@@ -198,16 +221,19 @@ - CPPFLAGS = @CPPFLAGS@ - LDFLAGS = @LDFLAGS@ - LIBS = @LIBS@ -+libnisam_a_AR = $(AR) cru - libnisam_a_LIBADD = --libnisam_a_OBJECTS = open.o extra.o info.o rkey.o rnext.o _search.o \ -+am_libnisam_a_OBJECTS = open.o extra.o info.o rkey.o rnext.o _search.o \ - _page.o _key.o _locking.o rrnd.o _cache.o _statrec.o _packrec.o \ - _dynrec.o update.o write.o delete.o rprev.o rfirst.o rlast.o rsame.o \ - rsamepos.o panic.o close.o create.o range.o _dbug.o log.o changed.o \ - static.o -+libnisam_a_OBJECTS = $(am_libnisam_a_OBJECTS) - AR = ar - PROGRAMS = $(bin_PROGRAMS) $(noinst_PROGRAMS) - --isamchk_OBJECTS = isamchk.o sort.o -+am_isamchk_OBJECTS = isamchk.o sort.o -+isamchk_OBJECTS = $(am_isamchk_OBJECTS) - isamchk_LDADD = $(LDADD) - isamchk_LDFLAGS = - isamlog_SOURCES = isamlog.c -@@ -233,28 +259,43 @@ - COMPILE = $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) - LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) - CCLD = $(CC) --LINK = $(LIBTOOL) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(LDFLAGS) -o $@ -+LINK = $(LIBTOOL) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@ -+DIST_SOURCES = $(libnisam_a_SOURCES) $(isamchk_SOURCES) isamlog.c \ -+pack_isam.c test1.c test2.c test3.c - HEADERS = $(noinst_HEADERS) - --DIST_COMMON = ChangeLog Makefile.am Makefile.in -+depcomp = $(SHELL) $(top_srcdir)/depcomp -+@AMDEP@DEP_FILES = $(DEPDIR)/_cache.Po $(DEPDIR)/_dbug.Po \ -+@AMDEP@$(DEPDIR)/_dynrec.Po $(DEPDIR)/_key.Po $(DEPDIR)/_locking.Po \ -+@AMDEP@$(DEPDIR)/_packrec.Po $(DEPDIR)/_page.Po $(DEPDIR)/_search.Po \ -+@AMDEP@$(DEPDIR)/_statrec.Po $(DEPDIR)/changed.Po $(DEPDIR)/close.Po \ -+@AMDEP@$(DEPDIR)/create.Po $(DEPDIR)/delete.Po $(DEPDIR)/extra.Po \ -+@AMDEP@$(DEPDIR)/info.Po $(DEPDIR)/isamchk.Po $(DEPDIR)/isamlog.Po \ -+@AMDEP@$(DEPDIR)/log.Po $(DEPDIR)/open.Po $(DEPDIR)/pack_isam.Po \ -+@AMDEP@$(DEPDIR)/panic.Po $(DEPDIR)/range.Po $(DEPDIR)/rfirst.Po \ -+@AMDEP@$(DEPDIR)/rkey.Po $(DEPDIR)/rlast.Po $(DEPDIR)/rnext.Po \ -+@AMDEP@$(DEPDIR)/rprev.Po $(DEPDIR)/rrnd.Po $(DEPDIR)/rsame.Po \ -+@AMDEP@$(DEPDIR)/rsamepos.Po $(DEPDIR)/sort.Po $(DEPDIR)/static.Po \ -+@AMDEP@$(DEPDIR)/test1.Po $(DEPDIR)/test2.Po $(DEPDIR)/test3.Po \ -+@AMDEP@$(DEPDIR)/update.Po $(DEPDIR)/write.Po -+DIST_COMMON = $(noinst_HEADERS) ChangeLog Makefile.am Makefile.in - - --DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST) -+DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) - --TAR = gtar - GZIP_ENV = --best - 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 -+OBJECTS = $(am_libnisam_a_OBJECTS) $(am_isamchk_OBJECTS) isamlog.o pack_isam.o test1.o test2.o test3.o - --all: all-redirect -+all: all-am - .SUFFIXES: --.SUFFIXES: .S .c .lo .o .s -+.SUFFIXES: .c .lo .o - $(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 - cd $(top_builddir) \ -- && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status -+ && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= CONFIG_LINKS= $(SHELL) ./config.status - - - mostlyclean-pkglibLIBRARIES: -@@ -285,38 +326,17 @@ - - uninstall-pkglibLIBRARIES: - @$(NORMAL_UNINSTALL) -- list='$(pkglib_LIBRARIES)'; for p in $$list; do \ -+ @list='$(pkglib_LIBRARIES)'; for p in $$list; do \ -+ echo " rm -f $(DESTDIR)$(pkglibdir)/$$p"; \ - rm -f $(DESTDIR)$(pkglibdir)/$$p; \ - done - --.c.o: -- $(COMPILE) -c $< -- --.s.o: -- $(COMPILE) -c $< -- --.S.o: -- $(COMPILE) -c $< -- - mostlyclean-compile: - -rm -f *.o core *.core - --clean-compile: -- - distclean-compile: - -rm -f *.tab.c - --maintainer-clean-compile: -- --.c.lo: -- $(LIBTOOL) --mode=compile $(COMPILE) -c $< -- --.s.lo: -- $(LIBTOOL) --mode=compile $(COMPILE) -c $< -- --.S.lo: -- $(LIBTOOL) --mode=compile $(COMPILE) -c $< -- - mostlyclean-libtool: - -rm -f *.lo - -@@ -324,12 +344,11 @@ - -rm -rf .libs _libs - - distclean-libtool: -- --maintainer-clean-libtool: -+ -rm -f libtool - - libnisam.a: $(libnisam_a_OBJECTS) $(libnisam_a_DEPENDENCIES) - -rm -f libnisam.a -- $(AR) cru libnisam.a $(libnisam_a_OBJECTS) $(libnisam_a_LIBADD) -+ $(libnisam_a_AR) libnisam.a $(libnisam_a_OBJECTS) $(libnisam_a_LIBADD) - $(RANLIB) libnisam.a - - mostlyclean-binPROGRAMS: -@@ -346,15 +365,18 @@ - $(mkinstalldirs) $(DESTDIR)$(bindir) - @list='$(bin_PROGRAMS)'; for p in $$list; do \ - if test -f $$p; then \ -- echo " $(LIBTOOL) --mode=install $(INSTALL_PROGRAM) $$p $(DESTDIR)$(bindir)/`echo $$p|sed 's/$(EXEEXT)$$//'|sed '$(transform)'|sed 's/$$/$(EXEEXT)/'`"; \ -- $(LIBTOOL) --mode=install $(INSTALL_PROGRAM) $$p $(DESTDIR)$(bindir)/`echo $$p|sed 's/$(EXEEXT)$$//'|sed '$(transform)'|sed 's/$$/$(EXEEXT)/'`; \ -+ f="`echo $$p|sed -e 's/$(EXEEXT)$$//' -e '$(transform)' -e 's/$$/$(EXEEXT)/'`"; \ -+ echo " $(LIBTOOL) --mode=install $(INSTALL_PROGRAM) $(INSTALL_STRIP_FLAG) $$p $(DESTDIR)$(bindir)/$$f"; \ -+ $(LIBTOOL) --mode=install $(INSTALL_PROGRAM) $(INSTALL_STRIP_FLAG) $$p $(DESTDIR)$(bindir)/$$f; \ - else :; fi; \ - done - - uninstall-binPROGRAMS: - @$(NORMAL_UNINSTALL) -- list='$(bin_PROGRAMS)'; for p in $$list; do \ -- rm -f $(DESTDIR)$(bindir)/`echo $$p|sed 's/$(EXEEXT)$$//'|sed '$(transform)'|sed 's/$$/$(EXEEXT)/'`; \ -+ @list='$(bin_PROGRAMS)'; for p in $$list; do \ -+ f="`echo $$p|sed -e 's/$(EXEEXT)$$//' -e '$(transform)' -e 's/$$/$(EXEEXT)/'`"; \ -+ echo " rm -f $(DESTDIR)$(bindir)/$$f"; \ -+ rm -f $(DESTDIR)$(bindir)/$$f; \ - done - - mostlyclean-noinstPROGRAMS: -@@ -392,382 +414,107 @@ - - tags: TAGS - --ID: $(HEADERS) $(SOURCES) $(LISP) -- list='$(SOURCES) $(HEADERS)'; \ -- unique=`for i in $$list; do echo $$i; done | \ -- awk ' { files[$$0] = 1; } \ -+ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) -+ list='$(SOURCES) $(HEADERS) $(TAGS_FILES)'; \ -+ unique=`for i in $$list; do \ -+ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ -+ done | \ -+ $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ -- here=`pwd` && cd $(srcdir) \ -- && mkid -f$$here/ID $$unique $(LISP) -+ mkid -fID $$unique $(LISP) - --TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) $(LISP) -+TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ -+ $(TAGS_FILES) $(LISP) - tags=; \ - here=`pwd`; \ -- list='$(SOURCES) $(HEADERS)'; \ -- unique=`for i in $$list; do echo $$i; done | \ -- awk ' { files[$$0] = 1; } \ -+ list='$(SOURCES) $(HEADERS) $(TAGS_FILES)'; \ -+ unique=`for i in $$list; do \ -+ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ -+ done | \ -+ $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ - test -z "$(ETAGS_ARGS)$$unique$(LISP)$$tags" \ -- || (cd $(srcdir) && etags $(ETAGS_ARGS) $$tags $$unique $(LISP) -o $$here/TAGS) -- --mostlyclean-tags: -+ || etags $(ETAGS_ARGS) $$tags $$unique $(LISP) - --clean-tags: -+GTAGS: -+ here=`CDPATH=: && cd $(top_builddir) && pwd` \ -+ && cd $(top_srcdir) \ -+ && gtags -i $$here - - distclean-tags: - -rm -f TAGS ID - --maintainer-clean-tags: -+@AMDEP@@_am_include@ $(DEPDIR)/_cache.Po -+@AMDEP@@_am_include@ $(DEPDIR)/_dbug.Po -+@AMDEP@@_am_include@ $(DEPDIR)/_dynrec.Po -+@AMDEP@@_am_include@ $(DEPDIR)/_key.Po -+@AMDEP@@_am_include@ $(DEPDIR)/_locking.Po -+@AMDEP@@_am_include@ $(DEPDIR)/_packrec.Po -+@AMDEP@@_am_include@ $(DEPDIR)/_page.Po -+@AMDEP@@_am_include@ $(DEPDIR)/_search.Po -+@AMDEP@@_am_include@ $(DEPDIR)/_statrec.Po -+@AMDEP@@_am_include@ $(DEPDIR)/changed.Po -+@AMDEP@@_am_include@ $(DEPDIR)/close.Po -+@AMDEP@@_am_include@ $(DEPDIR)/create.Po -+@AMDEP@@_am_include@ $(DEPDIR)/delete.Po -+@AMDEP@@_am_include@ $(DEPDIR)/extra.Po -+@AMDEP@@_am_include@ $(DEPDIR)/info.Po -+@AMDEP@@_am_include@ $(DEPDIR)/isamchk.Po -+@AMDEP@@_am_include@ $(DEPDIR)/isamlog.Po -+@AMDEP@@_am_include@ $(DEPDIR)/log.Po -+@AMDEP@@_am_include@ $(DEPDIR)/open.Po -+@AMDEP@@_am_include@ $(DEPDIR)/pack_isam.Po -+@AMDEP@@_am_include@ $(DEPDIR)/panic.Po -+@AMDEP@@_am_include@ $(DEPDIR)/range.Po -+@AMDEP@@_am_include@ $(DEPDIR)/rfirst.Po -+@AMDEP@@_am_include@ $(DEPDIR)/rkey.Po -+@AMDEP@@_am_include@ $(DEPDIR)/rlast.Po -+@AMDEP@@_am_include@ $(DEPDIR)/rnext.Po -+@AMDEP@@_am_include@ $(DEPDIR)/rprev.Po -+@AMDEP@@_am_include@ $(DEPDIR)/rrnd.Po -+@AMDEP@@_am_include@ $(DEPDIR)/rsame.Po -+@AMDEP@@_am_include@ $(DEPDIR)/rsamepos.Po -+@AMDEP@@_am_include@ $(DEPDIR)/sort.Po -+@AMDEP@@_am_include@ $(DEPDIR)/static.Po -+@AMDEP@@_am_include@ $(DEPDIR)/test1.Po -+@AMDEP@@_am_include@ $(DEPDIR)/test2.Po -+@AMDEP@@_am_include@ $(DEPDIR)/test3.Po -+@AMDEP@@_am_include@ $(DEPDIR)/update.Po -+@AMDEP@@_am_include@ $(DEPDIR)/write.Po -+ -+distclean-depend: -+ -rm -rf $(DEPDIR) -+ -+@AMDEP@CCDEPMODE = @CCDEPMODE@ -+ -+.c.o: -+@AMDEP@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ -+@AMDEP@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@ -+@AMDEP@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -+ $(COMPILE) -c -o $@ `test -f $< || echo '$(srcdir)/'`$< -+ -+.c.lo: -+@AMDEP@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ -+@AMDEP@ depfile='$(DEPDIR)/$*.Plo' tmpdepfile='$(DEPDIR)/$*.TPlo' @AMDEPBACKSLASH@ -+@AMDEP@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -+ $(LTCOMPILE) -c -o $@ `test -f $< || echo '$(srcdir)/'`$< -+ - - distdir = $(top_builddir)/$(PACKAGE)-$(VERSION)/$(subdir) - --subdir = isam - - distdir: $(DISTFILES) - @for file in $(DISTFILES); do \ - d=$(srcdir); \ - if test -d $$d/$$file; then \ -- cp -pr $$d/$$file $(distdir)/$$file; \ -+ cp -pR $$d/$$file $(distdir) \ -+ || exit 1; \ - else \ - test -f $(distdir)/$$file \ -- || ln $$d/$$file $(distdir)/$$file 2> /dev/null \ -- || cp -p $$d/$$file $(distdir)/$$file || :; \ -+ || cp -p $$d/$$file $(distdir)/$$file \ -+ || exit 1; \ - 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 -- - info-am: - info: info-am - dvi-am: -@@ -788,9 +535,8 @@ - uninstall-am: uninstall-pkglibLIBRARIES uninstall-binPROGRAMS - uninstall: uninstall-am - all-am: Makefile $(LIBRARIES) $(PROGRAMS) $(HEADERS) --all-redirect: all-am - install-strip: -- $(MAKE) $(AM_MAKEFLAGS) AM_INSTALL_PROGRAM_FLAGS=-s install -+ $(MAKE) $(AM_MAKEFLAGS) INSTALL_STRIP_FLAG=-s install - installdirs: - $(mkinstalldirs) $(DESTDIR)$(pkglibdir) $(DESTDIR)$(bindir) - -@@ -805,52 +551,49 @@ - -rm -f config.cache config.log stamp-h stamp-h[0-9]* - - maintainer-clean-generic: --mostlyclean-am: mostlyclean-pkglibLIBRARIES mostlyclean-compile \ -- mostlyclean-libtool mostlyclean-binPROGRAMS \ -- mostlyclean-noinstPROGRAMS mostlyclean-tags \ -- mostlyclean-generic -- --mostlyclean: mostlyclean-am -- --clean-am: clean-pkglibLIBRARIES clean-compile clean-libtool \ -- clean-binPROGRAMS clean-noinstPROGRAMS clean-tags \ -- clean-generic mostlyclean-am -- -+ @echo "This command is intended for maintainers to use" -+ @echo "it deletes files that may require special tools to rebuild." -+ -rm -f Makefile.in - clean: clean-am - --distclean-am: distclean-pkglibLIBRARIES distclean-compile \ -- distclean-libtool distclean-binPROGRAMS \ -- distclean-noinstPROGRAMS distclean-tags \ -- distclean-generic clean-am -- -rm -f libtool -+clean-am: clean-binPROGRAMS clean-generic clean-libtool \ -+ clean-noinstPROGRAMS clean-pkglibLIBRARIES mostlyclean-am - - distclean: distclean-am - --maintainer-clean-am: maintainer-clean-pkglibLIBRARIES \ -- maintainer-clean-compile maintainer-clean-libtool \ -- maintainer-clean-binPROGRAMS \ -- maintainer-clean-noinstPROGRAMS maintainer-clean-tags \ -- 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." -+distclean-am: clean-am distclean-binPROGRAMS distclean-compile \ -+ distclean-depend distclean-generic distclean-libtool \ -+ distclean-noinstPROGRAMS distclean-pkglibLIBRARIES \ -+ distclean-tags - - maintainer-clean: maintainer-clean-am - --.PHONY: mostlyclean-pkglibLIBRARIES distclean-pkglibLIBRARIES \ --clean-pkglibLIBRARIES maintainer-clean-pkglibLIBRARIES \ --uninstall-pkglibLIBRARIES install-pkglibLIBRARIES mostlyclean-compile \ --distclean-compile clean-compile maintainer-clean-compile \ --mostlyclean-libtool distclean-libtool clean-libtool \ --maintainer-clean-libtool mostlyclean-binPROGRAMS distclean-binPROGRAMS \ --clean-binPROGRAMS maintainer-clean-binPROGRAMS uninstall-binPROGRAMS \ --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 -+maintainer-clean-am: distclean-am maintainer-clean-binPROGRAMS \ -+ maintainer-clean-generic maintainer-clean-noinstPROGRAMS \ -+ maintainer-clean-pkglibLIBRARIES -+ -+mostlyclean: mostlyclean-am -+ -+mostlyclean-am: mostlyclean-binPROGRAMS mostlyclean-compile \ -+ mostlyclean-generic mostlyclean-libtool \ -+ mostlyclean-noinstPROGRAMS mostlyclean-pkglibLIBRARIES -+ -+.PHONY: check check-am clean clean-binPROGRAMS clean-generic \ -+ clean-libtool clean-noinstPROGRAMS clean-pkglibLIBRARIES \ -+ distclean distclean-binPROGRAMS distclean-compile \ -+ distclean-depend distclean-generic distclean-libtool \ -+ distclean-noinstPROGRAMS distclean-pkglibLIBRARIES \ -+ distclean-tags distdir dvi dvi-am info info-am install \ -+ install-am install-binPROGRAMS install-data install-data-am \ -+ install-exec install-exec-am install-pkglibLIBRARIES \ -+ install-strip installcheck installcheck-am installdirs \ -+ maintainer-clean maintainer-clean-binPROGRAMS \ -+ maintainer-clean-generic maintainer-clean-noinstPROGRAMS \ -+ maintainer-clean-pkglibLIBRARIES mostlyclean \ -+ mostlyclean-binPROGRAMS mostlyclean-compile mostlyclean-generic \ -+ mostlyclean-libtool mostlyclean-noinstPROGRAMS \ -+ mostlyclean-pkglibLIBRARIES tags uninstall uninstall-am \ -+ uninstall-binPROGRAMS uninstall-pkglibLIBRARIES - - - # Move to automake rules ? -diff -r -N -U3 mysql-3.23.32.orig/libmysql/Makefile.in mysql-3.23.32/libmysql/Makefile.in ---- mysql-3.23.32.orig/libmysql/Makefile.in Mon Jan 22 14:43:59 2001 -+++ mysql-3.23.32/libmysql/Makefile.in Thu Mar 1 17:01:00 2001 -@@ -1,6 +1,7 @@ --# Makefile.in generated automatically by automake 1.4 from Makefile.am -+# Makefile.in generated automatically by automake 1.4d from Makefile.am - --# Copyright (C) 1994, 1995-8, 1999 Free Software Foundation, Inc. -+# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001 -+# Free Software Foundation, Inc. - # This Makefile.in is free software; the Free Software Foundation - # gives unlimited permission to copy and/or distribute it, - # with or without modifications, as long as this notice is preserved. -@@ -10,27 +11,6 @@ - # even the implied warranty of MERCHANTABILITY or FITNESS FOR A - # PARTICULAR PURPOSE. - --# Copyright (C) 2000 MySQL AB & MySQL Finland AB & TCX DataKonsult AB --# --# This library is free software; you can redistribute it and/or --# modify it under the terms of the GNU Library General Public --# License as published by the Free Software Foundation; either --# version 2 of the License, or (at your option) any later version. --# --# This library is distributed in the hope that it will be useful, --# but WITHOUT ANY WARRANTY; without even the implied warranty of --# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU --# Library General Public License for more details. --# --# You should have received a copy of the GNU Library General Public --# License along with this library; if not, write to the Free --# Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, --# MA 02111-1307, USA -- --# This file is public domain and comes with NO WARRANTY of any kind -- -- -- - SHELL = @SHELL@ - - srcdir = @srcdir@ -@@ -52,8 +32,6 @@ - includedir = @includedir@ - oldincludedir = /usr/include - --DESTDIR = -- - pkgdatadir = $(datadir)/@PACKAGE@ - pkglibdir = $(libdir)/@PACKAGE@ - pkgincludedir = $(includedir)/@PACKAGE@ -@@ -66,9 +44,11 @@ - AUTOHEADER = @AUTOHEADER@ - - INSTALL = @INSTALL@ --INSTALL_PROGRAM = @INSTALL_PROGRAM@ $(AM_INSTALL_PROGRAM_FLAGS) -+INSTALL_PROGRAM = @INSTALL_PROGRAM@ - INSTALL_DATA = @INSTALL_DATA@ - INSTALL_SCRIPT = @INSTALL_SCRIPT@ -+INSTALL_STRIP_FLAG = -+INSTALL_HEADER = $(INSTALL_DATA) - transform = @program_transform_name@ - - NORMAL_INSTALL = : -@@ -77,6 +57,8 @@ - NORMAL_UNINSTALL = : - PRE_UNINSTALL = : - POST_UNINSTALL = : -+ -+@SET_MAKE@ - build_alias = @build_alias@ - build_triplet = @build@ - host_alias = @host_alias@ -@@ -84,6 +66,8 @@ - target_alias = @target_alias@ - target_triplet = @target@ - ALLOCA = @ALLOCA@ -+AMDEP = @AMDEP@ -+AMTAR = @AMTAR@ - AS = @AS@ - AVAILABLE_LANGUAGES = @AVAILABLE_LANGUAGES@ - AVAILABLE_LANGUAGES_ERRORS = @AVAILABLE_LANGUAGES_ERRORS@ -@@ -91,6 +75,7 @@ - CC = @CC@ - CFLAGS = @CFLAGS@ - CHARSETS_NEED_SOURCE = @CHARSETS_NEED_SOURCE@ -+CHARSET_OBJS = @CHARSET_OBJS@ - CHARSET_SRCS = @CHARSET_SRCS@ - CHECK_PID = @CHECK_PID@ - CHMOD = @CHMOD@ -@@ -104,6 +89,7 @@ - CXX = @CXX@ - CXXFLAGS = @CXXFLAGS@ - CXXLDFLAGS = @CXXLDFLAGS@ -+DEPDIR = @DEPDIR@ - DLLTOOL = @DLLTOOL@ - DOT_FRM_VERSION = @DOT_FRM_VERSION@ - FIND_PROC = @FIND_PROC@ -@@ -157,11 +143,13 @@ - VERSION = @VERSION@ - WRAPLIBS = @WRAPLIBS@ - YACC = @YACC@ -+_am_include = @_am_include@ - bdb_includes = @bdb_includes@ - bdb_libs = @bdb_libs@ - bench_dirs = @bench_dirs@ - default_charset = @default_charset@ - docs_dirs = @docs_dirs@ -+install_sh = @install_sh@ - linked_client_targets = @linked_client_targets@ - readline_dir = @readline_dir@ - readline_link = @readline_link@ -@@ -171,10 +159,32 @@ - thread_dirs = @thread_dirs@ - uname_prog = @uname_prog@ - -+# Copyright (C) 2000 MySQL AB & MySQL Finland AB & TCX DataKonsult AB -+# -+# This library is free software; you can redistribute it and/or -+# modify it under the terms of the GNU Library General Public -+# License as published by the Free Software Foundation; either -+# version 2 of the License, or (at your option) any later version. -+# -+# This library is distributed in the hope that it will be useful, -+# but WITHOUT ANY WARRANTY; without even the implied warranty of -+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -+# Library General Public License for more details. -+# -+# You should have received a copy of the GNU Library General Public -+# License along with this library; if not, write to the Free -+# Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, -+# MA 02111-1307, USA -+ -+# This file is public domain and comes with NO WARRANTY of any kind -+ -+ -+ - target = libmysqlclient.la - target_defs = -DUNDEF_THREADS_HACK - LIBS = @CLIENT_LIBS@ --INCLUDES = -I$(srcdir)/../include -I../include -I$(srcdir)/.. -I$(top_srcdir) -I.. -+INCLUDES = -I$(srcdir)/../include -I../include \ -+ -I$(srcdir)/.. -I$(top_srcdir) -I.. - - - MYSQLDATAdir = $(localstatedir) -@@ -189,24 +199,45 @@ - CHARSET_OBJS = @CHARSET_OBJS@ - LTCHARSET_OBJS = ${CHARSET_OBJS:.o=.lo} - --target_sources = libmysql.c net.c violite.c password.c get_password.c errmsg.c -+target_sources = libmysql.c net.c violite.c password.c \ -+ get_password.c errmsg.c - - --mystringsobjects = strmov.lo strxmov.lo strnmov.lo strmake.lo strend.lo strnlen.lo strfill.lo is_prefix.lo int2str.lo str2int.lo strinstr.lo strcont.lo strcend.lo bchange.lo bmove.lo bmove_upp.lo longlong2str.lo strtoull.lo strtoll.lo llstr.lo ctype.lo $(LTCHARSET_OBJS) -+mystringsobjects = strmov.lo strxmov.lo strnmov.lo strmake.lo strend.lo \ -+ strnlen.lo strfill.lo is_prefix.lo \ -+ int2str.lo str2int.lo strinstr.lo strcont.lo \ -+ strcend.lo \ -+ bchange.lo bmove.lo bmove_upp.lo longlong2str.lo \ -+ strtoull.lo strtoll.lo llstr.lo \ -+ ctype.lo $(LTCHARSET_OBJS) - - mystringsextra = strto.c ctype_autoconf.c - dbugobjects = dbug.lo # IT IS IN SAFEMALLOC.C sanity.lo - mysysheaders = mysys_priv.h my_static.h --mysysobjects1 = my_init.lo my_static.lo my_malloc.lo my_realloc.lo my_create.lo my_delete.lo mf_tempfile.lo my_open.lo mf_casecnv.lo my_read.lo my_write.lo errors.lo my_error.lo my_getwd.lo my_div.lo mf_pack.lo my_messnc.lo mf_dirname.lo mf_fn_ext.lo mf_wcomp.lo typelib.lo safemalloc.lo my_alloc.lo mf_format.lo mf_path.lo mf_unixpath.lo my_fopen.lo my_fstream.lo mf_loadpath.lo my_pthread.lo my_thr_init.lo thr_mutex.lo mulalloc.lo string.lo default.lo my_compress.lo array.lo my_once.lo list.lo my_net.lo charset.lo hash.lo -+mysysobjects1 = my_init.lo my_static.lo my_malloc.lo my_realloc.lo \ -+ my_create.lo my_delete.lo mf_tempfile.lo my_open.lo \ -+ mf_casecnv.lo my_read.lo my_write.lo errors.lo \ -+ my_error.lo my_getwd.lo my_div.lo \ -+ mf_pack.lo my_messnc.lo mf_dirname.lo mf_fn_ext.lo\ -+ mf_wcomp.lo typelib.lo safemalloc.lo my_alloc.lo \ -+ mf_format.lo mf_path.lo mf_unixpath.lo my_fopen.lo \ -+ my_fstream.lo \ -+ mf_loadpath.lo my_pthread.lo my_thr_init.lo \ -+ thr_mutex.lo mulalloc.lo string.lo default.lo \ -+ my_compress.lo array.lo my_once.lo list.lo my_net.lo \ -+ charset.lo hash.lo - - # Not needed in the minimum library - mysysobjects2 = getopt.lo getopt1.lo getvar.lo my_lib.lo - mysysobjects = $(mysysobjects1) $(mysysobjects2) - target_libadd = $(mysysobjects) $(mystringsobjects) $(dbugobjects) - target_ldflags = -version-info @SHARED_LIB_VERSION@ --CLEANFILES = $(target_libadd) $(SHLIBOBJS) $(target) -+CLEANFILES = $(target_libadd) $(SHLIBOBJS) \ -+ $(target) - --DEFS = -DDEFAULT_CHARSET_HOME="\"$(MYSQLBASEdir)\"" -DDATADIR="\"$(MYSQLDATAdir)\"" -DSHAREDIR="\"$(MYSQLSHAREdir)\"" $(target_defs) -+DEFS = -DDEFAULT_CHARSET_HOME="\"$(MYSQLBASEdir)\"" \ -+ -DDATADIR="\"$(MYSQLDATAdir)\"" \ -+ -DSHAREDIR="\"$(MYSQLSHAREdir)\"" $(target_defs) - - conf_to_src_SOURCES = conf_to_src.c - conf_to_src_LDADD = -@@ -225,10 +256,15 @@ - # keep only the stubs for safemalloc.c and debug.c - # - # A list of needed headers collected from the deps information 000213 --nh = global.h config-win32.h dbug.h errmsg.h global.h m_ctype.h m_string.h my_alarm.h my_config.h my_dir.h my_list.h my_net.h my_sys.h mysql.h mysql_com.h mysql_version.h mysqld_error.h mysys_err.h my_pthread.h thr_alarm.h violite.h hash.h -+nh = global.h config-win32.h dbug.h errmsg.h global.h \ -+ m_ctype.h m_string.h \ -+ my_alarm.h my_config.h my_dir.h my_list.h my_net.h my_sys.h \ -+ mysql.h mysql_com.h mysql_version.h mysqld_error.h mysys_err.h \ -+ my_pthread.h thr_alarm.h violite.h hash.h - - # Get a list of the needed objects - lobjs = $(mysysobjects1) $(dbugobjects) $(mystringsobjects) -+subdir = libmysql - mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs - CONFIG_HEADER = ../config.h - CONFIG_CLEAN_FILES = -@@ -249,36 +285,42 @@ - is_prefix.lo int2str.lo str2int.lo strinstr.lo strcont.lo strcend.lo \ - bchange.lo bmove.lo bmove_upp.lo longlong2str.lo strtoull.lo strtoll.lo \ - llstr.lo ctype.lo dbug.lo --libmysqlclient_la_OBJECTS = libmysql.lo net.lo violite.lo password.lo \ --get_password.lo errmsg.lo -+am_libmysqlclient_la_OBJECTS = libmysql.lo net.lo violite.lo \ -+password.lo get_password.lo errmsg.lo -+libmysqlclient_la_OBJECTS = $(am_libmysqlclient_la_OBJECTS) - PROGRAMS = $(noinst_PROGRAMS) - --conf_to_src_OBJECTS = conf_to_src.o -+am_conf_to_src_OBJECTS = conf_to_src.o -+conf_to_src_OBJECTS = $(am_conf_to_src_OBJECTS) - conf_to_src_DEPENDENCIES = - conf_to_src_LDFLAGS = - COMPILE = $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) - LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) - CCLD = $(CC) --LINK = $(LIBTOOL) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(LDFLAGS) -o $@ -+LINK = $(LIBTOOL) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@ -+DIST_SOURCES = $(libmysqlclient_la_SOURCES) $(conf_to_src_SOURCES) -+depcomp = $(SHELL) $(top_srcdir)/depcomp -+@AMDEP@DEP_FILES = $(DEPDIR)/conf_to_src.Po $(DEPDIR)/errmsg.Plo \ -+@AMDEP@$(DEPDIR)/get_password.Plo $(DEPDIR)/libmysql.Plo \ -+@AMDEP@$(DEPDIR)/net.Plo $(DEPDIR)/password.Plo $(DEPDIR)/violite.Plo - DIST_COMMON = Makefile.am Makefile.in acinclude.m4 configure.in - - --DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST) -+DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) - --TAR = gtar - GZIP_ENV = --best - SOURCES = $(libmysqlclient_la_SOURCES) $(conf_to_src_SOURCES) --OBJECTS = $(libmysqlclient_la_OBJECTS) $(conf_to_src_OBJECTS) -+OBJECTS = $(am_libmysqlclient_la_OBJECTS) $(am_conf_to_src_OBJECTS) - --all: all-redirect -+all: all-am - .SUFFIXES: --.SUFFIXES: .S .c .lo .o .s -+.SUFFIXES: .c .lo .o - $(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 - cd $(top_builddir) \ -- && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status -+ && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= CONFIG_LINKS= $(SHELL) ./config.status - - - mostlyclean-pkglibLTLIBRARIES: -@@ -295,45 +337,24 @@ - $(mkinstalldirs) $(DESTDIR)$(pkglibdir) - @list='$(pkglib_LTLIBRARIES)'; for p in $$list; do \ - if test -f $$p; then \ -- echo "$(LIBTOOL) --mode=install $(INSTALL) $$p $(DESTDIR)$(pkglibdir)/$$p"; \ -- $(LIBTOOL) --mode=install $(INSTALL) $$p $(DESTDIR)$(pkglibdir)/$$p; \ -+ echo " $(LIBTOOL) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$p $(DESTDIR)$(pkglibdir)/$$p"; \ -+ $(LIBTOOL) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$p $(DESTDIR)$(pkglibdir)/$$p; \ - else :; fi; \ - done - - uninstall-pkglibLTLIBRARIES: - @$(NORMAL_UNINSTALL) -- list='$(pkglib_LTLIBRARIES)'; for p in $$list; do \ -+ @list='$(pkglib_LTLIBRARIES)'; for p in $$list; do \ -+ echo " $(LIBTOOL) --mode=uninstall rm -f $(DESTDIR)$(pkglibdir)/$$p"; \ - $(LIBTOOL) --mode=uninstall rm -f $(DESTDIR)$(pkglibdir)/$$p; \ - done - --.c.o: -- $(COMPILE) -c $< -- --.s.o: -- $(COMPILE) -c $< -- --.S.o: -- $(COMPILE) -c $< -- - mostlyclean-compile: - -rm -f *.o core *.core - --clean-compile: -- - distclean-compile: - -rm -f *.tab.c - --maintainer-clean-compile: -- --.c.lo: -- $(LIBTOOL) --mode=compile $(COMPILE) -c $< -- --.s.lo: -- $(LIBTOOL) --mode=compile $(COMPILE) -c $< -- --.S.lo: -- $(LIBTOOL) --mode=compile $(COMPILE) -c $< -- - mostlyclean-libtool: - -rm -f *.lo - -@@ -341,8 +362,7 @@ - -rm -rf .libs _libs - - distclean-libtool: -- --maintainer-clean-libtool: -+ -rm -f libtool - - libmysqlclient.la: $(libmysqlclient_la_OBJECTS) $(libmysqlclient_la_DEPENDENCIES) - $(LINK) -rpath $(pkglibdir) $(libmysqlclient_la_LDFLAGS) $(libmysqlclient_la_OBJECTS) $(libmysqlclient_la_LIBADD) $(LIBS) -@@ -362,320 +382,77 @@ - - tags: TAGS - --ID: $(HEADERS) $(SOURCES) $(LISP) -- list='$(SOURCES) $(HEADERS)'; \ -- unique=`for i in $$list; do echo $$i; done | \ -- awk ' { files[$$0] = 1; } \ -+ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) -+ list='$(SOURCES) $(HEADERS) $(TAGS_FILES)'; \ -+ unique=`for i in $$list; do \ -+ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ -+ done | \ -+ $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ -- here=`pwd` && cd $(srcdir) \ -- && mkid -f$$here/ID $$unique $(LISP) -+ mkid -fID $$unique $(LISP) - --TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) $(LISP) -+TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ -+ $(TAGS_FILES) $(LISP) - tags=; \ - here=`pwd`; \ -- list='$(SOURCES) $(HEADERS)'; \ -- unique=`for i in $$list; do echo $$i; done | \ -- awk ' { files[$$0] = 1; } \ -+ list='$(SOURCES) $(HEADERS) $(TAGS_FILES)'; \ -+ unique=`for i in $$list; do \ -+ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ -+ done | \ -+ $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ - test -z "$(ETAGS_ARGS)$$unique$(LISP)$$tags" \ -- || (cd $(srcdir) && etags $(ETAGS_ARGS) $$tags $$unique $(LISP) -o $$here/TAGS) -- --mostlyclean-tags: -+ || etags $(ETAGS_ARGS) $$tags $$unique $(LISP) - --clean-tags: -+GTAGS: -+ here=`CDPATH=: && cd $(top_builddir) && pwd` \ -+ && cd $(top_srcdir) \ -+ && gtags -i $$here - - distclean-tags: - -rm -f TAGS ID - --maintainer-clean-tags: -+@AMDEP@@_am_include@ $(DEPDIR)/conf_to_src.Po -+@AMDEP@@_am_include@ $(DEPDIR)/errmsg.Plo -+@AMDEP@@_am_include@ $(DEPDIR)/get_password.Plo -+@AMDEP@@_am_include@ $(DEPDIR)/libmysql.Plo -+@AMDEP@@_am_include@ $(DEPDIR)/net.Plo -+@AMDEP@@_am_include@ $(DEPDIR)/password.Plo -+@AMDEP@@_am_include@ $(DEPDIR)/violite.Plo -+ -+distclean-depend: -+ -rm -rf $(DEPDIR) -+ -+@AMDEP@CCDEPMODE = @CCDEPMODE@ -+ -+.c.o: -+@AMDEP@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ -+@AMDEP@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@ -+@AMDEP@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -+ $(COMPILE) -c -o $@ `test -f $< || echo '$(srcdir)/'`$< -+ -+.c.lo: -+@AMDEP@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ -+@AMDEP@ depfile='$(DEPDIR)/$*.Plo' tmpdepfile='$(DEPDIR)/$*.TPlo' @AMDEPBACKSLASH@ -+@AMDEP@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -+ $(LTCOMPILE) -c -o $@ `test -f $< || echo '$(srcdir)/'`$< -+ - - distdir = $(top_builddir)/$(PACKAGE)-$(VERSION)/$(subdir) - --subdir = libmysql - - distdir: $(DISTFILES) - @for file in $(DISTFILES); do \ - d=$(srcdir); \ - if test -d $$d/$$file; then \ -- cp -pr $$d/$$file $(distdir)/$$file; \ -+ cp -pR $$d/$$file $(distdir) \ -+ || exit 1; \ - else \ - test -f $(distdir)/$$file \ -- || ln $$d/$$file $(distdir)/$$file 2> /dev/null \ -- || cp -p $$d/$$file $(distdir)/$$file || :; \ -+ || cp -p $$d/$$file $(distdir)/$$file \ -+ || exit 1; \ - 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 -- - info-am: - info: info-am - dvi-am: -@@ -696,9 +473,8 @@ - uninstall-am: uninstall-pkglibLTLIBRARIES - uninstall: uninstall-am - all-am: Makefile $(LTLIBRARIES) $(PROGRAMS) --all-redirect: all-am - install-strip: -- $(MAKE) $(AM_MAKEFLAGS) AM_INSTALL_PROGRAM_FLAGS=-s install -+ $(MAKE) $(AM_MAKEFLAGS) INSTALL_STRIP_FLAG=-s install - installdirs: - $(mkinstalldirs) $(DESTDIR)$(pkglibdir) - -@@ -713,48 +489,46 @@ - -rm -f config.cache config.log stamp-h stamp-h[0-9]* - - maintainer-clean-generic: --mostlyclean-am: mostlyclean-pkglibLTLIBRARIES mostlyclean-compile \ -- mostlyclean-libtool mostlyclean-noinstPROGRAMS \ -- mostlyclean-tags mostlyclean-generic -- --mostlyclean: mostlyclean-am -- --clean-am: clean-pkglibLTLIBRARIES clean-compile clean-libtool \ -- clean-noinstPROGRAMS clean-tags clean-generic \ -- mostlyclean-am clean-local -- -+ @echo "This command is intended for maintainers to use" -+ @echo "it deletes files that may require special tools to rebuild." -+ -rm -f Makefile.in - clean: clean-am - --distclean-am: distclean-pkglibLTLIBRARIES distclean-compile \ -- distclean-libtool distclean-noinstPROGRAMS \ -- distclean-tags distclean-generic clean-am -- -rm -f libtool -+clean-am: clean-generic clean-libtool clean-local clean-noinstPROGRAMS \ -+ clean-pkglibLTLIBRARIES mostlyclean-am - - distclean: distclean-am - --maintainer-clean-am: maintainer-clean-pkglibLTLIBRARIES \ -- maintainer-clean-compile maintainer-clean-libtool \ -- maintainer-clean-noinstPROGRAMS maintainer-clean-tags \ -- 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." -+distclean-am: clean-am distclean-compile distclean-depend \ -+ distclean-generic distclean-libtool distclean-noinstPROGRAMS \ -+ distclean-pkglibLTLIBRARIES distclean-tags - - maintainer-clean: maintainer-clean-am - --.PHONY: mostlyclean-pkglibLTLIBRARIES distclean-pkglibLTLIBRARIES \ --clean-pkglibLTLIBRARIES maintainer-clean-pkglibLTLIBRARIES \ --uninstall-pkglibLTLIBRARIES install-pkglibLTLIBRARIES \ --mostlyclean-compile distclean-compile clean-compile \ --maintainer-clean-compile mostlyclean-libtool distclean-libtool \ --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 -+maintainer-clean-am: distclean-am maintainer-clean-generic \ -+ maintainer-clean-noinstPROGRAMS \ -+ maintainer-clean-pkglibLTLIBRARIES -+ -+mostlyclean: mostlyclean-am -+ -+mostlyclean-am: mostlyclean-compile mostlyclean-generic \ -+ mostlyclean-libtool mostlyclean-noinstPROGRAMS \ -+ mostlyclean-pkglibLTLIBRARIES -+ -+.PHONY: check check-am clean clean-generic clean-libtool \ -+ clean-noinstPROGRAMS clean-pkglibLTLIBRARIES distclean \ -+ distclean-compile distclean-depend distclean-generic \ -+ distclean-libtool distclean-noinstPROGRAMS \ -+ distclean-pkglibLTLIBRARIES distclean-tags distdir dvi dvi-am \ -+ info info-am install install-am install-data install-data-am \ -+ install-exec install-exec-am install-pkglibLTLIBRARIES \ -+ install-strip installcheck installcheck-am installdirs \ -+ maintainer-clean maintainer-clean-generic \ -+ maintainer-clean-noinstPROGRAMS \ -+ maintainer-clean-pkglibLTLIBRARIES mostlyclean \ -+ mostlyclean-compile mostlyclean-generic mostlyclean-libtool \ -+ mostlyclean-noinstPROGRAMS mostlyclean-pkglibLTLIBRARIES tags \ -+ uninstall uninstall-am uninstall-pkglibLTLIBRARIES - - - # The automatic dependencies miss this -diff -r -N -U3 mysql-3.23.32.orig/libmysql_r/Makefile.in mysql-3.23.32/libmysql_r/Makefile.in ---- mysql-3.23.32.orig/libmysql_r/Makefile.in Mon Jan 22 14:43:58 2001 -+++ mysql-3.23.32/libmysql_r/Makefile.in Thu Mar 1 17:00:59 2001 -@@ -1,6 +1,7 @@ --# Makefile.in generated automatically by automake 1.4 from Makefile.am -+# Makefile.in generated automatically by automake 1.4d from Makefile.am - --# Copyright (C) 1994, 1995-8, 1999 Free Software Foundation, Inc. -+# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001 -+# Free Software Foundation, Inc. - # This Makefile.in is free software; the Free Software Foundation - # gives unlimited permission to copy and/or distribute it, - # with or without modifications, as long as this notice is preserved. -@@ -10,25 +11,6 @@ - # even the implied warranty of MERCHANTABILITY or FITNESS FOR A - # PARTICULAR PURPOSE. - --# Copyright (C) 2000 MySQL AB & MySQL Finland AB & TCX DataKonsult AB --# --# This library is free software; you can redistribute it and/or --# modify it under the terms of the GNU Library General Public --# License as published by the Free Software Foundation; either --# version 2 of the License, or (at your option) any later version. --# --# This library is distributed in the hope that it will be useful, --# but WITHOUT ANY WARRANTY; without even the implied warranty of --# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU --# Library General Public License for more details. --# --# You should have received a copy of the GNU Library General Public --# License along with this library; if not, write to the Free --# Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, --# MA 02111-1307, USA -- -- -- - SHELL = @SHELL@ - - srcdir = @srcdir@ -@@ -50,8 +32,6 @@ - includedir = @includedir@ - oldincludedir = /usr/include - --DESTDIR = -- - pkgdatadir = $(datadir)/@PACKAGE@ - pkglibdir = $(libdir)/@PACKAGE@ - pkgincludedir = $(includedir)/@PACKAGE@ -@@ -64,9 +44,11 @@ - AUTOHEADER = @AUTOHEADER@ - - INSTALL = @INSTALL@ --INSTALL_PROGRAM = @INSTALL_PROGRAM@ $(AM_INSTALL_PROGRAM_FLAGS) -+INSTALL_PROGRAM = @INSTALL_PROGRAM@ - INSTALL_DATA = @INSTALL_DATA@ - INSTALL_SCRIPT = @INSTALL_SCRIPT@ -+INSTALL_STRIP_FLAG = -+INSTALL_HEADER = $(INSTALL_DATA) - transform = @program_transform_name@ - - NORMAL_INSTALL = : -@@ -75,6 +57,8 @@ - NORMAL_UNINSTALL = : - PRE_UNINSTALL = : - POST_UNINSTALL = : -+ -+@SET_MAKE@ - build_alias = @build_alias@ - build_triplet = @build@ - host_alias = @host_alias@ -@@ -82,6 +66,8 @@ - target_alias = @target_alias@ - target_triplet = @target@ - ALLOCA = @ALLOCA@ -+AMDEP = @AMDEP@ -+AMTAR = @AMTAR@ - AS = @AS@ - AVAILABLE_LANGUAGES = @AVAILABLE_LANGUAGES@ - AVAILABLE_LANGUAGES_ERRORS = @AVAILABLE_LANGUAGES_ERRORS@ -@@ -89,6 +75,7 @@ - CC = @CC@ - CFLAGS = @CFLAGS@ - CHARSETS_NEED_SOURCE = @CHARSETS_NEED_SOURCE@ -+CHARSET_OBJS = @CHARSET_OBJS@ - CHARSET_SRCS = @CHARSET_SRCS@ - CHECK_PID = @CHECK_PID@ - CHMOD = @CHMOD@ -@@ -102,6 +89,7 @@ - CXX = @CXX@ - CXXFLAGS = @CXXFLAGS@ - CXXLDFLAGS = @CXXLDFLAGS@ -+DEPDIR = @DEPDIR@ - DLLTOOL = @DLLTOOL@ - DOT_FRM_VERSION = @DOT_FRM_VERSION@ - FIND_PROC = @FIND_PROC@ -@@ -155,11 +143,13 @@ - VERSION = @VERSION@ - WRAPLIBS = @WRAPLIBS@ - YACC = @YACC@ -+_am_include = @_am_include@ - bdb_includes = @bdb_includes@ - bdb_libs = @bdb_libs@ - bench_dirs = @bench_dirs@ - default_charset = @default_charset@ - docs_dirs = @docs_dirs@ -+install_sh = @install_sh@ - linked_client_targets = @linked_client_targets@ - readline_dir = @readline_dir@ - readline_link = @readline_link@ -@@ -169,10 +159,30 @@ - thread_dirs = @thread_dirs@ - uname_prog = @uname_prog@ - -+# Copyright (C) 2000 MySQL AB & MySQL Finland AB & TCX DataKonsult AB -+# -+# This library is free software; you can redistribute it and/or -+# modify it under the terms of the GNU Library General Public -+# License as published by the Free Software Foundation; either -+# version 2 of the License, or (at your option) any later version. -+# -+# This library is distributed in the hope that it will be useful, -+# but WITHOUT ANY WARRANTY; without even the implied warranty of -+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -+# Library General Public License for more details. -+# -+# You should have received a copy of the GNU Library General Public -+# License along with this library; if not, write to the Free -+# Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, -+# MA 02111-1307, USA -+ -+ -+ - target = libmysqlclient_r.la - target_defs = - --INCLUDES = @MT_INCLUDES@ -I$(srcdir)/../include -I../include -I$(srcdir)/.. -I$(top_srcdir) -I.. -+INCLUDES = @MT_INCLUDES@ -I$(srcdir)/../include -I../include \ -+ -I$(srcdir)/.. -I$(top_srcdir) -I.. - - - MYSQLDATAdir = $(localstatedir) -@@ -187,30 +197,59 @@ - CHARSET_OBJS = @CHARSET_OBJS@ - LTCHARSET_OBJS = ${CHARSET_OBJS:.o=.lo} - --target_sources = libmysql.c net.c violite.c password.c get_password.c errmsg.c -+target_sources = libmysql.c net.c violite.c password.c \ -+ get_password.c errmsg.c - - --mystringsobjects = strmov.lo strxmov.lo strnmov.lo strmake.lo strend.lo strnlen.lo strfill.lo is_prefix.lo int2str.lo str2int.lo strinstr.lo strcont.lo strcend.lo bchange.lo bmove.lo bmove_upp.lo longlong2str.lo strtoull.lo strtoll.lo llstr.lo ctype.lo $(LTCHARSET_OBJS) -+mystringsobjects = strmov.lo strxmov.lo strnmov.lo strmake.lo strend.lo \ -+ strnlen.lo strfill.lo is_prefix.lo \ -+ int2str.lo str2int.lo strinstr.lo strcont.lo \ -+ strcend.lo \ -+ bchange.lo bmove.lo bmove_upp.lo longlong2str.lo \ -+ strtoull.lo strtoll.lo llstr.lo \ -+ ctype.lo $(LTCHARSET_OBJS) - - mystringsextra = strto.c ctype_autoconf.c - dbugobjects = dbug.lo # IT IS IN SAFEMALLOC.C sanity.lo - mysysheaders = mysys_priv.h my_static.h --mysysobjects1 = my_init.lo my_static.lo my_malloc.lo my_realloc.lo my_create.lo my_delete.lo mf_tempfile.lo my_open.lo mf_casecnv.lo my_read.lo my_write.lo errors.lo my_error.lo my_getwd.lo my_div.lo mf_pack.lo my_messnc.lo mf_dirname.lo mf_fn_ext.lo mf_wcomp.lo typelib.lo safemalloc.lo my_alloc.lo mf_format.lo mf_path.lo mf_unixpath.lo my_fopen.lo my_fstream.lo mf_loadpath.lo my_pthread.lo my_thr_init.lo thr_mutex.lo mulalloc.lo string.lo default.lo my_compress.lo array.lo my_once.lo list.lo my_net.lo charset.lo hash.lo -+mysysobjects1 = my_init.lo my_static.lo my_malloc.lo my_realloc.lo \ -+ my_create.lo my_delete.lo mf_tempfile.lo my_open.lo \ -+ mf_casecnv.lo my_read.lo my_write.lo errors.lo \ -+ my_error.lo my_getwd.lo my_div.lo \ -+ mf_pack.lo my_messnc.lo mf_dirname.lo mf_fn_ext.lo\ -+ mf_wcomp.lo typelib.lo safemalloc.lo my_alloc.lo \ -+ mf_format.lo mf_path.lo mf_unixpath.lo my_fopen.lo \ -+ my_fstream.lo \ -+ mf_loadpath.lo my_pthread.lo my_thr_init.lo \ -+ thr_mutex.lo mulalloc.lo string.lo default.lo \ -+ my_compress.lo array.lo my_once.lo list.lo my_net.lo \ -+ charset.lo hash.lo - - # Not needed in the minimum library - mysysobjects2 = getopt.lo getopt1.lo getvar.lo my_lib.lo - mysysobjects = $(mysysobjects1) $(mysysobjects2) - target_libadd = $(mysysobjects) $(mystringsobjects) $(dbugobjects) - target_ldflags = -version-info @SHARED_LIB_VERSION@ --CLEANFILES = $(target_libadd) $(SHLIBOBJS) $(target) -+CLEANFILES = $(target_libadd) $(SHLIBOBJS) \ -+ $(target) - --DEFS = -DDEFAULT_CHARSET_HOME="\"$(MYSQLBASEdir)\"" -DDATADIR="\"$(MYSQLDATAdir)\"" -DSHAREDIR="\"$(MYSQLSHAREdir)\"" $(target_defs) -+DEFS = -DDEFAULT_CHARSET_HOME="\"$(MYSQLBASEdir)\"" \ -+ -DDATADIR="\"$(MYSQLDATAdir)\"" \ -+ -DSHAREDIR="\"$(MYSQLSHAREdir)\"" $(target_defs) - - conf_to_src_SOURCES = conf_to_src.c - conf_to_src_LDADD = - - # Don't depend on files in pthread library --OMIT_DEPENDENCIES = pthread.h stdio.h __stdio.h stdlib.h __stdlib.h math.h __math.h time.h __time.h unistd.h __unistd.h types.h xtypes.h ac-types.h posix.h string.h __string.h errno.h socket.h inet.h dirent.h netdb.h cleanup.h cond.h debug_out.h fd.h kernel.h mutex.h prio_queue.h pthread_attr.h pthread_once.h queue.h sleep.h specific.h version.h pwd.h timers.h uio.h cdefs.h machdep.h signal.h __signal.h util.h lex.h wait.h -+OMIT_DEPENDENCIES = pthread.h stdio.h __stdio.h stdlib.h __stdlib.h math.h\ -+ __math.h time.h __time.h unistd.h __unistd.h types.h \ -+ xtypes.h ac-types.h posix.h string.h __string.h \ -+ errno.h socket.h inet.h dirent.h netdb.h \ -+ cleanup.h cond.h debug_out.h fd.h kernel.h mutex.h \ -+ prio_queue.h pthread_attr.h pthread_once.h queue.h\ -+ sleep.h specific.h version.h pwd.h timers.h uio.h \ -+ cdefs.h machdep.h signal.h __signal.h util.h lex.h \ -+ wait.h - - - libmysql_dir = $(top_srcdir)/libmysql -@@ -218,6 +257,7 @@ - libmysqlclient_r_la_SOURCES = $(target_sources) - libmysqlclient_r_la_LIBADD = $(target_libadd) - libmysqlclient_r_la_LDFLAGS = $(target_ldflags) -+subdir = libmysql_r - mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs - CONFIG_HEADER = ../config.h - CONFIG_CLEAN_FILES = -@@ -239,36 +279,42 @@ - is_prefix.lo int2str.lo str2int.lo strinstr.lo strcont.lo strcend.lo \ - bchange.lo bmove.lo bmove_upp.lo longlong2str.lo strtoull.lo strtoll.lo \ - llstr.lo ctype.lo dbug.lo --libmysqlclient_r_la_OBJECTS = libmysql.lo net.lo violite.lo password.lo \ --get_password.lo errmsg.lo -+am_libmysqlclient_r_la_OBJECTS = libmysql.lo net.lo violite.lo \ -+password.lo get_password.lo errmsg.lo -+libmysqlclient_r_la_OBJECTS = $(am_libmysqlclient_r_la_OBJECTS) - PROGRAMS = $(noinst_PROGRAMS) - --conf_to_src_OBJECTS = conf_to_src.o -+am_conf_to_src_OBJECTS = conf_to_src.o -+conf_to_src_OBJECTS = $(am_conf_to_src_OBJECTS) - conf_to_src_DEPENDENCIES = - conf_to_src_LDFLAGS = - COMPILE = $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) - LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) - CCLD = $(CC) --LINK = $(LIBTOOL) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(LDFLAGS) -o $@ -+LINK = $(LIBTOOL) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@ -+DIST_SOURCES = $(libmysqlclient_r_la_SOURCES) $(conf_to_src_SOURCES) -+depcomp = $(SHELL) $(top_srcdir)/depcomp -+@AMDEP@DEP_FILES = $(DEPDIR)/conf_to_src.Po $(DEPDIR)/errmsg.Plo \ -+@AMDEP@$(DEPDIR)/get_password.Plo $(DEPDIR)/libmysql.Plo \ -+@AMDEP@$(DEPDIR)/net.Plo $(DEPDIR)/password.Plo $(DEPDIR)/violite.Plo - DIST_COMMON = Makefile.am Makefile.in - - --DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST) -+DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) - --TAR = gtar - GZIP_ENV = --best - SOURCES = $(libmysqlclient_r_la_SOURCES) $(conf_to_src_SOURCES) --OBJECTS = $(libmysqlclient_r_la_OBJECTS) $(conf_to_src_OBJECTS) -+OBJECTS = $(am_libmysqlclient_r_la_OBJECTS) $(am_conf_to_src_OBJECTS) - --all: all-redirect -+all: all-am - .SUFFIXES: --.SUFFIXES: .S .c .lo .o .s -+.SUFFIXES: .c .lo .o - $(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 - cd $(top_builddir) \ -- && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status -+ && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= CONFIG_LINKS= $(SHELL) ./config.status - - - mostlyclean-pkglibLTLIBRARIES: -@@ -285,45 +331,24 @@ - $(mkinstalldirs) $(DESTDIR)$(pkglibdir) - @list='$(pkglib_LTLIBRARIES)'; for p in $$list; do \ - if test -f $$p; then \ -- echo "$(LIBTOOL) --mode=install $(INSTALL) $$p $(DESTDIR)$(pkglibdir)/$$p"; \ -- $(LIBTOOL) --mode=install $(INSTALL) $$p $(DESTDIR)$(pkglibdir)/$$p; \ -+ echo " $(LIBTOOL) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$p $(DESTDIR)$(pkglibdir)/$$p"; \ -+ $(LIBTOOL) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$p $(DESTDIR)$(pkglibdir)/$$p; \ - else :; fi; \ - done - - uninstall-pkglibLTLIBRARIES: - @$(NORMAL_UNINSTALL) -- list='$(pkglib_LTLIBRARIES)'; for p in $$list; do \ -+ @list='$(pkglib_LTLIBRARIES)'; for p in $$list; do \ -+ echo " $(LIBTOOL) --mode=uninstall rm -f $(DESTDIR)$(pkglibdir)/$$p"; \ - $(LIBTOOL) --mode=uninstall rm -f $(DESTDIR)$(pkglibdir)/$$p; \ - done - --.c.o: -- $(COMPILE) -c $< -- --.s.o: -- $(COMPILE) -c $< -- --.S.o: -- $(COMPILE) -c $< -- - mostlyclean-compile: - -rm -f *.o core *.core - --clean-compile: -- - distclean-compile: - -rm -f *.tab.c - --maintainer-clean-compile: -- --.c.lo: -- $(LIBTOOL) --mode=compile $(COMPILE) -c $< -- --.s.lo: -- $(LIBTOOL) --mode=compile $(COMPILE) -c $< -- --.S.lo: -- $(LIBTOOL) --mode=compile $(COMPILE) -c $< -- - mostlyclean-libtool: - -rm -f *.lo - -@@ -331,8 +356,7 @@ - -rm -rf .libs _libs - - distclean-libtool: -- --maintainer-clean-libtool: -+ -rm -f libtool - - libmysqlclient_r.la: $(libmysqlclient_r_la_OBJECTS) $(libmysqlclient_r_la_DEPENDENCIES) - $(LINK) -rpath $(pkglibdir) $(libmysqlclient_r_la_LDFLAGS) $(libmysqlclient_r_la_OBJECTS) $(libmysqlclient_r_la_LIBADD) $(LIBS) -@@ -352,522 +376,77 @@ - - tags: TAGS - --ID: $(HEADERS) $(SOURCES) $(LISP) -- list='$(SOURCES) $(HEADERS)'; \ -- unique=`for i in $$list; do echo $$i; done | \ -- awk ' { files[$$0] = 1; } \ -+ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) -+ list='$(SOURCES) $(HEADERS) $(TAGS_FILES)'; \ -+ unique=`for i in $$list; do \ -+ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ -+ done | \ -+ $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ -- here=`pwd` && cd $(srcdir) \ -- && mkid -f$$here/ID $$unique $(LISP) -+ mkid -fID $$unique $(LISP) - --TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) $(LISP) -+TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ -+ $(TAGS_FILES) $(LISP) - tags=; \ - here=`pwd`; \ -- list='$(SOURCES) $(HEADERS)'; \ -- unique=`for i in $$list; do echo $$i; done | \ -- awk ' { files[$$0] = 1; } \ -+ list='$(SOURCES) $(HEADERS) $(TAGS_FILES)'; \ -+ unique=`for i in $$list; do \ -+ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ -+ done | \ -+ $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ - test -z "$(ETAGS_ARGS)$$unique$(LISP)$$tags" \ -- || (cd $(srcdir) && etags $(ETAGS_ARGS) $$tags $$unique $(LISP) -o $$here/TAGS) -+ || etags $(ETAGS_ARGS) $$tags $$unique $(LISP) - --mostlyclean-tags: -- --clean-tags: -+GTAGS: -+ here=`CDPATH=: && cd $(top_builddir) && pwd` \ -+ && cd $(top_srcdir) \ -+ && gtags -i $$here - - distclean-tags: - -rm -f TAGS ID - --maintainer-clean-tags: -+@AMDEP@@_am_include@ $(DEPDIR)/conf_to_src.Po -+@AMDEP@@_am_include@ $(DEPDIR)/errmsg.Plo -+@AMDEP@@_am_include@ $(DEPDIR)/get_password.Plo -+@AMDEP@@_am_include@ $(DEPDIR)/libmysql.Plo -+@AMDEP@@_am_include@ $(DEPDIR)/net.Plo -+@AMDEP@@_am_include@ $(DEPDIR)/password.Plo -+@AMDEP@@_am_include@ $(DEPDIR)/violite.Plo -+ -+distclean-depend: -+ -rm -rf $(DEPDIR) -+ -+@AMDEP@CCDEPMODE = @CCDEPMODE@ -+ -+.c.o: -+@AMDEP@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ -+@AMDEP@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@ -+@AMDEP@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -+ $(COMPILE) -c -o $@ `test -f $< || echo '$(srcdir)/'`$< -+ -+.c.lo: -+@AMDEP@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ -+@AMDEP@ depfile='$(DEPDIR)/$*.Plo' tmpdepfile='$(DEPDIR)/$*.TPlo' @AMDEPBACKSLASH@ -+@AMDEP@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -+ $(LTCOMPILE) -c -o $@ `test -f $< || echo '$(srcdir)/'`$< -+ - - distdir = $(top_builddir)/$(PACKAGE)-$(VERSION)/$(subdir) - --subdir = libmysql_r - - distdir: $(DISTFILES) - @for file in $(DISTFILES); do \ - d=$(srcdir); \ - if test -d $$d/$$file; then \ -- cp -pr $$d/$$file $(distdir)/$$file; \ -+ cp -pR $$d/$$file $(distdir) \ -+ || exit 1; \ - else \ - test -f $(distdir)/$$file \ -- || ln $$d/$$file $(distdir)/$$file 2> /dev/null \ -- || cp -p $$d/$$file $(distdir)/$$file || :; \ -+ || cp -p $$d/$$file $(distdir)/$$file \ -+ || exit 1; \ - 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 -- - info-am: - info: info-am - dvi-am: -@@ -888,9 +467,8 @@ - uninstall-am: uninstall-pkglibLTLIBRARIES - uninstall: uninstall-am - all-am: Makefile $(LTLIBRARIES) $(PROGRAMS) --all-redirect: all-am - install-strip: -- $(MAKE) $(AM_MAKEFLAGS) AM_INSTALL_PROGRAM_FLAGS=-s install -+ $(MAKE) $(AM_MAKEFLAGS) INSTALL_STRIP_FLAG=-s install - installdirs: - $(mkinstalldirs) $(DESTDIR)$(pkglibdir) - -@@ -905,48 +483,46 @@ - -rm -f config.cache config.log stamp-h stamp-h[0-9]* - - maintainer-clean-generic: --mostlyclean-am: mostlyclean-pkglibLTLIBRARIES mostlyclean-compile \ -- mostlyclean-libtool mostlyclean-noinstPROGRAMS \ -- mostlyclean-tags mostlyclean-generic -- --mostlyclean: mostlyclean-am -- --clean-am: clean-pkglibLTLIBRARIES clean-compile clean-libtool \ -- clean-noinstPROGRAMS clean-tags clean-generic \ -- mostlyclean-am clean-local -- -+ @echo "This command is intended for maintainers to use" -+ @echo "it deletes files that may require special tools to rebuild." -+ -rm -f Makefile.in - clean: clean-am - --distclean-am: distclean-pkglibLTLIBRARIES distclean-compile \ -- distclean-libtool distclean-noinstPROGRAMS \ -- distclean-tags distclean-generic clean-am -- -rm -f libtool -+clean-am: clean-generic clean-libtool clean-local clean-noinstPROGRAMS \ -+ clean-pkglibLTLIBRARIES mostlyclean-am - - distclean: distclean-am - --maintainer-clean-am: maintainer-clean-pkglibLTLIBRARIES \ -- maintainer-clean-compile maintainer-clean-libtool \ -- maintainer-clean-noinstPROGRAMS maintainer-clean-tags \ -- 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." -+distclean-am: clean-am distclean-compile distclean-depend \ -+ distclean-generic distclean-libtool distclean-noinstPROGRAMS \ -+ distclean-pkglibLTLIBRARIES distclean-tags - - maintainer-clean: maintainer-clean-am - --.PHONY: mostlyclean-pkglibLTLIBRARIES distclean-pkglibLTLIBRARIES \ --clean-pkglibLTLIBRARIES maintainer-clean-pkglibLTLIBRARIES \ --uninstall-pkglibLTLIBRARIES install-pkglibLTLIBRARIES \ --mostlyclean-compile distclean-compile clean-compile \ --maintainer-clean-compile mostlyclean-libtool distclean-libtool \ --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 -+maintainer-clean-am: distclean-am maintainer-clean-generic \ -+ maintainer-clean-noinstPROGRAMS \ -+ maintainer-clean-pkglibLTLIBRARIES -+ -+mostlyclean: mostlyclean-am -+ -+mostlyclean-am: mostlyclean-compile mostlyclean-generic \ -+ mostlyclean-libtool mostlyclean-noinstPROGRAMS \ -+ mostlyclean-pkglibLTLIBRARIES -+ -+.PHONY: check check-am clean clean-generic clean-libtool \ -+ clean-noinstPROGRAMS clean-pkglibLTLIBRARIES distclean \ -+ distclean-compile distclean-depend distclean-generic \ -+ distclean-libtool distclean-noinstPROGRAMS \ -+ distclean-pkglibLTLIBRARIES distclean-tags distdir dvi dvi-am \ -+ info info-am install install-am install-data install-data-am \ -+ install-exec install-exec-am install-pkglibLTLIBRARIES \ -+ install-strip installcheck installcheck-am installdirs \ -+ maintainer-clean maintainer-clean-generic \ -+ maintainer-clean-noinstPROGRAMS \ -+ maintainer-clean-pkglibLTLIBRARIES mostlyclean \ -+ mostlyclean-compile mostlyclean-generic mostlyclean-libtool \ -+ mostlyclean-noinstPROGRAMS mostlyclean-pkglibLTLIBRARIES tags \ -+ uninstall uninstall-am uninstall-pkglibLTLIBRARIES - - - # The automatic dependencies miss this -diff -r -N -U3 mysql-3.23.32.orig/man/Makefile.in mysql-3.23.32/man/Makefile.in ---- mysql-3.23.32.orig/man/Makefile.in Mon Jan 22 14:44:18 2001 -+++ mysql-3.23.32/man/Makefile.in Thu Mar 1 17:00:57 2001 -@@ -1,6 +1,7 @@ --# Makefile.in generated automatically by automake 1.4 from Makefile.am -+# Makefile.in generated automatically by automake 1.4d from Makefile.am - --# Copyright (C) 1994, 1995-8, 1999 Free Software Foundation, Inc. -+# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001 -+# Free Software Foundation, Inc. - # This Makefile.in is free software; the Free Software Foundation - # gives unlimited permission to copy and/or distribute it, - # with or without modifications, as long as this notice is preserved. -@@ -10,24 +11,6 @@ - # even the implied warranty of MERCHANTABILITY or FITNESS FOR A - # PARTICULAR PURPOSE. - --# Copyright (C) 2000 MySQL AB & MySQL Finland AB & TCX DataKonsult AB --# --# This library is free software; you can redistribute it and/or --# modify it under the terms of the GNU Library General Public --# License as published by the Free Software Foundation; either --# version 2 of the License, or (at your option) any later version. --# --# This library is distributed in the hope that it will be useful, --# but WITHOUT ANY WARRANTY; without even the implied warranty of --# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU --# Library General Public License for more details. --# --# You should have received a copy of the GNU Library General Public --# License along with this library; if not, write to the Free --# Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, --# MA 02111-1307, USA -- -- - SHELL = @SHELL@ - - srcdir = @srcdir@ -@@ -49,8 +32,6 @@ - includedir = @includedir@ - oldincludedir = /usr/include - --DESTDIR = -- - pkgdatadir = $(datadir)/@PACKAGE@ - pkglibdir = $(libdir)/@PACKAGE@ - pkgincludedir = $(includedir)/@PACKAGE@ -@@ -63,9 +44,11 @@ - AUTOHEADER = @AUTOHEADER@ - - INSTALL = @INSTALL@ --INSTALL_PROGRAM = @INSTALL_PROGRAM@ $(AM_INSTALL_PROGRAM_FLAGS) -+INSTALL_PROGRAM = @INSTALL_PROGRAM@ - INSTALL_DATA = @INSTALL_DATA@ - INSTALL_SCRIPT = @INSTALL_SCRIPT@ -+INSTALL_STRIP_FLAG = -+INSTALL_HEADER = $(INSTALL_DATA) - transform = @program_transform_name@ - - NORMAL_INSTALL = : -@@ -74,6 +57,8 @@ - NORMAL_UNINSTALL = : - PRE_UNINSTALL = : - POST_UNINSTALL = : -+ -+@SET_MAKE@ - build_alias = @build_alias@ - build_triplet = @build@ - host_alias = @host_alias@ -@@ -81,6 +66,8 @@ - target_alias = @target_alias@ - target_triplet = @target@ - ALLOCA = @ALLOCA@ -+AMDEP = @AMDEP@ -+AMTAR = @AMTAR@ - AS = @AS@ - AVAILABLE_LANGUAGES = @AVAILABLE_LANGUAGES@ - AVAILABLE_LANGUAGES_ERRORS = @AVAILABLE_LANGUAGES_ERRORS@ -@@ -102,6 +89,7 @@ - CXX = @CXX@ - CXXFLAGS = @CXXFLAGS@ - CXXLDFLAGS = @CXXLDFLAGS@ -+DEPDIR = @DEPDIR@ - DLLTOOL = @DLLTOOL@ - DOT_FRM_VERSION = @DOT_FRM_VERSION@ - FIND_PROC = @FIND_PROC@ -@@ -155,11 +143,13 @@ - VERSION = @VERSION@ - WRAPLIBS = @WRAPLIBS@ - YACC = @YACC@ -+_am_include = @_am_include@ - bdb_includes = @bdb_includes@ - bdb_libs = @bdb_libs@ - bench_dirs = @bench_dirs@ - default_charset = @default_charset@ - docs_dirs = @docs_dirs@ -+install_sh = @install_sh@ - linked_client_targets = @linked_client_targets@ - readline_dir = @readline_dir@ - readline_link = @readline_link@ -@@ -169,13 +159,35 @@ - thread_dirs = @thread_dirs@ - uname_prog = @uname_prog@ - --man_MANS = mysql.1 isamchk.1 isamlog.1 mysql_zap.1 mysqlaccess.1 mysqladmin.1 mysqld.1 mysqld_multi.1 mysqldump.1 mysqlshow.1 perror.1 replace.1 safe_mysqld.1 -+# Copyright (C) 2000 MySQL AB & MySQL Finland AB & TCX DataKonsult AB -+# -+# This library is free software; you can redistribute it and/or -+# modify it under the terms of the GNU Library General Public -+# License as published by the Free Software Foundation; either -+# version 2 of the License, or (at your option) any later version. -+# -+# This library is distributed in the hope that it will be useful, -+# but WITHOUT ANY WARRANTY; without even the implied warranty of -+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -+# Library General Public License for more details. -+# -+# You should have received a copy of the GNU Library General Public -+# License along with this library; if not, write to the Free -+# Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, -+# MA 02111-1307, USA -+ -+ -+man_MANS = mysql.1 isamchk.1 isamlog.1 mysql_zap.1 mysqlaccess.1 \ -+ mysqladmin.1 mysqld.1 mysqld_multi.1 mysqldump.1 mysqlshow.1 \ -+ perror.1 replace.1 safe_mysqld.1 - - - EXTRA_DIST = $(man_MANS) -+subdir = man - mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs - CONFIG_HEADER = ../config.h - CONFIG_CLEAN_FILES = -+DIST_SOURCES = - man1dir = $(mandir)/man1 - MANS = $(man_MANS) - -@@ -183,18 +195,17 @@ - DIST_COMMON = Makefile.am Makefile.in - - --DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST) -+DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) - --TAR = gtar - GZIP_ENV = --best --all: all-redirect -+all: all-am - .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 - cd $(top_builddir) \ -- && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status -+ && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= CONFIG_LINKS= $(SHELL) ./config.status - - - install-man1: -@@ -210,6 +221,7 @@ - else file=$$i; fi; \ - ext=`echo $$i | sed -e 's/^.*\\.//'`; \ - inst=`echo $$i | sed -e 's/\\.[0-9a-z]*$$//'`; \ -+ inst=`echo $$inst | sed -e 's/^.*\///'`; \ - inst=`echo $$inst | sed '$(transform)'`.$$ext; \ - echo " $(INSTALL_DATA) $$file $(DESTDIR)$(man1dir)/$$inst"; \ - $(INSTALL_DATA) $$file $(DESTDIR)$(man1dir)/$$inst; \ -@@ -225,6 +237,7 @@ - for i in $$list; do \ - ext=`echo $$i | sed -e 's/^.*\\.//'`; \ - inst=`echo $$i | sed -e 's/\\.[0-9a-z]*$$//'`; \ -+ inst=`echo $$inst | sed -e 's/^.*\///'`; \ - inst=`echo $$inst | sed '$(transform)'`.$$ext; \ - echo " rm -f $(DESTDIR)$(man1dir)/$$inst"; \ - rm -f $(DESTDIR)$(man1dir)/$$inst; \ -@@ -241,17 +254,17 @@ - - distdir = $(top_builddir)/$(PACKAGE)-$(VERSION)/$(subdir) - --subdir = man - - distdir: $(DISTFILES) - @for file in $(DISTFILES); do \ - d=$(srcdir); \ - if test -d $$d/$$file; then \ -- cp -pr $$d/$$file $(distdir)/$$file; \ -+ cp -pR $$d/$$file $(distdir) \ -+ || exit 1; \ - else \ - test -f $(distdir)/$$file \ -- || ln $$d/$$file $(distdir)/$$file 2> /dev/null \ -- || cp -p $$d/$$file $(distdir)/$$file || :; \ -+ || cp -p $$d/$$file $(distdir)/$$file \ -+ || exit 1; \ - fi; \ - done - info-am: -@@ -274,9 +287,8 @@ - uninstall-am: uninstall-man - uninstall: uninstall-am - all-am: Makefile $(MANS) --all-redirect: all-am - install-strip: -- $(MAKE) $(AM_MAKEFLAGS) AM_INSTALL_PROGRAM_FLAGS=-s install -+ $(MAKE) $(AM_MAKEFLAGS) INSTALL_STRIP_FLAG=-s install - installdirs: - $(mkinstalldirs) $(DESTDIR)$(mandir)/man1 - -@@ -290,31 +302,32 @@ - -rm -f config.cache config.log stamp-h stamp-h[0-9]* - - maintainer-clean-generic: --mostlyclean-am: mostlyclean-generic -- --mostlyclean: mostlyclean-am -- --clean-am: clean-generic mostlyclean-am -- -+ @echo "This command is intended for maintainers to use" -+ @echo "it deletes files that may require special tools to rebuild." -+ -rm -f Makefile.in - clean: clean-am - --distclean-am: distclean-generic clean-am -- -rm -f libtool -+clean-am: clean-generic mostlyclean-am - - distclean: distclean-am - --maintainer-clean-am: 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." -+distclean-am: clean-am distclean-generic - - maintainer-clean: maintainer-clean-am - --.PHONY: install-man1 uninstall-man1 install-man uninstall-man 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 -+maintainer-clean-am: distclean-am maintainer-clean-generic -+ -+mostlyclean: mostlyclean-am -+ -+mostlyclean-am: mostlyclean-generic -+ -+.PHONY: check check-am clean clean-generic distclean distclean-generic \ -+ distdir dvi dvi-am info info-am install install-am install-data \ -+ install-data-am install-exec install-exec-am install-man \ -+ install-man1 install-strip installcheck installcheck-am \ -+ installdirs maintainer-clean maintainer-clean-generic \ -+ mostlyclean mostlyclean-generic uninstall uninstall-am \ -+ uninstall-man uninstall-man1 - - - # Tell versions [3.59,3.63) of GNU make to not export all variables. -diff -r -N -U3 mysql-3.23.32.orig/merge/Makefile.in mysql-3.23.32/merge/Makefile.in ---- mysql-3.23.32.orig/merge/Makefile.in Mon Jan 22 14:44:09 2001 -+++ mysql-3.23.32/merge/Makefile.in Thu Mar 1 17:01:04 2001 -@@ -1,6 +1,7 @@ --# Makefile.in generated automatically by automake 1.4 from Makefile.am -+# Makefile.in generated automatically by automake 1.4d from Makefile.am - --# Copyright (C) 1994, 1995-8, 1999 Free Software Foundation, Inc. -+# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001 -+# Free Software Foundation, Inc. - # This Makefile.in is free software; the Free Software Foundation - # gives unlimited permission to copy and/or distribute it, - # with or without modifications, as long as this notice is preserved. -@@ -10,23 +11,6 @@ - # even the implied warranty of MERCHANTABILITY or FITNESS FOR A - # PARTICULAR PURPOSE. - --# Copyright (C) 2000 MySQL AB & MySQL Finland AB & TCX DataKonsult AB --# --# This program is free software; you can redistribute it and/or modify --# it under the terms of the GNU General Public License as published by --# the Free Software Foundation; either version 2 of the License, or --# (at your option) any later version. --# --# This program is distributed in the hope that it will be useful, --# but WITHOUT ANY WARRANTY; without even the implied warranty of --# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the --# GNU General Public License for more details. --# --# You should have received a copy of the GNU General Public License --# along with this program; if not, write to the Free Software --# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -- -- - SHELL = @SHELL@ - - srcdir = @srcdir@ -@@ -48,8 +32,6 @@ - includedir = @includedir@ - oldincludedir = /usr/include - --DESTDIR = -- - pkgdatadir = $(datadir)/@PACKAGE@ - pkglibdir = $(libdir)/@PACKAGE@ - pkgincludedir = $(includedir)/@PACKAGE@ -@@ -62,9 +44,11 @@ - AUTOHEADER = @AUTOHEADER@ - - INSTALL = @INSTALL@ --INSTALL_PROGRAM = @INSTALL_PROGRAM@ $(AM_INSTALL_PROGRAM_FLAGS) -+INSTALL_PROGRAM = @INSTALL_PROGRAM@ - INSTALL_DATA = @INSTALL_DATA@ - INSTALL_SCRIPT = @INSTALL_SCRIPT@ -+INSTALL_STRIP_FLAG = -+INSTALL_HEADER = $(INSTALL_DATA) - transform = @program_transform_name@ - - NORMAL_INSTALL = : -@@ -73,6 +57,8 @@ - NORMAL_UNINSTALL = : - PRE_UNINSTALL = : - POST_UNINSTALL = : -+ -+@SET_MAKE@ - build_alias = @build_alias@ - build_triplet = @build@ - host_alias = @host_alias@ -@@ -80,6 +66,8 @@ - target_alias = @target_alias@ - target_triplet = @target@ - ALLOCA = @ALLOCA@ -+AMDEP = @AMDEP@ -+AMTAR = @AMTAR@ - AS = @AS@ - AVAILABLE_LANGUAGES = @AVAILABLE_LANGUAGES@ - AVAILABLE_LANGUAGES_ERRORS = @AVAILABLE_LANGUAGES_ERRORS@ -@@ -101,6 +89,7 @@ - CXX = @CXX@ - CXXFLAGS = @CXXFLAGS@ - CXXLDFLAGS = @CXXLDFLAGS@ -+DEPDIR = @DEPDIR@ - DLLTOOL = @DLLTOOL@ - DOT_FRM_VERSION = @DOT_FRM_VERSION@ - FIND_PROC = @FIND_PROC@ -@@ -154,11 +143,13 @@ - VERSION = @VERSION@ - WRAPLIBS = @WRAPLIBS@ - YACC = @YACC@ -+_am_include = @_am_include@ - bdb_includes = @bdb_includes@ - bdb_libs = @bdb_libs@ - bench_dirs = @bench_dirs@ - default_charset = @default_charset@ - docs_dirs = @docs_dirs@ -+install_sh = @install_sh@ - linked_client_targets = @linked_client_targets@ - readline_dir = @readline_dir@ - readline_link = @readline_link@ -@@ -168,14 +159,41 @@ - thread_dirs = @thread_dirs@ - uname_prog = @uname_prog@ - -+# Copyright (C) 2000 MySQL AB & MySQL Finland AB & TCX DataKonsult AB -+# -+# This program is free software; you can redistribute it and/or modify -+# it under the terms of the GNU General Public License as published by -+# the Free Software Foundation; either version 2 of the License, or -+# (at your option) any later version. -+# -+# This program is distributed in the hope that it will be useful, -+# but WITHOUT ANY WARRANTY; without even the implied warranty of -+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -+# GNU General Public License for more details. -+# -+# You should have received a copy of the GNU General Public License -+# along with this program; if not, write to the Free Software -+# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -+ -+ - INCLUDES = @MT_INCLUDES@ -I$(srcdir)/../include -I../include - pkglib_LIBRARIES = libmerge.a - noinst_HEADERS = mrgdef.h --libmerge_a_SOURCES = open.c extra.c info.c _locking.c rrnd.c update.c delete.c rsame.c panic.c close.c create.c static.c -+libmerge_a_SOURCES = open.c extra.c info.c _locking.c \ -+ rrnd.c update.c delete.c rsame.c panic.c \ -+ close.c create.c static.c - - --OMIT_DEPENDENCIES = pthread.h stdio.h __stdio.h stdlib.h __stdlib.h math.h __math.h time.h __time.h unistd.h __unistd.h types.h xtypes.h ac-types.h posix.h string.h __string.h errno.h socket.h inet.h dirent.h netdb.h cleanup.h cond.h debug_out.h fd.h kernel.h mutex.h prio_queue.h pthread_attr.h pthread_once.h queue.h sleep.h specific.h version.h pwd.h timers.h uio.h cdefs.h machdep.h signal.h __signal.h util.h -+OMIT_DEPENDENCIES = pthread.h stdio.h __stdio.h stdlib.h __stdlib.h math.h\ -+ __math.h time.h __time.h unistd.h __unistd.h types.h \ -+ xtypes.h ac-types.h posix.h string.h __string.h \ -+ errno.h socket.h inet.h dirent.h netdb.h \ -+ cleanup.h cond.h debug_out.h fd.h kernel.h mutex.h \ -+ prio_queue.h pthread_attr.h pthread_once.h queue.h\ -+ sleep.h specific.h version.h pwd.h timers.h uio.h \ -+ cdefs.h machdep.h signal.h __signal.h util.h - -+subdir = merge - mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs - CONFIG_HEADER = ../config.h - CONFIG_CLEAN_FILES = -@@ -186,35 +204,43 @@ - CPPFLAGS = @CPPFLAGS@ - LDFLAGS = @LDFLAGS@ - LIBS = @LIBS@ -+libmerge_a_AR = $(AR) cru - libmerge_a_LIBADD = --libmerge_a_OBJECTS = open.o extra.o info.o _locking.o rrnd.o update.o \ --delete.o rsame.o panic.o close.o create.o static.o -+am_libmerge_a_OBJECTS = open.o extra.o info.o _locking.o rrnd.o \ -+update.o delete.o rsame.o panic.o close.o create.o static.o -+libmerge_a_OBJECTS = $(am_libmerge_a_OBJECTS) - AR = ar - COMPILE = $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) - LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) - CCLD = $(CC) --LINK = $(LIBTOOL) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(LDFLAGS) -o $@ -+LINK = $(LIBTOOL) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@ -+DIST_SOURCES = $(libmerge_a_SOURCES) - HEADERS = $(noinst_HEADERS) - --DIST_COMMON = Makefile.am Makefile.in -+depcomp = $(SHELL) $(top_srcdir)/depcomp -+@AMDEP@DEP_FILES = $(DEPDIR)/_locking.Po $(DEPDIR)/close.Po \ -+@AMDEP@$(DEPDIR)/create.Po $(DEPDIR)/delete.Po $(DEPDIR)/extra.Po \ -+@AMDEP@$(DEPDIR)/info.Po $(DEPDIR)/open.Po $(DEPDIR)/panic.Po \ -+@AMDEP@$(DEPDIR)/rrnd.Po $(DEPDIR)/rsame.Po $(DEPDIR)/static.Po \ -+@AMDEP@$(DEPDIR)/update.Po -+DIST_COMMON = $(noinst_HEADERS) Makefile.am Makefile.in - - --DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST) -+DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) - --TAR = gtar - GZIP_ENV = --best - SOURCES = $(libmerge_a_SOURCES) --OBJECTS = $(libmerge_a_OBJECTS) -+OBJECTS = $(am_libmerge_a_OBJECTS) - --all: all-redirect -+all: all-am - .SUFFIXES: --.SUFFIXES: .S .c .lo .o .s -+.SUFFIXES: .c .lo .o - $(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 - cd $(top_builddir) \ -- && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status -+ && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= CONFIG_LINKS= $(SHELL) ./config.status - - - mostlyclean-pkglibLIBRARIES: -@@ -245,38 +271,17 @@ - - uninstall-pkglibLIBRARIES: - @$(NORMAL_UNINSTALL) -- list='$(pkglib_LIBRARIES)'; for p in $$list; do \ -+ @list='$(pkglib_LIBRARIES)'; for p in $$list; do \ -+ echo " rm -f $(DESTDIR)$(pkglibdir)/$$p"; \ - rm -f $(DESTDIR)$(pkglibdir)/$$p; \ - done - --.c.o: -- $(COMPILE) -c $< -- --.s.o: -- $(COMPILE) -c $< -- --.S.o: -- $(COMPILE) -c $< -- - mostlyclean-compile: - -rm -f *.o core *.core - --clean-compile: -- - distclean-compile: - -rm -f *.tab.c - --maintainer-clean-compile: -- --.c.lo: -- $(LIBTOOL) --mode=compile $(COMPILE) -c $< -- --.s.lo: -- $(LIBTOOL) --mode=compile $(COMPILE) -c $< -- --.S.lo: -- $(LIBTOOL) --mode=compile $(COMPILE) -c $< -- - mostlyclean-libtool: - -rm -f *.lo - -@@ -284,167 +289,91 @@ - -rm -rf .libs _libs - - distclean-libtool: -- --maintainer-clean-libtool: -+ -rm -f libtool - - libmerge.a: $(libmerge_a_OBJECTS) $(libmerge_a_DEPENDENCIES) - -rm -f libmerge.a -- $(AR) cru libmerge.a $(libmerge_a_OBJECTS) $(libmerge_a_LIBADD) -+ $(libmerge_a_AR) libmerge.a $(libmerge_a_OBJECTS) $(libmerge_a_LIBADD) - $(RANLIB) libmerge.a - - tags: TAGS - --ID: $(HEADERS) $(SOURCES) $(LISP) -- list='$(SOURCES) $(HEADERS)'; \ -- unique=`for i in $$list; do echo $$i; done | \ -- awk ' { files[$$0] = 1; } \ -+ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) -+ list='$(SOURCES) $(HEADERS) $(TAGS_FILES)'; \ -+ unique=`for i in $$list; do \ -+ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ -+ done | \ -+ $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ -- here=`pwd` && cd $(srcdir) \ -- && mkid -f$$here/ID $$unique $(LISP) -+ mkid -fID $$unique $(LISP) - --TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) $(LISP) -+TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ -+ $(TAGS_FILES) $(LISP) - tags=; \ - here=`pwd`; \ -- list='$(SOURCES) $(HEADERS)'; \ -- unique=`for i in $$list; do echo $$i; done | \ -- awk ' { files[$$0] = 1; } \ -+ list='$(SOURCES) $(HEADERS) $(TAGS_FILES)'; \ -+ unique=`for i in $$list; do \ -+ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ -+ done | \ -+ $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ - test -z "$(ETAGS_ARGS)$$unique$(LISP)$$tags" \ -- || (cd $(srcdir) && etags $(ETAGS_ARGS) $$tags $$unique $(LISP) -o $$here/TAGS) -+ || etags $(ETAGS_ARGS) $$tags $$unique $(LISP) - --mostlyclean-tags: -- --clean-tags: -+GTAGS: -+ here=`CDPATH=: && cd $(top_builddir) && pwd` \ -+ && cd $(top_srcdir) \ -+ && gtags -i $$here - - distclean-tags: - -rm -f TAGS ID - --maintainer-clean-tags: -+@AMDEP@@_am_include@ $(DEPDIR)/_locking.Po -+@AMDEP@@_am_include@ $(DEPDIR)/close.Po -+@AMDEP@@_am_include@ $(DEPDIR)/create.Po -+@AMDEP@@_am_include@ $(DEPDIR)/delete.Po -+@AMDEP@@_am_include@ $(DEPDIR)/extra.Po -+@AMDEP@@_am_include@ $(DEPDIR)/info.Po -+@AMDEP@@_am_include@ $(DEPDIR)/open.Po -+@AMDEP@@_am_include@ $(DEPDIR)/panic.Po -+@AMDEP@@_am_include@ $(DEPDIR)/rrnd.Po -+@AMDEP@@_am_include@ $(DEPDIR)/rsame.Po -+@AMDEP@@_am_include@ $(DEPDIR)/static.Po -+@AMDEP@@_am_include@ $(DEPDIR)/update.Po -+ -+distclean-depend: -+ -rm -rf $(DEPDIR) -+ -+@AMDEP@CCDEPMODE = @CCDEPMODE@ -+ -+.c.o: -+@AMDEP@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ -+@AMDEP@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@ -+@AMDEP@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -+ $(COMPILE) -c -o $@ `test -f $< || echo '$(srcdir)/'`$< -+ -+.c.lo: -+@AMDEP@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ -+@AMDEP@ depfile='$(DEPDIR)/$*.Plo' tmpdepfile='$(DEPDIR)/$*.TPlo' @AMDEPBACKSLASH@ -+@AMDEP@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -+ $(LTCOMPILE) -c -o $@ `test -f $< || echo '$(srcdir)/'`$< -+ - - distdir = $(top_builddir)/$(PACKAGE)-$(VERSION)/$(subdir) - --subdir = merge - - distdir: $(DISTFILES) - @for file in $(DISTFILES); do \ - d=$(srcdir); \ - if test -d $$d/$$file; then \ -- cp -pr $$d/$$file $(distdir)/$$file; \ -+ cp -pR $$d/$$file $(distdir) \ -+ || exit 1; \ - else \ - test -f $(distdir)/$$file \ -- || ln $$d/$$file $(distdir)/$$file 2> /dev/null \ -- || cp -p $$d/$$file $(distdir)/$$file || :; \ -+ || cp -p $$d/$$file $(distdir)/$$file \ -+ || exit 1; \ - 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 -- - info-am: - info: info-am - dvi-am: -@@ -465,9 +394,8 @@ - uninstall-am: uninstall-pkglibLIBRARIES - uninstall: uninstall-am - all-am: Makefile $(LIBRARIES) $(HEADERS) --all-redirect: all-am - install-strip: -- $(MAKE) $(AM_MAKEFLAGS) AM_INSTALL_PROGRAM_FLAGS=-s install -+ $(MAKE) $(AM_MAKEFLAGS) INSTALL_STRIP_FLAG=-s install - installdirs: - $(mkinstalldirs) $(DESTDIR)$(pkglibdir) - -@@ -481,45 +409,42 @@ - -rm -f config.cache config.log stamp-h stamp-h[0-9]* - - maintainer-clean-generic: --mostlyclean-am: mostlyclean-pkglibLIBRARIES mostlyclean-compile \ -- mostlyclean-libtool mostlyclean-tags \ -- mostlyclean-generic -- --mostlyclean: mostlyclean-am -- --clean-am: clean-pkglibLIBRARIES clean-compile clean-libtool clean-tags \ -- clean-generic mostlyclean-am -- -+ @echo "This command is intended for maintainers to use" -+ @echo "it deletes files that may require special tools to rebuild." -+ -rm -f Makefile.in - clean: clean-am - --distclean-am: distclean-pkglibLIBRARIES distclean-compile \ -- distclean-libtool distclean-tags distclean-generic \ -- clean-am -- -rm -f libtool -+clean-am: clean-generic clean-libtool clean-pkglibLIBRARIES \ -+ mostlyclean-am - - distclean: distclean-am - --maintainer-clean-am: maintainer-clean-pkglibLIBRARIES \ -- maintainer-clean-compile maintainer-clean-libtool \ -- maintainer-clean-tags 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." -+distclean-am: clean-am distclean-compile distclean-depend \ -+ distclean-generic distclean-libtool distclean-pkglibLIBRARIES \ -+ distclean-tags - - maintainer-clean: maintainer-clean-am - --.PHONY: mostlyclean-pkglibLIBRARIES distclean-pkglibLIBRARIES \ --clean-pkglibLIBRARIES maintainer-clean-pkglibLIBRARIES \ --uninstall-pkglibLIBRARIES install-pkglibLIBRARIES 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 -+maintainer-clean-am: distclean-am maintainer-clean-generic \ -+ maintainer-clean-pkglibLIBRARIES -+ -+mostlyclean: mostlyclean-am -+ -+mostlyclean-am: mostlyclean-compile mostlyclean-generic \ -+ mostlyclean-libtool mostlyclean-pkglibLIBRARIES -+ -+.PHONY: check check-am clean clean-generic clean-libtool \ -+ clean-pkglibLIBRARIES distclean distclean-compile \ -+ distclean-depend distclean-generic distclean-libtool \ -+ distclean-pkglibLIBRARIES distclean-tags distdir dvi dvi-am \ -+ info info-am install install-am install-data install-data-am \ -+ install-exec install-exec-am install-pkglibLIBRARIES \ -+ install-strip installcheck installcheck-am installdirs \ -+ maintainer-clean maintainer-clean-generic \ -+ maintainer-clean-pkglibLIBRARIES mostlyclean \ -+ mostlyclean-compile mostlyclean-generic mostlyclean-libtool \ -+ mostlyclean-pkglibLIBRARIES tags uninstall uninstall-am \ -+ uninstall-pkglibLIBRARIES - - - # Don't update the files from bitkeeper -diff -r -N -U3 mysql-3.23.32.orig/myisam/Makefile.in mysql-3.23.32/myisam/Makefile.in ---- mysql-3.23.32.orig/myisam/Makefile.in Mon Jan 22 14:44:10 2001 -+++ mysql-3.23.32/myisam/Makefile.in Thu Mar 1 17:00:56 2001 -@@ -1,6 +1,7 @@ --# Makefile.in generated automatically by automake 1.4 from Makefile.am -+# Makefile.in generated automatically by automake 1.4d from Makefile.am - --# Copyright (C) 1994, 1995-8, 1999 Free Software Foundation, Inc. -+# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001 -+# Free Software Foundation, Inc. - # This Makefile.in is free software; the Free Software Foundation - # gives unlimited permission to copy and/or distribute it, - # with or without modifications, as long as this notice is preserved. -@@ -10,23 +11,6 @@ - # even the implied warranty of MERCHANTABILITY or FITNESS FOR A - # PARTICULAR PURPOSE. - --# Copyright (C) 2000 MySQL AB & MySQL Finland AB & TCX DataKonsult AB --# --# This program is free software; you can redistribute it and/or modify --# it under the terms of the GNU General Public License as published by --# the Free Software Foundation; either version 2 of the License, or --# (at your option) any later version. --# --# This program is distributed in the hope that it will be useful, --# but WITHOUT ANY WARRANTY; without even the implied warranty of --# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the --# GNU General Public License for more details. --# --# You should have received a copy of the GNU General Public License --# along with this program; if not, write to the Free Software --# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -- -- - SHELL = @SHELL@ - - srcdir = @srcdir@ -@@ -48,8 +32,6 @@ - includedir = @includedir@ - oldincludedir = /usr/include - --DESTDIR = -- - pkgdatadir = $(datadir)/@PACKAGE@ - pkglibdir = $(libdir)/@PACKAGE@ - pkgincludedir = $(includedir)/@PACKAGE@ -@@ -62,9 +44,11 @@ - AUTOHEADER = @AUTOHEADER@ - - INSTALL = @INSTALL@ --INSTALL_PROGRAM = @INSTALL_PROGRAM@ $(AM_INSTALL_PROGRAM_FLAGS) -+INSTALL_PROGRAM = @INSTALL_PROGRAM@ - INSTALL_DATA = @INSTALL_DATA@ - INSTALL_SCRIPT = @INSTALL_SCRIPT@ -+INSTALL_STRIP_FLAG = -+INSTALL_HEADER = $(INSTALL_DATA) - transform = @program_transform_name@ - - NORMAL_INSTALL = : -@@ -73,6 +57,8 @@ - NORMAL_UNINSTALL = : - PRE_UNINSTALL = : - POST_UNINSTALL = : -+ -+@SET_MAKE@ - build_alias = @build_alias@ - build_triplet = @build@ - host_alias = @host_alias@ -@@ -80,6 +66,8 @@ - target_alias = @target_alias@ - target_triplet = @target@ - ALLOCA = @ALLOCA@ -+AMDEP = @AMDEP@ -+AMTAR = @AMTAR@ - AS = @AS@ - AVAILABLE_LANGUAGES = @AVAILABLE_LANGUAGES@ - AVAILABLE_LANGUAGES_ERRORS = @AVAILABLE_LANGUAGES_ERRORS@ -@@ -101,6 +89,7 @@ - CXX = @CXX@ - CXXFLAGS = @CXXFLAGS@ - CXXLDFLAGS = @CXXLDFLAGS@ -+DEPDIR = @DEPDIR@ - DLLTOOL = @DLLTOOL@ - DOT_FRM_VERSION = @DOT_FRM_VERSION@ - FIND_PROC = @FIND_PROC@ -@@ -154,11 +143,13 @@ - VERSION = @VERSION@ - WRAPLIBS = @WRAPLIBS@ - YACC = @YACC@ -+_am_include = @_am_include@ - bdb_includes = @bdb_includes@ - bdb_libs = @bdb_libs@ - bench_dirs = @bench_dirs@ - default_charset = @default_charset@ - docs_dirs = @docs_dirs@ -+install_sh = @install_sh@ - linked_client_targets = @linked_client_targets@ - readline_dir = @readline_dir@ - readline_link = @readline_link@ -@@ -168,11 +159,29 @@ - thread_dirs = @thread_dirs@ - uname_prog = @uname_prog@ - -+# Copyright (C) 2000 MySQL AB & MySQL Finland AB & TCX DataKonsult AB -+# -+# This program is free software; you can redistribute it and/or modify -+# it under the terms of the GNU General Public License as published by -+# the Free Software Foundation; either version 2 of the License, or -+# (at your option) any later version. -+# -+# This program is distributed in the hope that it will be useful, -+# but WITHOUT ANY WARRANTY; without even the implied warranty of -+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -+# GNU General Public License for more details. -+# -+# You should have received a copy of the GNU General Public License -+# along with this program; if not, write to the Free Software -+# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -+ -+ - EXTRA_DIST = mi_test_all.sh mi_test_all.res - pkgdata_DATA = mi_test_all mi_test_all.res - - INCLUDES = @MT_INCLUDES@ -I$(srcdir)/../include -I../include --LDADD = @CLIENT_EXTRA_LDFLAGS@ libmyisam.a ../mysys/libmysys.a ../dbug/libdbug.a ../strings/libmystrings.a -+LDADD = @CLIENT_EXTRA_LDFLAGS@ libmyisam.a ../mysys/libmysys.a \ -+ ../dbug/libdbug.a ../strings/libmystrings.a - - pkglib_LIBRARIES = libmyisam.a - bin_PROGRAMS = myisamchk myisamlog myisampack -@@ -186,16 +195,38 @@ - mi_test3_DEPENDENCIES = $(LIBRARIES) - ft_test1_DEPENDENCIES = $(LIBRARIES) - ft_eval_DEPENDENCIES = $(LIBRARIES) --libmyisam_a_SOURCES = mi_open.c mi_extra.c mi_info.c mi_rkey.c mi_rnext.c mi_rnext_same.c mi_search.c mi_page.c mi_key.c mi_locking.c mi_rrnd.c mi_scan.c mi_cache.c mi_statrec.c mi_packrec.c mi_dynrec.c mi_update.c mi_write.c mi_unique.c mi_delete.c mi_rprev.c mi_rfirst.c mi_rlast.c mi_rsame.c mi_rsamepos.c mi_panic.c mi_close.c mi_create.c mi_range.c mi_dbug.c mi_checksum.c mi_log.c mi_changed.c mi_static.c mi_delete_all.c mi_delete_table.c mi_rename.c mi_check.c ft_parser.c ft_search.c ft_stopwords.c ft_static.c ft_update.c sort.c -+libmyisam_a_SOURCES = mi_open.c mi_extra.c mi_info.c mi_rkey.c \ -+ mi_rnext.c mi_rnext_same.c \ -+ mi_search.c mi_page.c mi_key.c mi_locking.c \ -+ mi_rrnd.c mi_scan.c mi_cache.c \ -+ mi_statrec.c mi_packrec.c mi_dynrec.c \ -+ mi_update.c mi_write.c mi_unique.c \ -+ mi_delete.c \ -+ mi_rprev.c mi_rfirst.c mi_rlast.c mi_rsame.c \ -+ mi_rsamepos.c mi_panic.c mi_close.c mi_create.c\ -+ mi_range.c mi_dbug.c mi_checksum.c mi_log.c \ -+ mi_changed.c mi_static.c mi_delete_all.c \ -+ mi_delete_table.c mi_rename.c mi_check.c \ -+ ft_parser.c ft_search.c ft_stopwords.c ft_static.c \ -+ ft_update.c sort.c - - CLEANFILES = test?.MY? FT?.MY? isam.log mi_test_all - DEFS = -DMAP_TO_USE_RAID - # Omit dependency for ../mit-pthreads/include/sys that only exits if - # mit-pthreads are used --OMIT_DEPENDENCIES = pthread.h stdio.h __stdio.h stdlib.h __stdlib.h math.h __math.h time.h __time.h unistd.h __unistd.h types.h xtypes.h ac-types.h posix.h string.h __string.h errno.h socket.h inet.h dirent.h netdb.h cleanup.h cond.h debug_out.h fd.h kernel.h mutex.h prio_queue.h pthread_attr.h pthread_once.h queue.h sleep.h specific.h version.h pwd.h timers.h uio.h cdefs.h machdep.h signal.h __signal.h util.h wait.h -+OMIT_DEPENDENCIES = pthread.h stdio.h __stdio.h stdlib.h __stdlib.h math.h\ -+ __math.h time.h __time.h unistd.h __unistd.h types.h \ -+ xtypes.h ac-types.h posix.h string.h __string.h \ -+ errno.h socket.h inet.h dirent.h netdb.h \ -+ cleanup.h cond.h debug_out.h fd.h kernel.h mutex.h \ -+ prio_queue.h pthread_attr.h pthread_once.h queue.h\ -+ sleep.h specific.h version.h pwd.h timers.h uio.h \ -+ cdefs.h machdep.h signal.h __signal.h util.h \ -+ wait.h - - - SUFFIXES = .sh -+subdir = myisam - mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs - CONFIG_HEADER = ../config.h - CONFIG_CLEAN_FILES = -@@ -204,8 +235,9 @@ - CPPFLAGS = @CPPFLAGS@ - LDFLAGS = @LDFLAGS@ - LIBS = @LIBS@ -+libmyisam_a_AR = $(AR) cru - libmyisam_a_LIBADD = --libmyisam_a_OBJECTS = mi_open.o mi_extra.o mi_info.o mi_rkey.o \ -+am_libmyisam_a_OBJECTS = mi_open.o mi_extra.o mi_info.o mi_rkey.o \ - mi_rnext.o mi_rnext_same.o mi_search.o mi_page.o mi_key.o mi_locking.o \ - mi_rrnd.o mi_scan.o mi_cache.o mi_statrec.o mi_packrec.o mi_dynrec.o \ - mi_update.o mi_write.o mi_unique.o mi_delete.o mi_rprev.o mi_rfirst.o \ -@@ -213,21 +245,18 @@ - mi_range.o mi_dbug.o mi_checksum.o mi_log.o mi_changed.o mi_static.o \ - mi_delete_all.o mi_delete_table.o mi_rename.o mi_check.o ft_parser.o \ - ft_search.o ft_stopwords.o ft_static.o ft_update.o sort.o -+libmyisam_a_OBJECTS = $(am_libmyisam_a_OBJECTS) - AR = ar - PROGRAMS = $(bin_PROGRAMS) $(noinst_PROGRAMS) - --myisamchk_SOURCES = myisamchk.c --myisamchk_OBJECTS = myisamchk.o --myisamchk_LDADD = $(LDADD) --myisamchk_LDFLAGS = --myisamlog_SOURCES = myisamlog.c --myisamlog_OBJECTS = myisamlog.o --myisamlog_LDADD = $(LDADD) --myisamlog_LDFLAGS = --myisampack_SOURCES = myisampack.c --myisampack_OBJECTS = myisampack.o --myisampack_LDADD = $(LDADD) --myisampack_LDFLAGS = -+ft_eval_SOURCES = ft_eval.c -+ft_eval_OBJECTS = ft_eval.o -+ft_eval_LDADD = $(LDADD) -+ft_eval_LDFLAGS = -+ft_test1_SOURCES = ft_test1.c -+ft_test1_OBJECTS = ft_test1.o -+ft_test1_LDADD = $(LDADD) -+ft_test1_LDFLAGS = - mi_test1_SOURCES = mi_test1.c - mi_test1_OBJECTS = mi_test1.o - mi_test1_LDADD = $(LDADD) -@@ -240,41 +269,72 @@ - mi_test3_OBJECTS = mi_test3.o - mi_test3_LDADD = $(LDADD) - mi_test3_LDFLAGS = --ft_test1_SOURCES = ft_test1.c --ft_test1_OBJECTS = ft_test1.o --ft_test1_LDADD = $(LDADD) --ft_test1_LDFLAGS = --ft_eval_SOURCES = ft_eval.c --ft_eval_OBJECTS = ft_eval.o --ft_eval_LDADD = $(LDADD) --ft_eval_LDFLAGS = -+myisamchk_SOURCES = myisamchk.c -+myisamchk_OBJECTS = myisamchk.o -+myisamchk_LDADD = $(LDADD) -+myisamchk_LDFLAGS = -+myisamlog_SOURCES = myisamlog.c -+myisamlog_OBJECTS = myisamlog.o -+myisamlog_LDADD = $(LDADD) -+myisamlog_LDFLAGS = -+myisampack_SOURCES = myisampack.c -+myisampack_OBJECTS = myisampack.o -+myisampack_LDADD = $(LDADD) -+myisampack_LDFLAGS = - COMPILE = $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) - LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) - CCLD = $(CC) --LINK = $(LIBTOOL) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(LDFLAGS) -o $@ -+LINK = $(LIBTOOL) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@ -+DIST_SOURCES = $(libmyisam_a_SOURCES) ft_eval.c ft_test1.c mi_test1.c \ -+mi_test2.c mi_test3.c myisamchk.c myisamlog.c myisampack.c - DATA = $(pkgdata_DATA) - - HEADERS = $(noinst_HEADERS) - --DIST_COMMON = ChangeLog Makefile.am Makefile.in NEWS TODO -+depcomp = $(SHELL) $(top_srcdir)/depcomp -+@AMDEP@DEP_FILES = $(DEPDIR)/ft_eval.Po $(DEPDIR)/ft_parser.Po \ -+@AMDEP@$(DEPDIR)/ft_search.Po $(DEPDIR)/ft_static.Po \ -+@AMDEP@$(DEPDIR)/ft_stopwords.Po $(DEPDIR)/ft_test1.Po \ -+@AMDEP@$(DEPDIR)/ft_update.Po $(DEPDIR)/mi_cache.Po \ -+@AMDEP@$(DEPDIR)/mi_changed.Po $(DEPDIR)/mi_check.Po \ -+@AMDEP@$(DEPDIR)/mi_checksum.Po $(DEPDIR)/mi_close.Po \ -+@AMDEP@$(DEPDIR)/mi_create.Po $(DEPDIR)/mi_dbug.Po \ -+@AMDEP@$(DEPDIR)/mi_delete.Po $(DEPDIR)/mi_delete_all.Po \ -+@AMDEP@$(DEPDIR)/mi_delete_table.Po $(DEPDIR)/mi_dynrec.Po \ -+@AMDEP@$(DEPDIR)/mi_extra.Po $(DEPDIR)/mi_info.Po $(DEPDIR)/mi_key.Po \ -+@AMDEP@$(DEPDIR)/mi_locking.Po $(DEPDIR)/mi_log.Po $(DEPDIR)/mi_open.Po \ -+@AMDEP@$(DEPDIR)/mi_packrec.Po $(DEPDIR)/mi_page.Po \ -+@AMDEP@$(DEPDIR)/mi_panic.Po $(DEPDIR)/mi_range.Po \ -+@AMDEP@$(DEPDIR)/mi_rename.Po $(DEPDIR)/mi_rfirst.Po \ -+@AMDEP@$(DEPDIR)/mi_rkey.Po $(DEPDIR)/mi_rlast.Po $(DEPDIR)/mi_rnext.Po \ -+@AMDEP@$(DEPDIR)/mi_rnext_same.Po $(DEPDIR)/mi_rprev.Po \ -+@AMDEP@$(DEPDIR)/mi_rrnd.Po $(DEPDIR)/mi_rsame.Po \ -+@AMDEP@$(DEPDIR)/mi_rsamepos.Po $(DEPDIR)/mi_scan.Po \ -+@AMDEP@$(DEPDIR)/mi_search.Po $(DEPDIR)/mi_static.Po \ -+@AMDEP@$(DEPDIR)/mi_statrec.Po $(DEPDIR)/mi_test1.Po \ -+@AMDEP@$(DEPDIR)/mi_test2.Po $(DEPDIR)/mi_test3.Po \ -+@AMDEP@$(DEPDIR)/mi_unique.Po $(DEPDIR)/mi_update.Po \ -+@AMDEP@$(DEPDIR)/mi_write.Po $(DEPDIR)/myisamchk.Po \ -+@AMDEP@$(DEPDIR)/myisamlog.Po $(DEPDIR)/myisampack.Po $(DEPDIR)/sort.Po -+DIST_COMMON = $(noinst_HEADERS) ChangeLog Makefile.am Makefile.in NEWS \ -+TODO - - --DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST) -+DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) - --TAR = gtar - GZIP_ENV = --best --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 -+SOURCES = $(libmyisam_a_SOURCES) ft_eval.c ft_test1.c mi_test1.c mi_test2.c mi_test3.c myisamchk.c myisamlog.c myisampack.c -+OBJECTS = $(am_libmyisam_a_OBJECTS) ft_eval.o ft_test1.o mi_test1.o mi_test2.o mi_test3.o myisamchk.o myisamlog.o myisampack.o - --all: all-redirect -+all: all-am - .SUFFIXES: --.SUFFIXES: .S .c .lo .o .s .sh -+.SUFFIXES: .sh .c .lo .o - $(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 - cd $(top_builddir) \ -- && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status -+ && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= CONFIG_LINKS= $(SHELL) ./config.status - - - mostlyclean-pkglibLIBRARIES: -@@ -305,38 +365,17 @@ - - uninstall-pkglibLIBRARIES: - @$(NORMAL_UNINSTALL) -- list='$(pkglib_LIBRARIES)'; for p in $$list; do \ -+ @list='$(pkglib_LIBRARIES)'; for p in $$list; do \ -+ echo " rm -f $(DESTDIR)$(pkglibdir)/$$p"; \ - rm -f $(DESTDIR)$(pkglibdir)/$$p; \ - done - --.c.o: -- $(COMPILE) -c $< -- --.s.o: -- $(COMPILE) -c $< -- --.S.o: -- $(COMPILE) -c $< -- - mostlyclean-compile: - -rm -f *.o core *.core - --clean-compile: -- - distclean-compile: - -rm -f *.tab.c - --maintainer-clean-compile: -- --.c.lo: -- $(LIBTOOL) --mode=compile $(COMPILE) -c $< -- --.s.lo: -- $(LIBTOOL) --mode=compile $(COMPILE) -c $< -- --.S.lo: -- $(LIBTOOL) --mode=compile $(COMPILE) -c $< -- - mostlyclean-libtool: - -rm -f *.lo - -@@ -344,12 +383,11 @@ - -rm -rf .libs _libs - - distclean-libtool: -- --maintainer-clean-libtool: -+ -rm -f libtool - - libmyisam.a: $(libmyisam_a_OBJECTS) $(libmyisam_a_DEPENDENCIES) - -rm -f libmyisam.a -- $(AR) cru libmyisam.a $(libmyisam_a_OBJECTS) $(libmyisam_a_LIBADD) -+ $(libmyisam_a_AR) libmyisam.a $(libmyisam_a_OBJECTS) $(libmyisam_a_LIBADD) - $(RANLIB) libmyisam.a - - mostlyclean-binPROGRAMS: -@@ -366,15 +404,18 @@ - $(mkinstalldirs) $(DESTDIR)$(bindir) - @list='$(bin_PROGRAMS)'; for p in $$list; do \ - if test -f $$p; then \ -- echo " $(LIBTOOL) --mode=install $(INSTALL_PROGRAM) $$p $(DESTDIR)$(bindir)/`echo $$p|sed 's/$(EXEEXT)$$//'|sed '$(transform)'|sed 's/$$/$(EXEEXT)/'`"; \ -- $(LIBTOOL) --mode=install $(INSTALL_PROGRAM) $$p $(DESTDIR)$(bindir)/`echo $$p|sed 's/$(EXEEXT)$$//'|sed '$(transform)'|sed 's/$$/$(EXEEXT)/'`; \ -+ f="`echo $$p|sed -e 's/$(EXEEXT)$$//' -e '$(transform)' -e 's/$$/$(EXEEXT)/'`"; \ -+ echo " $(LIBTOOL) --mode=install $(INSTALL_PROGRAM) $(INSTALL_STRIP_FLAG) $$p $(DESTDIR)$(bindir)/$$f"; \ -+ $(LIBTOOL) --mode=install $(INSTALL_PROGRAM) $(INSTALL_STRIP_FLAG) $$p $(DESTDIR)$(bindir)/$$f; \ - else :; fi; \ - done - - uninstall-binPROGRAMS: - @$(NORMAL_UNINSTALL) -- list='$(bin_PROGRAMS)'; for p in $$list; do \ -- rm -f $(DESTDIR)$(bindir)/`echo $$p|sed 's/$(EXEEXT)$$//'|sed '$(transform)'|sed 's/$$/$(EXEEXT)/'`; \ -+ @list='$(bin_PROGRAMS)'; for p in $$list; do \ -+ f="`echo $$p|sed -e 's/$(EXEEXT)$$//' -e '$(transform)' -e 's/$$/$(EXEEXT)/'`"; \ -+ echo " rm -f $(DESTDIR)$(bindir)/$$f"; \ -+ rm -f $(DESTDIR)$(bindir)/$$f; \ - done - - mostlyclean-noinstPROGRAMS: -@@ -386,17 +427,13 @@ - - maintainer-clean-noinstPROGRAMS: - --myisamchk: $(myisamchk_OBJECTS) $(myisamchk_DEPENDENCIES) -- @rm -f myisamchk -- $(LINK) $(myisamchk_LDFLAGS) $(myisamchk_OBJECTS) $(myisamchk_LDADD) $(LIBS) -- --myisamlog: $(myisamlog_OBJECTS) $(myisamlog_DEPENDENCIES) -- @rm -f myisamlog -- $(LINK) $(myisamlog_LDFLAGS) $(myisamlog_OBJECTS) $(myisamlog_LDADD) $(LIBS) -+ft_eval: $(ft_eval_OBJECTS) $(ft_eval_DEPENDENCIES) -+ @rm -f ft_eval -+ $(LINK) $(ft_eval_LDFLAGS) $(ft_eval_OBJECTS) $(ft_eval_LDADD) $(LIBS) - --myisampack: $(myisampack_OBJECTS) $(myisampack_DEPENDENCIES) -- @rm -f myisampack -- $(LINK) $(myisampack_LDFLAGS) $(myisampack_OBJECTS) $(myisampack_LDADD) $(LIBS) -+ft_test1: $(ft_test1_OBJECTS) $(ft_test1_DEPENDENCIES) -+ @rm -f ft_test1 -+ $(LINK) $(ft_test1_LDFLAGS) $(ft_test1_OBJECTS) $(ft_test1_LDADD) $(LIBS) - - mi_test1: $(mi_test1_OBJECTS) $(mi_test1_DEPENDENCIES) - @rm -f mi_test1 -@@ -410,569 +447,154 @@ - @rm -f mi_test3 - $(LINK) $(mi_test3_LDFLAGS) $(mi_test3_OBJECTS) $(mi_test3_LDADD) $(LIBS) - --ft_test1: $(ft_test1_OBJECTS) $(ft_test1_DEPENDENCIES) -- @rm -f ft_test1 -- $(LINK) $(ft_test1_LDFLAGS) $(ft_test1_OBJECTS) $(ft_test1_LDADD) $(LIBS) -+myisamchk: $(myisamchk_OBJECTS) $(myisamchk_DEPENDENCIES) -+ @rm -f myisamchk -+ $(LINK) $(myisamchk_LDFLAGS) $(myisamchk_OBJECTS) $(myisamchk_LDADD) $(LIBS) - --ft_eval: $(ft_eval_OBJECTS) $(ft_eval_DEPENDENCIES) -- @rm -f ft_eval -- $(LINK) $(ft_eval_LDFLAGS) $(ft_eval_OBJECTS) $(ft_eval_LDADD) $(LIBS) -+myisamlog: $(myisamlog_OBJECTS) $(myisamlog_DEPENDENCIES) -+ @rm -f myisamlog -+ $(LINK) $(myisamlog_LDFLAGS) $(myisamlog_OBJECTS) $(myisamlog_LDADD) $(LIBS) -+ -+myisampack: $(myisampack_OBJECTS) $(myisampack_DEPENDENCIES) -+ @rm -f myisampack -+ $(LINK) $(myisampack_LDFLAGS) $(myisampack_OBJECTS) $(myisampack_LDADD) $(LIBS) - - install-pkgdataDATA: $(pkgdata_DATA) - @$(NORMAL_INSTALL) - $(mkinstalldirs) $(DESTDIR)$(pkgdatadir) - @list='$(pkgdata_DATA)'; for p in $$list; do \ -- if test -f $(srcdir)/$$p; then \ -- echo " $(INSTALL_DATA) $(srcdir)/$$p $(DESTDIR)$(pkgdatadir)/$$p"; \ -- $(INSTALL_DATA) $(srcdir)/$$p $(DESTDIR)$(pkgdatadir)/$$p; \ -- else if test -f $$p; then \ -- echo " $(INSTALL_DATA) $$p $(DESTDIR)$(pkgdatadir)/$$p"; \ -- $(INSTALL_DATA) $$p $(DESTDIR)$(pkgdatadir)/$$p; \ -- fi; fi; \ -+ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ -+ f="`echo $$p | sed -e 's|^.*/||'`"; \ -+ echo " $(INSTALL_DATA) $$d$$p $(DESTDIR)$(pkgdatadir)/$$f"; \ -+ $(INSTALL_DATA) $$d$$p $(DESTDIR)$(pkgdatadir)/$$f; \ - done - - uninstall-pkgdataDATA: - @$(NORMAL_UNINSTALL) -- list='$(pkgdata_DATA)'; for p in $$list; do \ -- rm -f $(DESTDIR)$(pkgdatadir)/$$p; \ -+ @list='$(pkgdata_DATA)'; for p in $$list; do \ -+ f="`echo $$p | sed -e 's|^.*/||'`"; \ -+ echo " rm -f $(DESTDIR)$(pkgdatadir)/$$f"; \ -+ rm -f $(DESTDIR)$(pkgdatadir)/$$f; \ - done - - tags: TAGS - --ID: $(HEADERS) $(SOURCES) $(LISP) -- list='$(SOURCES) $(HEADERS)'; \ -- unique=`for i in $$list; do echo $$i; done | \ -- awk ' { files[$$0] = 1; } \ -+ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) -+ list='$(SOURCES) $(HEADERS) $(TAGS_FILES)'; \ -+ unique=`for i in $$list; do \ -+ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ -+ done | \ -+ $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ -- here=`pwd` && cd $(srcdir) \ -- && mkid -f$$here/ID $$unique $(LISP) -+ mkid -fID $$unique $(LISP) - --TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) $(LISP) -+TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ -+ $(TAGS_FILES) $(LISP) - tags=; \ - here=`pwd`; \ -- list='$(SOURCES) $(HEADERS)'; \ -- unique=`for i in $$list; do echo $$i; done | \ -- awk ' { files[$$0] = 1; } \ -+ list='$(SOURCES) $(HEADERS) $(TAGS_FILES)'; \ -+ unique=`for i in $$list; do \ -+ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ -+ done | \ -+ $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ - test -z "$(ETAGS_ARGS)$$unique$(LISP)$$tags" \ -- || (cd $(srcdir) && etags $(ETAGS_ARGS) $$tags $$unique $(LISP) -o $$here/TAGS) -+ || etags $(ETAGS_ARGS) $$tags $$unique $(LISP) - --mostlyclean-tags: -- --clean-tags: -+GTAGS: -+ here=`CDPATH=: && cd $(top_builddir) && pwd` \ -+ && cd $(top_srcdir) \ -+ && gtags -i $$here - - distclean-tags: - -rm -f TAGS ID - --maintainer-clean-tags: -+@AMDEP@@_am_include@ $(DEPDIR)/ft_eval.Po -+@AMDEP@@_am_include@ $(DEPDIR)/ft_parser.Po -+@AMDEP@@_am_include@ $(DEPDIR)/ft_search.Po -+@AMDEP@@_am_include@ $(DEPDIR)/ft_static.Po -+@AMDEP@@_am_include@ $(DEPDIR)/ft_stopwords.Po -+@AMDEP@@_am_include@ $(DEPDIR)/ft_test1.Po -+@AMDEP@@_am_include@ $(DEPDIR)/ft_update.Po -+@AMDEP@@_am_include@ $(DEPDIR)/mi_cache.Po -+@AMDEP@@_am_include@ $(DEPDIR)/mi_changed.Po -+@AMDEP@@_am_include@ $(DEPDIR)/mi_check.Po -+@AMDEP@@_am_include@ $(DEPDIR)/mi_checksum.Po -+@AMDEP@@_am_include@ $(DEPDIR)/mi_close.Po -+@AMDEP@@_am_include@ $(DEPDIR)/mi_create.Po -+@AMDEP@@_am_include@ $(DEPDIR)/mi_dbug.Po -+@AMDEP@@_am_include@ $(DEPDIR)/mi_delete.Po -+@AMDEP@@_am_include@ $(DEPDIR)/mi_delete_all.Po -+@AMDEP@@_am_include@ $(DEPDIR)/mi_delete_table.Po -+@AMDEP@@_am_include@ $(DEPDIR)/mi_dynrec.Po -+@AMDEP@@_am_include@ $(DEPDIR)/mi_extra.Po -+@AMDEP@@_am_include@ $(DEPDIR)/mi_info.Po -+@AMDEP@@_am_include@ $(DEPDIR)/mi_key.Po -+@AMDEP@@_am_include@ $(DEPDIR)/mi_locking.Po -+@AMDEP@@_am_include@ $(DEPDIR)/mi_log.Po -+@AMDEP@@_am_include@ $(DEPDIR)/mi_open.Po -+@AMDEP@@_am_include@ $(DEPDIR)/mi_packrec.Po -+@AMDEP@@_am_include@ $(DEPDIR)/mi_page.Po -+@AMDEP@@_am_include@ $(DEPDIR)/mi_panic.Po -+@AMDEP@@_am_include@ $(DEPDIR)/mi_range.Po -+@AMDEP@@_am_include@ $(DEPDIR)/mi_rename.Po -+@AMDEP@@_am_include@ $(DEPDIR)/mi_rfirst.Po -+@AMDEP@@_am_include@ $(DEPDIR)/mi_rkey.Po -+@AMDEP@@_am_include@ $(DEPDIR)/mi_rlast.Po -+@AMDEP@@_am_include@ $(DEPDIR)/mi_rnext.Po -+@AMDEP@@_am_include@ $(DEPDIR)/mi_rnext_same.Po -+@AMDEP@@_am_include@ $(DEPDIR)/mi_rprev.Po -+@AMDEP@@_am_include@ $(DEPDIR)/mi_rrnd.Po -+@AMDEP@@_am_include@ $(DEPDIR)/mi_rsame.Po -+@AMDEP@@_am_include@ $(DEPDIR)/mi_rsamepos.Po -+@AMDEP@@_am_include@ $(DEPDIR)/mi_scan.Po -+@AMDEP@@_am_include@ $(DEPDIR)/mi_search.Po -+@AMDEP@@_am_include@ $(DEPDIR)/mi_static.Po -+@AMDEP@@_am_include@ $(DEPDIR)/mi_statrec.Po -+@AMDEP@@_am_include@ $(DEPDIR)/mi_test1.Po -+@AMDEP@@_am_include@ $(DEPDIR)/mi_test2.Po -+@AMDEP@@_am_include@ $(DEPDIR)/mi_test3.Po -+@AMDEP@@_am_include@ $(DEPDIR)/mi_unique.Po -+@AMDEP@@_am_include@ $(DEPDIR)/mi_update.Po -+@AMDEP@@_am_include@ $(DEPDIR)/mi_write.Po -+@AMDEP@@_am_include@ $(DEPDIR)/myisamchk.Po -+@AMDEP@@_am_include@ $(DEPDIR)/myisamlog.Po -+@AMDEP@@_am_include@ $(DEPDIR)/myisampack.Po -+@AMDEP@@_am_include@ $(DEPDIR)/sort.Po -+ -+distclean-depend: -+ -rm -rf $(DEPDIR) -+ -+@AMDEP@CCDEPMODE = @CCDEPMODE@ -+ -+.c.o: -+@AMDEP@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ -+@AMDEP@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@ -+@AMDEP@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -+ $(COMPILE) -c -o $@ `test -f $< || echo '$(srcdir)/'`$< -+ -+.c.lo: -+@AMDEP@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ -+@AMDEP@ depfile='$(DEPDIR)/$*.Plo' tmpdepfile='$(DEPDIR)/$*.TPlo' @AMDEPBACKSLASH@ -+@AMDEP@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -+ $(LTCOMPILE) -c -o $@ `test -f $< || echo '$(srcdir)/'`$< -+ - - distdir = $(top_builddir)/$(PACKAGE)-$(VERSION)/$(subdir) - --subdir = myisam - - distdir: $(DISTFILES) - @for file in $(DISTFILES); do \ - d=$(srcdir); \ - if test -d $$d/$$file; then \ -- cp -pr $$d/$$file $(distdir)/$$file; \ -+ cp -pR $$d/$$file $(distdir) \ -+ || exit 1; \ - else \ - test -f $(distdir)/$$file \ -- || ln $$d/$$file $(distdir)/$$file 2> /dev/null \ -- || cp -p $$d/$$file $(distdir)/$$file || :; \ -+ || cp -p $$d/$$file $(distdir)/$$file \ -+ || exit 1; \ - 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 -- - info-am: - info: info-am - dvi-am: -@@ -994,9 +616,8 @@ - uninstall-pkgdataDATA - uninstall: uninstall-am - all-am: Makefile $(LIBRARIES) $(PROGRAMS) $(DATA) $(HEADERS) --all-redirect: all-am - install-strip: -- $(MAKE) $(AM_MAKEFLAGS) AM_INSTALL_PROGRAM_FLAGS=-s install -+ $(MAKE) $(AM_MAKEFLAGS) INSTALL_STRIP_FLAG=-s install - installdirs: - $(mkinstalldirs) $(DESTDIR)$(pkglibdir) $(DESTDIR)$(bindir) \ - $(DESTDIR)$(pkgdatadir) -@@ -1012,53 +633,51 @@ - -rm -f config.cache config.log stamp-h stamp-h[0-9]* - - maintainer-clean-generic: --mostlyclean-am: mostlyclean-pkglibLIBRARIES mostlyclean-compile \ -- mostlyclean-libtool mostlyclean-binPROGRAMS \ -- mostlyclean-noinstPROGRAMS mostlyclean-tags \ -- mostlyclean-generic -- --mostlyclean: mostlyclean-am -- --clean-am: clean-pkglibLIBRARIES clean-compile clean-libtool \ -- clean-binPROGRAMS clean-noinstPROGRAMS clean-tags \ -- clean-generic mostlyclean-am -- -+ @echo "This command is intended for maintainers to use" -+ @echo "it deletes files that may require special tools to rebuild." -+ -rm -f Makefile.in - clean: clean-am - --distclean-am: distclean-pkglibLIBRARIES distclean-compile \ -- distclean-libtool distclean-binPROGRAMS \ -- distclean-noinstPROGRAMS distclean-tags \ -- distclean-generic clean-am -- -rm -f libtool -+clean-am: clean-binPROGRAMS clean-generic clean-libtool \ -+ clean-noinstPROGRAMS clean-pkglibLIBRARIES mostlyclean-am - - distclean: distclean-am - --maintainer-clean-am: maintainer-clean-pkglibLIBRARIES \ -- maintainer-clean-compile maintainer-clean-libtool \ -- maintainer-clean-binPROGRAMS \ -- maintainer-clean-noinstPROGRAMS maintainer-clean-tags \ -- 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." -+distclean-am: clean-am distclean-binPROGRAMS distclean-compile \ -+ distclean-depend distclean-generic distclean-libtool \ -+ distclean-noinstPROGRAMS distclean-pkglibLIBRARIES \ -+ distclean-tags - - maintainer-clean: maintainer-clean-am - --.PHONY: mostlyclean-pkglibLIBRARIES distclean-pkglibLIBRARIES \ --clean-pkglibLIBRARIES maintainer-clean-pkglibLIBRARIES \ --uninstall-pkglibLIBRARIES install-pkglibLIBRARIES mostlyclean-compile \ --distclean-compile clean-compile maintainer-clean-compile \ --mostlyclean-libtool distclean-libtool clean-libtool \ --maintainer-clean-libtool mostlyclean-binPROGRAMS distclean-binPROGRAMS \ --clean-binPROGRAMS maintainer-clean-binPROGRAMS uninstall-binPROGRAMS \ --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 -+maintainer-clean-am: distclean-am maintainer-clean-binPROGRAMS \ -+ maintainer-clean-generic maintainer-clean-noinstPROGRAMS \ -+ maintainer-clean-pkglibLIBRARIES -+ -+mostlyclean: mostlyclean-am -+ -+mostlyclean-am: mostlyclean-binPROGRAMS mostlyclean-compile \ -+ mostlyclean-generic mostlyclean-libtool \ -+ mostlyclean-noinstPROGRAMS mostlyclean-pkglibLIBRARIES -+ -+.PHONY: check check-am clean clean-binPROGRAMS clean-generic \ -+ clean-libtool clean-noinstPROGRAMS clean-pkglibLIBRARIES \ -+ distclean distclean-binPROGRAMS distclean-compile \ -+ distclean-depend distclean-generic distclean-libtool \ -+ distclean-noinstPROGRAMS distclean-pkglibLIBRARIES \ -+ distclean-tags distdir dvi dvi-am info info-am install \ -+ install-am install-binPROGRAMS install-data install-data-am \ -+ install-exec install-exec-am install-pkgdataDATA \ -+ install-pkglibLIBRARIES install-strip installcheck \ -+ installcheck-am installdirs maintainer-clean \ -+ maintainer-clean-binPROGRAMS maintainer-clean-generic \ -+ maintainer-clean-noinstPROGRAMS \ -+ maintainer-clean-pkglibLIBRARIES mostlyclean \ -+ mostlyclean-binPROGRAMS mostlyclean-compile mostlyclean-generic \ -+ mostlyclean-libtool mostlyclean-noinstPROGRAMS \ -+ mostlyclean-pkglibLIBRARIES tags uninstall uninstall-am \ -+ uninstall-binPROGRAMS uninstall-pkgdataDATA \ -+ uninstall-pkglibLIBRARIES - - - # Move to automake rules ? -diff -r -N -U3 mysql-3.23.32.orig/myisammrg/Makefile.in mysql-3.23.32/myisammrg/Makefile.in ---- mysql-3.23.32.orig/myisammrg/Makefile.in Mon Jan 22 14:44:11 2001 -+++ mysql-3.23.32/myisammrg/Makefile.in Thu Mar 1 17:00:57 2001 -@@ -1,6 +1,7 @@ --# Makefile.in generated automatically by automake 1.4 from Makefile.am -+# Makefile.in generated automatically by automake 1.4d from Makefile.am - --# Copyright (C) 1994, 1995-8, 1999 Free Software Foundation, Inc. -+# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001 -+# Free Software Foundation, Inc. - # This Makefile.in is free software; the Free Software Foundation - # gives unlimited permission to copy and/or distribute it, - # with or without modifications, as long as this notice is preserved. -@@ -10,23 +11,6 @@ - # even the implied warranty of MERCHANTABILITY or FITNESS FOR A - # PARTICULAR PURPOSE. - --# Copyright (C) 2000 MySQL AB & MySQL Finland AB & TCX DataKonsult AB --# --# This program is free software; you can redistribute it and/or modify --# it under the terms of the GNU General Public License as published by --# the Free Software Foundation; either version 2 of the License, or --# (at your option) any later version. --# --# This program is distributed in the hope that it will be useful, --# but WITHOUT ANY WARRANTY; without even the implied warranty of --# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the --# GNU General Public License for more details. --# --# You should have received a copy of the GNU General Public License --# along with this program; if not, write to the Free Software --# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -- -- - SHELL = @SHELL@ - - srcdir = @srcdir@ -@@ -48,8 +32,6 @@ - includedir = @includedir@ - oldincludedir = /usr/include - --DESTDIR = -- - pkgdatadir = $(datadir)/@PACKAGE@ - pkglibdir = $(libdir)/@PACKAGE@ - pkgincludedir = $(includedir)/@PACKAGE@ -@@ -62,9 +44,11 @@ - AUTOHEADER = @AUTOHEADER@ - - INSTALL = @INSTALL@ --INSTALL_PROGRAM = @INSTALL_PROGRAM@ $(AM_INSTALL_PROGRAM_FLAGS) -+INSTALL_PROGRAM = @INSTALL_PROGRAM@ - INSTALL_DATA = @INSTALL_DATA@ - INSTALL_SCRIPT = @INSTALL_SCRIPT@ -+INSTALL_STRIP_FLAG = -+INSTALL_HEADER = $(INSTALL_DATA) - transform = @program_transform_name@ - - NORMAL_INSTALL = : -@@ -73,6 +57,8 @@ - NORMAL_UNINSTALL = : - PRE_UNINSTALL = : - POST_UNINSTALL = : -+ -+@SET_MAKE@ - build_alias = @build_alias@ - build_triplet = @build@ - host_alias = @host_alias@ -@@ -80,6 +66,8 @@ - target_alias = @target_alias@ - target_triplet = @target@ - ALLOCA = @ALLOCA@ -+AMDEP = @AMDEP@ -+AMTAR = @AMTAR@ - AS = @AS@ - AVAILABLE_LANGUAGES = @AVAILABLE_LANGUAGES@ - AVAILABLE_LANGUAGES_ERRORS = @AVAILABLE_LANGUAGES_ERRORS@ -@@ -101,6 +89,7 @@ - CXX = @CXX@ - CXXFLAGS = @CXXFLAGS@ - CXXLDFLAGS = @CXXLDFLAGS@ -+DEPDIR = @DEPDIR@ - DLLTOOL = @DLLTOOL@ - DOT_FRM_VERSION = @DOT_FRM_VERSION@ - FIND_PROC = @FIND_PROC@ -@@ -154,11 +143,13 @@ - VERSION = @VERSION@ - WRAPLIBS = @WRAPLIBS@ - YACC = @YACC@ -+_am_include = @_am_include@ - bdb_includes = @bdb_includes@ - bdb_libs = @bdb_libs@ - bench_dirs = @bench_dirs@ - default_charset = @default_charset@ - docs_dirs = @docs_dirs@ -+install_sh = @install_sh@ - linked_client_targets = @linked_client_targets@ - readline_dir = @readline_dir@ - readline_link = @readline_link@ -@@ -168,13 +159,42 @@ - thread_dirs = @thread_dirs@ - uname_prog = @uname_prog@ - -+# Copyright (C) 2000 MySQL AB & MySQL Finland AB & TCX DataKonsult AB -+# -+# This program is free software; you can redistribute it and/or modify -+# it under the terms of the GNU General Public License as published by -+# the Free Software Foundation; either version 2 of the License, or -+# (at your option) any later version. -+# -+# This program is distributed in the hope that it will be useful, -+# but WITHOUT ANY WARRANTY; without even the implied warranty of -+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -+# GNU General Public License for more details. -+# -+# You should have received a copy of the GNU General Public License -+# along with this program; if not, write to the Free Software -+# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -+ -+ - INCLUDES = @MT_INCLUDES@ -I$(srcdir)/../include -I../include - pkglib_LIBRARIES = libmyisammrg.a - noinst_HEADERS = mymrgdef.h --libmyisammrg_a_SOURCES = myrg_open.c myrg_extra.c myrg_info.c myrg_locking.c myrg_rrnd.c myrg_update.c myrg_delete.c myrg_rsame.c myrg_panic.c myrg_close.c myrg_create.c myrg_static.c myrg_rkey.c myrg_rfirst.c myrg_rlast.c myrg_rnext.c myrg_rprev.c myrg_queue.c -- --OMIT_DEPENDENCIES = pthread.h stdio.h __stdio.h stdlib.h __stdlib.h math.h __math.h time.h __time.h unistd.h __unistd.h types.h xtypes.h ac-types.h posix.h string.h __string.h errno.h socket.h inet.h dirent.h netdb.h cleanup.h cond.h debug_out.h fd.h kernel.h mutex.h prio_queue.h pthread_attr.h pthread_once.h queue.h sleep.h specific.h version.h pwd.h timers.h uio.h cdefs.h machdep.h signal.h __signal.h util.h -+libmyisammrg_a_SOURCES = myrg_open.c myrg_extra.c myrg_info.c myrg_locking.c \ -+ myrg_rrnd.c myrg_update.c myrg_delete.c myrg_rsame.c \ -+ myrg_panic.c myrg_close.c myrg_create.c myrg_static.c \ -+ myrg_rkey.c myrg_rfirst.c myrg_rlast.c myrg_rnext.c \ -+ myrg_rprev.c myrg_queue.c -+ -+OMIT_DEPENDENCIES = pthread.h stdio.h __stdio.h stdlib.h __stdlib.h math.h\ -+ __math.h time.h __time.h unistd.h __unistd.h types.h \ -+ xtypes.h ac-types.h posix.h string.h __string.h \ -+ errno.h socket.h inet.h dirent.h netdb.h \ -+ cleanup.h cond.h debug_out.h fd.h kernel.h mutex.h \ -+ prio_queue.h pthread_attr.h pthread_once.h queue.h\ -+ sleep.h specific.h version.h pwd.h timers.h uio.h \ -+ cdefs.h machdep.h signal.h __signal.h util.h - -+subdir = myisammrg - mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs - CONFIG_HEADER = ../config.h - CONFIG_CLEAN_FILES = -@@ -185,37 +205,49 @@ - CPPFLAGS = @CPPFLAGS@ - LDFLAGS = @LDFLAGS@ - LIBS = @LIBS@ -+libmyisammrg_a_AR = $(AR) cru - libmyisammrg_a_LIBADD = --libmyisammrg_a_OBJECTS = myrg_open.o myrg_extra.o myrg_info.o \ -+am_libmyisammrg_a_OBJECTS = myrg_open.o myrg_extra.o myrg_info.o \ - myrg_locking.o myrg_rrnd.o myrg_update.o myrg_delete.o myrg_rsame.o \ - myrg_panic.o myrg_close.o myrg_create.o myrg_static.o myrg_rkey.o \ - myrg_rfirst.o myrg_rlast.o myrg_rnext.o myrg_rprev.o myrg_queue.o -+libmyisammrg_a_OBJECTS = $(am_libmyisammrg_a_OBJECTS) - AR = ar - COMPILE = $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) - LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) - CCLD = $(CC) --LINK = $(LIBTOOL) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(LDFLAGS) -o $@ -+LINK = $(LIBTOOL) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@ -+DIST_SOURCES = $(libmyisammrg_a_SOURCES) - HEADERS = $(noinst_HEADERS) - --DIST_COMMON = Makefile.am Makefile.in -+depcomp = $(SHELL) $(top_srcdir)/depcomp -+@AMDEP@DEP_FILES = $(DEPDIR)/myrg_close.Po $(DEPDIR)/myrg_create.Po \ -+@AMDEP@$(DEPDIR)/myrg_delete.Po $(DEPDIR)/myrg_extra.Po \ -+@AMDEP@$(DEPDIR)/myrg_info.Po $(DEPDIR)/myrg_locking.Po \ -+@AMDEP@$(DEPDIR)/myrg_open.Po $(DEPDIR)/myrg_panic.Po \ -+@AMDEP@$(DEPDIR)/myrg_queue.Po $(DEPDIR)/myrg_rfirst.Po \ -+@AMDEP@$(DEPDIR)/myrg_rkey.Po $(DEPDIR)/myrg_rlast.Po \ -+@AMDEP@$(DEPDIR)/myrg_rnext.Po $(DEPDIR)/myrg_rprev.Po \ -+@AMDEP@$(DEPDIR)/myrg_rrnd.Po $(DEPDIR)/myrg_rsame.Po \ -+@AMDEP@$(DEPDIR)/myrg_static.Po $(DEPDIR)/myrg_update.Po -+DIST_COMMON = $(noinst_HEADERS) Makefile.am Makefile.in - - --DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST) -+DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) - --TAR = gtar - GZIP_ENV = --best - SOURCES = $(libmyisammrg_a_SOURCES) --OBJECTS = $(libmyisammrg_a_OBJECTS) -+OBJECTS = $(am_libmyisammrg_a_OBJECTS) - --all: all-redirect -+all: all-am - .SUFFIXES: --.SUFFIXES: .S .c .lo .o .s -+.SUFFIXES: .c .lo .o - $(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 - cd $(top_builddir) \ -- && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status -+ && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= CONFIG_LINKS= $(SHELL) ./config.status - - - mostlyclean-pkglibLIBRARIES: -@@ -246,38 +278,17 @@ - - uninstall-pkglibLIBRARIES: - @$(NORMAL_UNINSTALL) -- list='$(pkglib_LIBRARIES)'; for p in $$list; do \ -+ @list='$(pkglib_LIBRARIES)'; for p in $$list; do \ -+ echo " rm -f $(DESTDIR)$(pkglibdir)/$$p"; \ - rm -f $(DESTDIR)$(pkglibdir)/$$p; \ - done - --.c.o: -- $(COMPILE) -c $< -- --.s.o: -- $(COMPILE) -c $< -- --.S.o: -- $(COMPILE) -c $< -- - mostlyclean-compile: - -rm -f *.o core *.core - --clean-compile: -- - distclean-compile: - -rm -f *.tab.c - --maintainer-clean-compile: -- --.c.lo: -- $(LIBTOOL) --mode=compile $(COMPILE) -c $< -- --.s.lo: -- $(LIBTOOL) --mode=compile $(COMPILE) -c $< -- --.S.lo: -- $(LIBTOOL) --mode=compile $(COMPILE) -c $< -- - mostlyclean-libtool: - -rm -f *.lo - -@@ -285,239 +296,97 @@ - -rm -rf .libs _libs - - distclean-libtool: -- --maintainer-clean-libtool: -+ -rm -f libtool - - libmyisammrg.a: $(libmyisammrg_a_OBJECTS) $(libmyisammrg_a_DEPENDENCIES) - -rm -f libmyisammrg.a -- $(AR) cru libmyisammrg.a $(libmyisammrg_a_OBJECTS) $(libmyisammrg_a_LIBADD) -+ $(libmyisammrg_a_AR) libmyisammrg.a $(libmyisammrg_a_OBJECTS) $(libmyisammrg_a_LIBADD) - $(RANLIB) libmyisammrg.a - - tags: TAGS - --ID: $(HEADERS) $(SOURCES) $(LISP) -- list='$(SOURCES) $(HEADERS)'; \ -- unique=`for i in $$list; do echo $$i; done | \ -- awk ' { files[$$0] = 1; } \ -+ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) -+ list='$(SOURCES) $(HEADERS) $(TAGS_FILES)'; \ -+ unique=`for i in $$list; do \ -+ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ -+ done | \ -+ $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ -- here=`pwd` && cd $(srcdir) \ -- && mkid -f$$here/ID $$unique $(LISP) -+ mkid -fID $$unique $(LISP) - --TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) $(LISP) -+TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ -+ $(TAGS_FILES) $(LISP) - tags=; \ - here=`pwd`; \ -- list='$(SOURCES) $(HEADERS)'; \ -- unique=`for i in $$list; do echo $$i; done | \ -- awk ' { files[$$0] = 1; } \ -+ list='$(SOURCES) $(HEADERS) $(TAGS_FILES)'; \ -+ unique=`for i in $$list; do \ -+ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ -+ done | \ -+ $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ - test -z "$(ETAGS_ARGS)$$unique$(LISP)$$tags" \ -- || (cd $(srcdir) && etags $(ETAGS_ARGS) $$tags $$unique $(LISP) -o $$here/TAGS) -- --mostlyclean-tags: -+ || etags $(ETAGS_ARGS) $$tags $$unique $(LISP) - --clean-tags: -+GTAGS: -+ here=`CDPATH=: && cd $(top_builddir) && pwd` \ -+ && cd $(top_srcdir) \ -+ && gtags -i $$here - - distclean-tags: - -rm -f TAGS ID - --maintainer-clean-tags: -+@AMDEP@@_am_include@ $(DEPDIR)/myrg_close.Po -+@AMDEP@@_am_include@ $(DEPDIR)/myrg_create.Po -+@AMDEP@@_am_include@ $(DEPDIR)/myrg_delete.Po -+@AMDEP@@_am_include@ $(DEPDIR)/myrg_extra.Po -+@AMDEP@@_am_include@ $(DEPDIR)/myrg_info.Po -+@AMDEP@@_am_include@ $(DEPDIR)/myrg_locking.Po -+@AMDEP@@_am_include@ $(DEPDIR)/myrg_open.Po -+@AMDEP@@_am_include@ $(DEPDIR)/myrg_panic.Po -+@AMDEP@@_am_include@ $(DEPDIR)/myrg_queue.Po -+@AMDEP@@_am_include@ $(DEPDIR)/myrg_rfirst.Po -+@AMDEP@@_am_include@ $(DEPDIR)/myrg_rkey.Po -+@AMDEP@@_am_include@ $(DEPDIR)/myrg_rlast.Po -+@AMDEP@@_am_include@ $(DEPDIR)/myrg_rnext.Po -+@AMDEP@@_am_include@ $(DEPDIR)/myrg_rprev.Po -+@AMDEP@@_am_include@ $(DEPDIR)/myrg_rrnd.Po -+@AMDEP@@_am_include@ $(DEPDIR)/myrg_rsame.Po -+@AMDEP@@_am_include@ $(DEPDIR)/myrg_static.Po -+@AMDEP@@_am_include@ $(DEPDIR)/myrg_update.Po -+ -+distclean-depend: -+ -rm -rf $(DEPDIR) -+ -+@AMDEP@CCDEPMODE = @CCDEPMODE@ -+ -+.c.o: -+@AMDEP@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ -+@AMDEP@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@ -+@AMDEP@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -+ $(COMPILE) -c -o $@ `test -f $< || echo '$(srcdir)/'`$< -+ -+.c.lo: -+@AMDEP@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ -+@AMDEP@ depfile='$(DEPDIR)/$*.Plo' tmpdepfile='$(DEPDIR)/$*.TPlo' @AMDEPBACKSLASH@ -+@AMDEP@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -+ $(LTCOMPILE) -c -o $@ `test -f $< || echo '$(srcdir)/'`$< -+ - - distdir = $(top_builddir)/$(PACKAGE)-$(VERSION)/$(subdir) - --subdir = myisammrg - - distdir: $(DISTFILES) - @for file in $(DISTFILES); do \ - d=$(srcdir); \ - if test -d $$d/$$file; then \ -- cp -pr $$d/$$file $(distdir)/$$file; \ -+ cp -pR $$d/$$file $(distdir) \ -+ || exit 1; \ - else \ - test -f $(distdir)/$$file \ -- || ln $$d/$$file $(distdir)/$$file 2> /dev/null \ -- || cp -p $$d/$$file $(distdir)/$$file || :; \ -+ || cp -p $$d/$$file $(distdir)/$$file \ -+ || exit 1; \ - 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 -- - info-am: - info: info-am - dvi-am: -@@ -538,9 +407,8 @@ - uninstall-am: uninstall-pkglibLIBRARIES - uninstall: uninstall-am - all-am: Makefile $(LIBRARIES) $(HEADERS) --all-redirect: all-am - install-strip: -- $(MAKE) $(AM_MAKEFLAGS) AM_INSTALL_PROGRAM_FLAGS=-s install -+ $(MAKE) $(AM_MAKEFLAGS) INSTALL_STRIP_FLAG=-s install - installdirs: - $(mkinstalldirs) $(DESTDIR)$(pkglibdir) - -@@ -554,45 +422,42 @@ - -rm -f config.cache config.log stamp-h stamp-h[0-9]* - - maintainer-clean-generic: --mostlyclean-am: mostlyclean-pkglibLIBRARIES mostlyclean-compile \ -- mostlyclean-libtool mostlyclean-tags \ -- mostlyclean-generic -- --mostlyclean: mostlyclean-am -- --clean-am: clean-pkglibLIBRARIES clean-compile clean-libtool clean-tags \ -- clean-generic mostlyclean-am -- -+ @echo "This command is intended for maintainers to use" -+ @echo "it deletes files that may require special tools to rebuild." -+ -rm -f Makefile.in - clean: clean-am - --distclean-am: distclean-pkglibLIBRARIES distclean-compile \ -- distclean-libtool distclean-tags distclean-generic \ -- clean-am -- -rm -f libtool -+clean-am: clean-generic clean-libtool clean-pkglibLIBRARIES \ -+ mostlyclean-am - - distclean: distclean-am - --maintainer-clean-am: maintainer-clean-pkglibLIBRARIES \ -- maintainer-clean-compile maintainer-clean-libtool \ -- maintainer-clean-tags 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." -+distclean-am: clean-am distclean-compile distclean-depend \ -+ distclean-generic distclean-libtool distclean-pkglibLIBRARIES \ -+ distclean-tags - - maintainer-clean: maintainer-clean-am - --.PHONY: mostlyclean-pkglibLIBRARIES distclean-pkglibLIBRARIES \ --clean-pkglibLIBRARIES maintainer-clean-pkglibLIBRARIES \ --uninstall-pkglibLIBRARIES install-pkglibLIBRARIES 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 -+maintainer-clean-am: distclean-am maintainer-clean-generic \ -+ maintainer-clean-pkglibLIBRARIES -+ -+mostlyclean: mostlyclean-am -+ -+mostlyclean-am: mostlyclean-compile mostlyclean-generic \ -+ mostlyclean-libtool mostlyclean-pkglibLIBRARIES -+ -+.PHONY: check check-am clean clean-generic clean-libtool \ -+ clean-pkglibLIBRARIES distclean distclean-compile \ -+ distclean-depend distclean-generic distclean-libtool \ -+ distclean-pkglibLIBRARIES distclean-tags distdir dvi dvi-am \ -+ info info-am install install-am install-data install-data-am \ -+ install-exec install-exec-am install-pkglibLIBRARIES \ -+ install-strip installcheck installcheck-am installdirs \ -+ maintainer-clean maintainer-clean-generic \ -+ maintainer-clean-pkglibLIBRARIES mostlyclean \ -+ mostlyclean-compile mostlyclean-generic mostlyclean-libtool \ -+ mostlyclean-pkglibLIBRARIES tags uninstall uninstall-am \ -+ uninstall-pkglibLIBRARIES - - - # Don't update the files from bitkeeper -diff -r -N -U3 mysql-3.23.32.orig/mysql-test/Makefile.in mysql-3.23.32/mysql-test/Makefile.in ---- mysql-3.23.32.orig/mysql-test/Makefile.in Mon Jan 22 14:44:20 2001 -+++ mysql-3.23.32/mysql-test/Makefile.in Thu Mar 1 17:01:09 2001 -@@ -1,6 +1,7 @@ --# Makefile.in generated automatically by automake 1.4 from Makefile.am -+# Makefile.in generated automatically by automake 1.4d from Makefile.am - --# Copyright (C) 1994, 1995-8, 1999 Free Software Foundation, Inc. -+# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001 -+# Free Software Foundation, Inc. - # This Makefile.in is free software; the Free Software Foundation - # gives unlimited permission to copy and/or distribute it, - # with or without modifications, as long as this notice is preserved. -@@ -10,24 +11,6 @@ - # even the implied warranty of MERCHANTABILITY or FITNESS FOR A - # PARTICULAR PURPOSE. - --# Copyright (C) 2000 MySQL AB & MySQL Finland AB & TCX DataKonsult AB --# --# This library is free software; you can redistribute it and/or --# modify it under the terms of the GNU Library General Public --# License as published by the Free Software Foundation; either --# version 2 of the License, or (at your option) any later version. --# --# This library is distributed in the hope that it will be useful, --# but WITHOUT ANY WARRANTY; without even the implied warranty of --# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU --# Library General Public License for more details. --# --# You should have received a copy of the GNU Library General Public --# License along with this library; if not, write to the Free --# Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, --# MA 02111-1307, USA -- -- - SHELL = @SHELL@ - - srcdir = @srcdir@ -@@ -49,8 +32,6 @@ - includedir = @includedir@ - oldincludedir = /usr/include - --DESTDIR = -- - pkgdatadir = $(datadir)/@PACKAGE@ - pkglibdir = $(libdir)/@PACKAGE@ - pkgincludedir = $(includedir)/@PACKAGE@ -@@ -63,9 +44,11 @@ - AUTOHEADER = @AUTOHEADER@ - - INSTALL = @INSTALL@ --INSTALL_PROGRAM = @INSTALL_PROGRAM@ $(AM_INSTALL_PROGRAM_FLAGS) -+INSTALL_PROGRAM = @INSTALL_PROGRAM@ - INSTALL_DATA = @INSTALL_DATA@ - INSTALL_SCRIPT = @INSTALL_SCRIPT@ -+INSTALL_STRIP_FLAG = -+INSTALL_HEADER = $(INSTALL_DATA) - transform = @program_transform_name@ - - NORMAL_INSTALL = : -@@ -74,6 +57,8 @@ - NORMAL_UNINSTALL = : - PRE_UNINSTALL = : - POST_UNINSTALL = : -+ -+@SET_MAKE@ - build_alias = @build_alias@ - build_triplet = @build@ - host_alias = @host_alias@ -@@ -81,6 +66,8 @@ - target_alias = @target_alias@ - target_triplet = @target@ - ALLOCA = @ALLOCA@ -+AMDEP = @AMDEP@ -+AMTAR = @AMTAR@ - AS = @AS@ - AVAILABLE_LANGUAGES = @AVAILABLE_LANGUAGES@ - AVAILABLE_LANGUAGES_ERRORS = @AVAILABLE_LANGUAGES_ERRORS@ -@@ -102,6 +89,7 @@ - CXX = @CXX@ - CXXFLAGS = @CXXFLAGS@ - CXXLDFLAGS = @CXXLDFLAGS@ -+DEPDIR = @DEPDIR@ - DLLTOOL = @DLLTOOL@ - DOT_FRM_VERSION = @DOT_FRM_VERSION@ - FIND_PROC = @FIND_PROC@ -@@ -155,11 +143,13 @@ - VERSION = @VERSION@ - WRAPLIBS = @WRAPLIBS@ - YACC = @YACC@ -+_am_include = @_am_include@ - bdb_includes = @bdb_includes@ - bdb_libs = @bdb_libs@ - bench_dirs = @bench_dirs@ - default_charset = @default_charset@ - docs_dirs = @docs_dirs@ -+install_sh = @install_sh@ - linked_client_targets = @linked_client_targets@ - readline_dir = @readline_dir@ - readline_link = @readline_link@ -@@ -169,6 +159,24 @@ - thread_dirs = @thread_dirs@ - uname_prog = @uname_prog@ - -+# Copyright (C) 2000 MySQL AB & MySQL Finland AB & TCX DataKonsult AB -+# -+# This library is free software; you can redistribute it and/or -+# modify it under the terms of the GNU Library General Public -+# License as published by the Free Software Foundation; either -+# version 2 of the License, or (at your option) any later version. -+# -+# This library is distributed in the hope that it will be useful, -+# but WITHOUT ANY WARRANTY; without even the implied warranty of -+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -+# Library General Public License for more details. -+# -+# You should have received a copy of the GNU Library General Public -+# License along with this library; if not, write to the Free -+# Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, -+# MA 02111-1307, USA -+ -+ - benchdir_root = $(prefix) - testdir = $(benchdir_root)/mysql-test - EXTRA_SCRIPTS = mysql-test-run.sh install_test_db.sh -@@ -177,46 +185,50 @@ - CLEANFILES = $(test_SCRIPTS) - - SUFFIXES = .sh -+subdir = mysql-test - mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs - CONFIG_HEADER = ../config.h - CONFIG_CLEAN_FILES = - SCRIPTS = $(test_SCRIPTS) - -+DIST_SOURCES = - DIST_COMMON = README Makefile.am Makefile.in - - --DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST) -+DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) - --TAR = gtar - GZIP_ENV = --best --all: all-redirect -+all: all-am - .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 - cd $(top_builddir) \ -- && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status -+ && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= CONFIG_LINKS= $(SHELL) ./config.status - - - install-testSCRIPTS: $(test_SCRIPTS) - @$(NORMAL_INSTALL) - $(mkinstalldirs) $(DESTDIR)$(testdir) - @list='$(test_SCRIPTS)'; for p in $$list; do \ -+ f="`echo $$p|sed '$(transform)'`"; \ - if test -f $$p; then \ -- echo " $(INSTALL_SCRIPT) $$p $(DESTDIR)$(testdir)/`echo $$p|sed '$(transform)'`"; \ -- $(INSTALL_SCRIPT) $$p $(DESTDIR)$(testdir)/`echo $$p|sed '$(transform)'`; \ -- else if test -f $(srcdir)/$$p; then \ -- echo " $(INSTALL_SCRIPT) $(srcdir)/$$p $(DESTDIR)$(testdir)/`echo $$p|sed '$(transform)'`"; \ -- $(INSTALL_SCRIPT) $(srcdir)/$$p $(DESTDIR)$(testdir)/`echo $$p|sed '$(transform)'`; \ -- else :; fi; fi; \ -+ echo " $(INSTALL_SCRIPT) $$p $(DESTDIR)$(testdir)/$$f"; \ -+ $(INSTALL_SCRIPT) $$p $(DESTDIR)$(testdir)/$$f; \ -+ elif test -f $(srcdir)/$$p; then \ -+ echo " $(INSTALL_SCRIPT) $(srcdir)/$$p $(DESTDIR)$(testdir)/$$f"; \ -+ $(INSTALL_SCRIPT) $(srcdir)/$$p $(DESTDIR)$(testdir)/$$f; \ -+ else :; fi; \ - done - - uninstall-testSCRIPTS: - @$(NORMAL_UNINSTALL) -- list='$(test_SCRIPTS)'; for p in $$list; do \ -- rm -f $(DESTDIR)$(testdir)/`echo $$p|sed '$(transform)'`; \ -+ @list='$(test_SCRIPTS)'; for p in $$list; do \ -+ f="`echo $$p|sed '$(transform)'`"; \ -+ echo " rm -f $(DESTDIR)$(testdir)/$$f"; \ -+ rm -f $(DESTDIR)$(testdir)/$$f; \ - done - tags: TAGS - TAGS: -@@ -224,17 +236,17 @@ - - distdir = $(top_builddir)/$(PACKAGE)-$(VERSION)/$(subdir) - --subdir = mysql-test - - distdir: $(DISTFILES) - @for file in $(DISTFILES); do \ - d=$(srcdir); \ - if test -d $$d/$$file; then \ -- cp -pr $$d/$$file $(distdir)/$$file; \ -+ cp -pR $$d/$$file $(distdir) \ -+ || exit 1; \ - else \ - test -f $(distdir)/$$file \ -- || ln $$d/$$file $(distdir)/$$file 2> /dev/null \ -- || cp -p $$d/$$file $(distdir)/$$file || :; \ -+ || cp -p $$d/$$file $(distdir)/$$file \ -+ || exit 1; \ - fi; \ - done - $(MAKE) $(AM_MAKEFLAGS) top_distdir="$(top_distdir)" distdir="$(distdir)" dist-hook -@@ -258,9 +270,8 @@ - uninstall-am: uninstall-testSCRIPTS - uninstall: uninstall-am - all-am: Makefile $(SCRIPTS) --all-redirect: all-am - install-strip: -- $(MAKE) $(AM_MAKEFLAGS) AM_INSTALL_PROGRAM_FLAGS=-s install -+ $(MAKE) $(AM_MAKEFLAGS) INSTALL_STRIP_FLAG=-s install - installdirs: - $(mkinstalldirs) $(DESTDIR)$(testdir) - -@@ -275,32 +286,32 @@ - -rm -f config.cache config.log stamp-h stamp-h[0-9]* - - maintainer-clean-generic: --mostlyclean-am: mostlyclean-generic -- --mostlyclean: mostlyclean-am -- --clean-am: clean-generic mostlyclean-am -- -+ @echo "This command is intended for maintainers to use" -+ @echo "it deletes files that may require special tools to rebuild." -+ -rm -f Makefile.in - clean: clean-am - --distclean-am: distclean-generic clean-am -- -rm -f libtool -+clean-am: clean-generic mostlyclean-am - - distclean: distclean-am - --maintainer-clean-am: 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." -+distclean-am: clean-am distclean-generic - - maintainer-clean: maintainer-clean-am - --.PHONY: uninstall-testSCRIPTS install-testSCRIPTS tags distdir info-am \ --info dvi-am dvi check check-am installcheck-am installcheck \ --install-exec-am install-exec install-data-local 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 -+maintainer-clean-am: distclean-am maintainer-clean-generic -+ -+mostlyclean: mostlyclean-am -+ -+mostlyclean-am: mostlyclean-generic -+ -+.PHONY: check check-am clean clean-generic distclean distclean-generic \ -+ distdir dvi dvi-am info info-am install install-am install-data \ -+ install-data-am install-data-local install-exec install-exec-am \ -+ install-strip install-testSCRIPTS installcheck installcheck-am \ -+ installdirs maintainer-clean maintainer-clean-generic \ -+ mostlyclean mostlyclean-generic uninstall uninstall-am \ -+ uninstall-testSCRIPTS - - - dist-hook: -diff -r -N -U3 mysql-3.23.32.orig/mysys/Makefile.in mysql-3.23.32/mysys/Makefile.in ---- mysql-3.23.32.orig/mysys/Makefile.in Mon Jan 22 14:44:04 2001 -+++ mysql-3.23.32/mysys/Makefile.in Thu Mar 1 17:00:51 2001 -@@ -1,6 +1,7 @@ --# Makefile.in generated automatically by automake 1.4 from Makefile.am -+# Makefile.in generated automatically by automake 1.4d from Makefile.am - --# Copyright (C) 1994, 1995-8, 1999 Free Software Foundation, Inc. -+# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001 -+# Free Software Foundation, Inc. - # This Makefile.in is free software; the Free Software Foundation - # gives unlimited permission to copy and/or distribute it, - # with or without modifications, as long as this notice is preserved. -@@ -10,23 +11,6 @@ - # even the implied warranty of MERCHANTABILITY or FITNESS FOR A - # PARTICULAR PURPOSE. - --# Copyright (C) 2000 MySQL AB & MySQL Finland AB & TCX DataKonsult AB --# --# This program is free software; you can redistribute it and/or modify --# it under the terms of the GNU General Public License as published by --# the Free Software Foundation; either version 2 of the License, or --# (at your option) any later version. --# --# This program is distributed in the hope that it will be useful, --# but WITHOUT ANY WARRANTY; without even the implied warranty of --# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the --# GNU General Public License for more details. --# --# You should have received a copy of the GNU General Public License --# along with this program; if not, write to the Free Software --# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -- -- - SHELL = @SHELL@ - - srcdir = @srcdir@ -@@ -48,8 +32,6 @@ - includedir = @includedir@ - oldincludedir = /usr/include - --DESTDIR = -- - pkgdatadir = $(datadir)/@PACKAGE@ - pkglibdir = $(libdir)/@PACKAGE@ - pkgincludedir = $(includedir)/@PACKAGE@ -@@ -62,9 +44,11 @@ - AUTOHEADER = @AUTOHEADER@ - - INSTALL = @INSTALL@ --INSTALL_PROGRAM = @INSTALL_PROGRAM@ $(AM_INSTALL_PROGRAM_FLAGS) -+INSTALL_PROGRAM = @INSTALL_PROGRAM@ - INSTALL_DATA = @INSTALL_DATA@ - INSTALL_SCRIPT = @INSTALL_SCRIPT@ -+INSTALL_STRIP_FLAG = -+INSTALL_HEADER = $(INSTALL_DATA) - transform = @program_transform_name@ - - NORMAL_INSTALL = : -@@ -73,6 +57,8 @@ - NORMAL_UNINSTALL = : - PRE_UNINSTALL = : - POST_UNINSTALL = : -+ -+@SET_MAKE@ - build_alias = @build_alias@ - build_triplet = @build@ - host_alias = @host_alias@ -@@ -80,6 +66,8 @@ - target_alias = @target_alias@ - target_triplet = @target@ - ALLOCA = @ALLOCA@ -+AMDEP = @AMDEP@ -+AMTAR = @AMTAR@ - AS = @AS@ - AVAILABLE_LANGUAGES = @AVAILABLE_LANGUAGES@ - AVAILABLE_LANGUAGES_ERRORS = @AVAILABLE_LANGUAGES_ERRORS@ -@@ -101,6 +89,7 @@ - CXX = @CXX@ - CXXFLAGS = @CXXFLAGS@ - CXXLDFLAGS = @CXXLDFLAGS@ -+DEPDIR = @DEPDIR@ - DLLTOOL = @DLLTOOL@ - DOT_FRM_VERSION = @DOT_FRM_VERSION@ - FIND_PROC = @FIND_PROC@ -@@ -154,11 +143,13 @@ - VERSION = @VERSION@ - WRAPLIBS = @WRAPLIBS@ - YACC = @YACC@ -+_am_include = @_am_include@ - bdb_includes = @bdb_includes@ - bdb_libs = @bdb_libs@ - bench_dirs = @bench_dirs@ - default_charset = @default_charset@ - docs_dirs = @docs_dirs@ -+install_sh = @install_sh@ - linked_client_targets = @linked_client_targets@ - readline_dir = @readline_dir@ - readline_link = @readline_link@ -@@ -168,17 +159,58 @@ - thread_dirs = @thread_dirs@ - uname_prog = @uname_prog@ - -+# Copyright (C) 2000 MySQL AB & MySQL Finland AB & TCX DataKonsult AB -+# -+# This program is free software; you can redistribute it and/or modify -+# it under the terms of the GNU General Public License as published by -+# the Free Software Foundation; either version 2 of the License, or -+# (at your option) any later version. -+# -+# This program is distributed in the hope that it will be useful, -+# but WITHOUT ANY WARRANTY; without even the implied warranty of -+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -+# GNU General Public License for more details. -+# -+# You should have received a copy of the GNU General Public License -+# along with this program; if not, write to the Free Software -+# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -+ -+ - MYSQLDATAdir = $(localstatedir) - MYSQLSHAREdir = $(pkgdatadir) - MYSQLBASEdir = $(prefix) - INCLUDES = @MT_INCLUDES@ -I$(srcdir)/../include -I../include -I.. -I$(srcdir) - pkglib_LIBRARIES = libmysys.a --LDADD = libmysys.a ../dbug/libdbug.a ../strings/libmystrings.a -+LDADD = libmysys.a ../dbug/libdbug.a \ -+ ../strings/libmystrings.a - - noinst_HEADERS = mysys_priv.h my_static.h --libmysys_a_SOURCES = my_init.c my_getwd.c mf_getdate.c mf_path.c mf_loadpath.c my_open.c my_create.c my_seek.c my_read.c my_pread.c my_write.c mf_keycache.c mf_iocache.c mf_iocache2.c mf_cache.c mf_tempfile.c my_lock.c mf_brkhant.c my_alarm.c my_malloc.c my_realloc.c my_once.c mulalloc.c my_alloc.c safemalloc.c my_fopen.c my_fstream.c my_error.c errors.c my_div.c my_messnc.c mf_format.c mf_same.c mf_dirname.c mf_fn_ext.c mf_pack.c mf_pack2.c mf_unixpath.c mf_stripp.c mf_casecnv.c mf_soundex.c mf_wcomp.c mf_wfile.c mf_qsort.c mf_qsort2.c mf_sort.c ptr_cmp.c mf_radix.c queues.c tree.c list.c hash.c array.c string.c typelib.c my_copy.c my_append.c my_lib.c my_delete.c my_rename.c my_redel.c my_tempnam.c my_chsize.c my_lread.c my_lwrite.c my_clock.c my_quick.c my_lockmem.c my_static.c getopt.c getopt1.c getvar.c my_mkdir.c default.c my_compress.c checksum.c raid.cc my_net.c my_vsnprintf.c charset.c -+libmysys_a_SOURCES = my_init.c my_getwd.c mf_getdate.c\ -+ mf_path.c mf_loadpath.c\ -+ my_open.c my_create.c my_seek.c my_read.c \ -+ my_pread.c my_write.c \ -+ mf_keycache.c \ -+ mf_iocache.c mf_iocache2.c mf_cache.c mf_tempfile.c \ -+ my_lock.c mf_brkhant.c my_alarm.c \ -+ my_malloc.c my_realloc.c my_once.c mulalloc.c \ -+ my_alloc.c safemalloc.c my_fopen.c my_fstream.c \ -+ my_error.c errors.c my_div.c my_messnc.c \ -+ mf_format.c mf_same.c mf_dirname.c mf_fn_ext.c \ -+ mf_pack.c mf_pack2.c mf_unixpath.c mf_stripp.c \ -+ mf_casecnv.c mf_soundex.c mf_wcomp.c mf_wfile.c \ -+ mf_qsort.c mf_qsort2.c mf_sort.c \ -+ ptr_cmp.c mf_radix.c queues.c \ -+ tree.c list.c hash.c array.c string.c typelib.c \ -+ my_copy.c my_append.c my_lib.c \ -+ my_delete.c my_rename.c my_redel.c my_tempnam.c \ -+ my_chsize.c my_lread.c my_lwrite.c my_clock.c \ -+ my_quick.c my_lockmem.c my_static.c \ -+ getopt.c getopt1.c getvar.c my_mkdir.c \ -+ default.c my_compress.c checksum.c raid.cc my_net.c \ -+ my_vsnprintf.c charset.c - --EXTRA_DIST = thr_alarm.c thr_lock.c my_pthread.c my_thr_init.c thr_mutex.c thr_rwlock.c -+EXTRA_DIST = thr_alarm.c thr_lock.c my_pthread.c my_thr_init.c \ -+ thr_mutex.c thr_rwlock.c - - libmysys_a_LIBADD = @THREAD_LOBJECTS@ - # test_fn removed 980815 since it not upp to date test_dir -@@ -187,16 +219,29 @@ - testhash_DEPENDENCIES = $(LIBRARIES) - test_charset_DEPENDENCIES = $(LIBRARIES) - EXTRA_PROGRAMS = --DEFS = -DDEFAULT_BASEDIR=\"$(prefix)\" -DDATADIR="\"$(MYSQLDATAdir)\"" -DDEFAULT_CHARSET_HOME="\"$(MYSQLBASEdir)\"" -DDATADIR="\"$(MYSQLDATAdir)\"" -DSHAREDIR="\"$(MYSQLSHAREdir)\"" @DEFS@ -+DEFS = -DDEFAULT_BASEDIR=\"$(prefix)\" \ -+ -DDATADIR="\"$(MYSQLDATAdir)\"" \ -+ -DDEFAULT_CHARSET_HOME="\"$(MYSQLBASEdir)\"" \ -+ -DDATADIR="\"$(MYSQLDATAdir)\"" \ -+ -DSHAREDIR="\"$(MYSQLSHAREdir)\"" \ -+ @DEFS@ - - - libmysys_a_DEPENDENCIES = @THREAD_LOBJECTS@ - --OMIT_DEPENDENCIES = pthread.h stdio.h __stdio.h stdlib.h __stdlib.h math.h __math.h time.h __time.h unistd.h __unistd.h types.h xtypes.h ac-types.h posix.h string.h __string.h errno.h socket.h inet.h dirent.h netdb.h cleanup.h cond.h debug_out.h fd.h kernel.h mutex.h prio_queue.h pthread_attr.h pthread_once.h queue.h sleep.h specific.h version.h pwd.h timers.h uio.h cdefs.h machdep.h signal.h __signal.h util.h -+OMIT_DEPENDENCIES = pthread.h stdio.h __stdio.h stdlib.h __stdlib.h math.h\ -+ __math.h time.h __time.h unistd.h __unistd.h types.h \ -+ xtypes.h ac-types.h posix.h string.h __string.h \ -+ errno.h socket.h inet.h dirent.h netdb.h \ -+ cleanup.h cond.h debug_out.h fd.h kernel.h mutex.h \ -+ prio_queue.h pthread_attr.h pthread_once.h queue.h\ -+ sleep.h specific.h version.h pwd.h timers.h uio.h \ -+ cdefs.h machdep.h signal.h __signal.h util.h - - - # I hope this always does the right thing. Otherwise this is only test programs - FLAGS = $(DEFS) $(INCLUDES) $(CPPFLAGS) $(CFLAGS) -+subdir = mysys - mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs - CONFIG_HEADER = ../config.h - CONFIG_CLEAN_FILES = -@@ -205,7 +250,8 @@ - CPPFLAGS = @CPPFLAGS@ - LDFLAGS = @LDFLAGS@ - LIBS = @LIBS@ --libmysys_a_OBJECTS = my_init.o my_getwd.o mf_getdate.o mf_path.o \ -+libmysys_a_AR = $(AR) cru -+am_libmysys_a_OBJECTS = my_init.o my_getwd.o mf_getdate.o mf_path.o \ - mf_loadpath.o my_open.o my_create.o my_seek.o my_read.o my_pread.o \ - my_write.o mf_keycache.o mf_iocache.o mf_iocache2.o mf_cache.o \ - mf_tempfile.o my_lock.o mf_brkhant.o my_alarm.o my_malloc.o \ -@@ -219,46 +265,85 @@ - my_lwrite.o my_clock.o my_quick.o my_lockmem.o my_static.o getopt.o \ - getopt1.o getvar.o my_mkdir.o default.o my_compress.o checksum.o raid.o \ - my_net.o my_vsnprintf.o charset.o -+libmysys_a_OBJECTS = $(am_libmysys_a_OBJECTS) - AR = ar - PROGRAMS = $(noinst_PROGRAMS) - --testhash_SOURCES = testhash.c --testhash_OBJECTS = testhash.o --testhash_LDADD = $(LDADD) --testhash_LDFLAGS = - test_charset_SOURCES = test_charset.c - test_charset_OBJECTS = test_charset.o - test_charset_LDADD = $(LDADD) - test_charset_LDFLAGS = -+testhash_SOURCES = testhash.c -+testhash_OBJECTS = testhash.o -+testhash_LDADD = $(LDADD) -+testhash_LDFLAGS = -+COMPILE = $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -+LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) - CXXCOMPILE = $(CXX) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) - LTCXXCOMPILE = $(LIBTOOL) --mode=compile $(CXX) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) - CXXLD = $(CXX) --CXXLINK = $(LIBTOOL) --mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(LDFLAGS) -o $@ --COMPILE = $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) --LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -+CXXLINK = $(LIBTOOL) --mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@ - CCLD = $(CC) --LINK = $(LIBTOOL) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(LDFLAGS) -o $@ -+LINK = $(LIBTOOL) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@ -+DIST_SOURCES = $(libmysys_a_SOURCES) test_charset.c testhash.c - HEADERS = $(noinst_HEADERS) - --DIST_COMMON = COPYING.LIB ChangeLog Makefile.am Makefile.in -+depcomp = $(SHELL) $(top_srcdir)/depcomp -+@AMDEP@DEP_FILES = $(DEPDIR)/array.Po $(DEPDIR)/charset.Po \ -+@AMDEP@$(DEPDIR)/checksum.Po $(DEPDIR)/default.Po $(DEPDIR)/errors.Po \ -+@AMDEP@$(DEPDIR)/getopt.Po $(DEPDIR)/getopt1.Po $(DEPDIR)/getvar.Po \ -+@AMDEP@$(DEPDIR)/hash.Po $(DEPDIR)/list.Po $(DEPDIR)/mf_brkhant.Po \ -+@AMDEP@$(DEPDIR)/mf_cache.Po $(DEPDIR)/mf_casecnv.Po \ -+@AMDEP@$(DEPDIR)/mf_dirname.Po $(DEPDIR)/mf_fn_ext.Po \ -+@AMDEP@$(DEPDIR)/mf_format.Po $(DEPDIR)/mf_getdate.Po \ -+@AMDEP@$(DEPDIR)/mf_iocache.Po $(DEPDIR)/mf_iocache2.Po \ -+@AMDEP@$(DEPDIR)/mf_keycache.Po $(DEPDIR)/mf_loadpath.Po \ -+@AMDEP@$(DEPDIR)/mf_pack.Po $(DEPDIR)/mf_pack2.Po $(DEPDIR)/mf_path.Po \ -+@AMDEP@$(DEPDIR)/mf_qsort.Po $(DEPDIR)/mf_qsort2.Po \ -+@AMDEP@$(DEPDIR)/mf_radix.Po $(DEPDIR)/mf_same.Po $(DEPDIR)/mf_sort.Po \ -+@AMDEP@$(DEPDIR)/mf_soundex.Po $(DEPDIR)/mf_stripp.Po \ -+@AMDEP@$(DEPDIR)/mf_tempfile.Po $(DEPDIR)/mf_unixpath.Po \ -+@AMDEP@$(DEPDIR)/mf_wcomp.Po $(DEPDIR)/mf_wfile.Po \ -+@AMDEP@$(DEPDIR)/mulalloc.Po $(DEPDIR)/my_alarm.Po \ -+@AMDEP@$(DEPDIR)/my_alloc.Po $(DEPDIR)/my_append.Po \ -+@AMDEP@$(DEPDIR)/my_chsize.Po $(DEPDIR)/my_clock.Po \ -+@AMDEP@$(DEPDIR)/my_compress.Po $(DEPDIR)/my_copy.Po \ -+@AMDEP@$(DEPDIR)/my_create.Po $(DEPDIR)/my_delete.Po \ -+@AMDEP@$(DEPDIR)/my_div.Po $(DEPDIR)/my_error.Po $(DEPDIR)/my_fopen.Po \ -+@AMDEP@$(DEPDIR)/my_fstream.Po $(DEPDIR)/my_getwd.Po \ -+@AMDEP@$(DEPDIR)/my_init.Po $(DEPDIR)/my_lib.Po $(DEPDIR)/my_lock.Po \ -+@AMDEP@$(DEPDIR)/my_lockmem.Po $(DEPDIR)/my_lread.Po \ -+@AMDEP@$(DEPDIR)/my_lwrite.Po $(DEPDIR)/my_malloc.Po \ -+@AMDEP@$(DEPDIR)/my_messnc.Po $(DEPDIR)/my_mkdir.Po $(DEPDIR)/my_net.Po \ -+@AMDEP@$(DEPDIR)/my_once.Po $(DEPDIR)/my_open.Po $(DEPDIR)/my_pread.Po \ -+@AMDEP@$(DEPDIR)/my_quick.Po $(DEPDIR)/my_read.Po \ -+@AMDEP@$(DEPDIR)/my_realloc.Po $(DEPDIR)/my_redel.Po \ -+@AMDEP@$(DEPDIR)/my_rename.Po $(DEPDIR)/my_seek.Po \ -+@AMDEP@$(DEPDIR)/my_static.Po $(DEPDIR)/my_tempnam.Po \ -+@AMDEP@$(DEPDIR)/my_vsnprintf.Po $(DEPDIR)/my_write.Po \ -+@AMDEP@$(DEPDIR)/ptr_cmp.Po $(DEPDIR)/queues.Po $(DEPDIR)/raid.Po \ -+@AMDEP@$(DEPDIR)/safemalloc.Po $(DEPDIR)/string.Po \ -+@AMDEP@$(DEPDIR)/test_charset.Po $(DEPDIR)/testhash.Po \ -+@AMDEP@$(DEPDIR)/tree.Po $(DEPDIR)/typelib.Po -+DIST_COMMON = $(noinst_HEADERS) COPYING.LIB ChangeLog Makefile.am \ -+Makefile.in - - --DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST) -+DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) - --TAR = gtar - GZIP_ENV = --best --SOURCES = $(libmysys_a_SOURCES) testhash.c test_charset.c --OBJECTS = $(libmysys_a_OBJECTS) testhash.o test_charset.o -+SOURCES = $(libmysys_a_SOURCES) test_charset.c testhash.c -+OBJECTS = $(am_libmysys_a_OBJECTS) test_charset.o testhash.o - --all: all-redirect -+all: all-am - .SUFFIXES: --.SUFFIXES: .S .c .cc .lo .o .s -+.SUFFIXES: .c .cc .lo .o - $(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 - cd $(top_builddir) \ -- && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status -+ && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= CONFIG_LINKS= $(SHELL) ./config.status - - - mostlyclean-pkglibLIBRARIES: -@@ -289,38 +374,17 @@ - - uninstall-pkglibLIBRARIES: - @$(NORMAL_UNINSTALL) -- list='$(pkglib_LIBRARIES)'; for p in $$list; do \ -+ @list='$(pkglib_LIBRARIES)'; for p in $$list; do \ -+ echo " rm -f $(DESTDIR)$(pkglibdir)/$$p"; \ - rm -f $(DESTDIR)$(pkglibdir)/$$p; \ - done - --.c.o: -- $(COMPILE) -c $< -- --.s.o: -- $(COMPILE) -c $< -- --.S.o: -- $(COMPILE) -c $< -- - mostlyclean-compile: - -rm -f *.o core *.core - --clean-compile: -- - distclean-compile: - -rm -f *.tab.c - --maintainer-clean-compile: -- --.c.lo: -- $(LIBTOOL) --mode=compile $(COMPILE) -c $< -- --.s.lo: -- $(LIBTOOL) --mode=compile $(COMPILE) -c $< -- --.S.lo: -- $(LIBTOOL) --mode=compile $(COMPILE) -c $< -- - mostlyclean-libtool: - -rm -f *.lo - -@@ -328,12 +392,11 @@ - -rm -rf .libs _libs - - distclean-libtool: -- --maintainer-clean-libtool: -+ -rm -f libtool - - libmysys.a: $(libmysys_a_OBJECTS) $(libmysys_a_DEPENDENCIES) - -rm -f libmysys.a -- $(AR) cru libmysys.a $(libmysys_a_OBJECTS) $(libmysys_a_LIBADD) -+ $(libmysys_a_AR) libmysys.a $(libmysys_a_OBJECTS) $(libmysys_a_LIBADD) - $(RANLIB) libmysys.a - - mostlyclean-noinstPROGRAMS: -@@ -348,666 +411,170 @@ - testhash: $(testhash_OBJECTS) $(testhash_DEPENDENCIES) - @rm -f testhash - $(LINK) $(testhash_LDFLAGS) $(testhash_OBJECTS) $(testhash_LDADD) $(LIBS) --.cc.o: -- $(CXXCOMPILE) -c $< --.cc.lo: -- $(LTCXXCOMPILE) -c $< - - tags: TAGS - --ID: $(HEADERS) $(SOURCES) $(LISP) -- list='$(SOURCES) $(HEADERS)'; \ -- unique=`for i in $$list; do echo $$i; done | \ -- awk ' { files[$$0] = 1; } \ -+ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) -+ list='$(SOURCES) $(HEADERS) $(TAGS_FILES)'; \ -+ unique=`for i in $$list; do \ -+ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ -+ done | \ -+ $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ -- here=`pwd` && cd $(srcdir) \ -- && mkid -f$$here/ID $$unique $(LISP) -+ mkid -fID $$unique $(LISP) - --TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) $(LISP) -+TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ -+ $(TAGS_FILES) $(LISP) - tags=; \ - here=`pwd`; \ -- list='$(SOURCES) $(HEADERS)'; \ -- unique=`for i in $$list; do echo $$i; done | \ -- awk ' { files[$$0] = 1; } \ -+ list='$(SOURCES) $(HEADERS) $(TAGS_FILES)'; \ -+ unique=`for i in $$list; do \ -+ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ -+ done | \ -+ $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ - test -z "$(ETAGS_ARGS)$$unique$(LISP)$$tags" \ -- || (cd $(srcdir) && etags $(ETAGS_ARGS) $$tags $$unique $(LISP) -o $$here/TAGS) -- --mostlyclean-tags: -+ || etags $(ETAGS_ARGS) $$tags $$unique $(LISP) - --clean-tags: -+GTAGS: -+ here=`CDPATH=: && cd $(top_builddir) && pwd` \ -+ && cd $(top_srcdir) \ -+ && gtags -i $$here - - distclean-tags: - -rm -f TAGS ID - --maintainer-clean-tags: -+@AMDEP@@_am_include@ $(DEPDIR)/array.Po -+@AMDEP@@_am_include@ $(DEPDIR)/charset.Po -+@AMDEP@@_am_include@ $(DEPDIR)/checksum.Po -+@AMDEP@@_am_include@ $(DEPDIR)/default.Po -+@AMDEP@@_am_include@ $(DEPDIR)/errors.Po -+@AMDEP@@_am_include@ $(DEPDIR)/getopt.Po -+@AMDEP@@_am_include@ $(DEPDIR)/getopt1.Po -+@AMDEP@@_am_include@ $(DEPDIR)/getvar.Po -+@AMDEP@@_am_include@ $(DEPDIR)/hash.Po -+@AMDEP@@_am_include@ $(DEPDIR)/list.Po -+@AMDEP@@_am_include@ $(DEPDIR)/mf_brkhant.Po -+@AMDEP@@_am_include@ $(DEPDIR)/mf_cache.Po -+@AMDEP@@_am_include@ $(DEPDIR)/mf_casecnv.Po -+@AMDEP@@_am_include@ $(DEPDIR)/mf_dirname.Po -+@AMDEP@@_am_include@ $(DEPDIR)/mf_fn_ext.Po -+@AMDEP@@_am_include@ $(DEPDIR)/mf_format.Po -+@AMDEP@@_am_include@ $(DEPDIR)/mf_getdate.Po -+@AMDEP@@_am_include@ $(DEPDIR)/mf_iocache.Po -+@AMDEP@@_am_include@ $(DEPDIR)/mf_iocache2.Po -+@AMDEP@@_am_include@ $(DEPDIR)/mf_keycache.Po -+@AMDEP@@_am_include@ $(DEPDIR)/mf_loadpath.Po -+@AMDEP@@_am_include@ $(DEPDIR)/mf_pack.Po -+@AMDEP@@_am_include@ $(DEPDIR)/mf_pack2.Po -+@AMDEP@@_am_include@ $(DEPDIR)/mf_path.Po -+@AMDEP@@_am_include@ $(DEPDIR)/mf_qsort.Po -+@AMDEP@@_am_include@ $(DEPDIR)/mf_qsort2.Po -+@AMDEP@@_am_include@ $(DEPDIR)/mf_radix.Po -+@AMDEP@@_am_include@ $(DEPDIR)/mf_same.Po -+@AMDEP@@_am_include@ $(DEPDIR)/mf_sort.Po -+@AMDEP@@_am_include@ $(DEPDIR)/mf_soundex.Po -+@AMDEP@@_am_include@ $(DEPDIR)/mf_stripp.Po -+@AMDEP@@_am_include@ $(DEPDIR)/mf_tempfile.Po -+@AMDEP@@_am_include@ $(DEPDIR)/mf_unixpath.Po -+@AMDEP@@_am_include@ $(DEPDIR)/mf_wcomp.Po -+@AMDEP@@_am_include@ $(DEPDIR)/mf_wfile.Po -+@AMDEP@@_am_include@ $(DEPDIR)/mulalloc.Po -+@AMDEP@@_am_include@ $(DEPDIR)/my_alarm.Po -+@AMDEP@@_am_include@ $(DEPDIR)/my_alloc.Po -+@AMDEP@@_am_include@ $(DEPDIR)/my_append.Po -+@AMDEP@@_am_include@ $(DEPDIR)/my_chsize.Po -+@AMDEP@@_am_include@ $(DEPDIR)/my_clock.Po -+@AMDEP@@_am_include@ $(DEPDIR)/my_compress.Po -+@AMDEP@@_am_include@ $(DEPDIR)/my_copy.Po -+@AMDEP@@_am_include@ $(DEPDIR)/my_create.Po -+@AMDEP@@_am_include@ $(DEPDIR)/my_delete.Po -+@AMDEP@@_am_include@ $(DEPDIR)/my_div.Po -+@AMDEP@@_am_include@ $(DEPDIR)/my_error.Po -+@AMDEP@@_am_include@ $(DEPDIR)/my_fopen.Po -+@AMDEP@@_am_include@ $(DEPDIR)/my_fstream.Po -+@AMDEP@@_am_include@ $(DEPDIR)/my_getwd.Po -+@AMDEP@@_am_include@ $(DEPDIR)/my_init.Po -+@AMDEP@@_am_include@ $(DEPDIR)/my_lib.Po -+@AMDEP@@_am_include@ $(DEPDIR)/my_lock.Po -+@AMDEP@@_am_include@ $(DEPDIR)/my_lockmem.Po -+@AMDEP@@_am_include@ $(DEPDIR)/my_lread.Po -+@AMDEP@@_am_include@ $(DEPDIR)/my_lwrite.Po -+@AMDEP@@_am_include@ $(DEPDIR)/my_malloc.Po -+@AMDEP@@_am_include@ $(DEPDIR)/my_messnc.Po -+@AMDEP@@_am_include@ $(DEPDIR)/my_mkdir.Po -+@AMDEP@@_am_include@ $(DEPDIR)/my_net.Po -+@AMDEP@@_am_include@ $(DEPDIR)/my_once.Po -+@AMDEP@@_am_include@ $(DEPDIR)/my_open.Po -+@AMDEP@@_am_include@ $(DEPDIR)/my_pread.Po -+@AMDEP@@_am_include@ $(DEPDIR)/my_quick.Po -+@AMDEP@@_am_include@ $(DEPDIR)/my_read.Po -+@AMDEP@@_am_include@ $(DEPDIR)/my_realloc.Po -+@AMDEP@@_am_include@ $(DEPDIR)/my_redel.Po -+@AMDEP@@_am_include@ $(DEPDIR)/my_rename.Po -+@AMDEP@@_am_include@ $(DEPDIR)/my_seek.Po -+@AMDEP@@_am_include@ $(DEPDIR)/my_static.Po -+@AMDEP@@_am_include@ $(DEPDIR)/my_tempnam.Po -+@AMDEP@@_am_include@ $(DEPDIR)/my_vsnprintf.Po -+@AMDEP@@_am_include@ $(DEPDIR)/my_write.Po -+@AMDEP@@_am_include@ $(DEPDIR)/ptr_cmp.Po -+@AMDEP@@_am_include@ $(DEPDIR)/queues.Po -+@AMDEP@@_am_include@ $(DEPDIR)/raid.Po -+@AMDEP@@_am_include@ $(DEPDIR)/safemalloc.Po -+@AMDEP@@_am_include@ $(DEPDIR)/string.Po -+@AMDEP@@_am_include@ $(DEPDIR)/test_charset.Po -+@AMDEP@@_am_include@ $(DEPDIR)/testhash.Po -+@AMDEP@@_am_include@ $(DEPDIR)/tree.Po -+@AMDEP@@_am_include@ $(DEPDIR)/typelib.Po -+ -+distclean-depend: -+ -rm -rf $(DEPDIR) -+ -+@AMDEP@CCDEPMODE = @CCDEPMODE@ -+ -+.c.o: -+@AMDEP@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ -+@AMDEP@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@ -+@AMDEP@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -+ $(COMPILE) -c -o $@ `test -f $< || echo '$(srcdir)/'`$< -+ -+.c.lo: -+@AMDEP@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ -+@AMDEP@ depfile='$(DEPDIR)/$*.Plo' tmpdepfile='$(DEPDIR)/$*.TPlo' @AMDEPBACKSLASH@ -+@AMDEP@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -+ $(LTCOMPILE) -c -o $@ `test -f $< || echo '$(srcdir)/'`$< -+ -+ -+@AMDEP@CXXDEPMODE = @CXXDEPMODE@ -+ -+.cc.o: -+@AMDEP@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ -+@AMDEP@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@ -+@AMDEP@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -+ $(CXXCOMPILE) -c -o $@ `test -f $< || echo '$(srcdir)/'`$< -+ -+.cc.lo: -+@AMDEP@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ -+@AMDEP@ depfile='$(DEPDIR)/$*.Plo' tmpdepfile='$(DEPDIR)/$*.TPlo' @AMDEPBACKSLASH@ -+@AMDEP@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -+ $(LTCXXCOMPILE) -c -o $@ `test -f $< || echo '$(srcdir)/'`$< -+ - - distdir = $(top_builddir)/$(PACKAGE)-$(VERSION)/$(subdir) - --subdir = mysys - - distdir: $(DISTFILES) - @for file in $(DISTFILES); do \ - d=$(srcdir); \ - if test -d $$d/$$file; then \ -- cp -pr $$d/$$file $(distdir)/$$file; \ -+ cp -pR $$d/$$file $(distdir) \ -+ || exit 1; \ - else \ - test -f $(distdir)/$$file \ -- || ln $$d/$$file $(distdir)/$$file 2> /dev/null \ -- || cp -p $$d/$$file $(distdir)/$$file || :; \ -+ || cp -p $$d/$$file $(distdir)/$$file \ -+ || exit 1; \ - 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_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 -- - info-am: - info: info-am - dvi-am: -@@ -1028,9 +595,8 @@ - uninstall-am: uninstall-pkglibLIBRARIES - uninstall: uninstall-am - all-am: Makefile $(LIBRARIES) $(PROGRAMS) $(HEADERS) --all-redirect: all-am - install-strip: -- $(MAKE) $(AM_MAKEFLAGS) AM_INSTALL_PROGRAM_FLAGS=-s install -+ $(MAKE) $(AM_MAKEFLAGS) INSTALL_STRIP_FLAG=-s install - installdirs: - $(mkinstalldirs) $(DESTDIR)$(pkglibdir) - -@@ -1044,48 +610,46 @@ - -rm -f config.cache config.log stamp-h stamp-h[0-9]* - - maintainer-clean-generic: --mostlyclean-am: mostlyclean-pkglibLIBRARIES mostlyclean-compile \ -- mostlyclean-libtool mostlyclean-noinstPROGRAMS \ -- mostlyclean-tags mostlyclean-generic -- --mostlyclean: mostlyclean-am -- --clean-am: clean-pkglibLIBRARIES clean-compile clean-libtool \ -- clean-noinstPROGRAMS clean-tags clean-generic \ -- mostlyclean-am -- -+ @echo "This command is intended for maintainers to use" -+ @echo "it deletes files that may require special tools to rebuild." -+ -rm -f Makefile.in - clean: clean-am - --distclean-am: distclean-pkglibLIBRARIES distclean-compile \ -- distclean-libtool distclean-noinstPROGRAMS \ -- distclean-tags distclean-generic clean-am -- -rm -f libtool -+clean-am: clean-generic clean-libtool clean-noinstPROGRAMS \ -+ clean-pkglibLIBRARIES mostlyclean-am - - distclean: distclean-am - --maintainer-clean-am: maintainer-clean-pkglibLIBRARIES \ -- maintainer-clean-compile maintainer-clean-libtool \ -- maintainer-clean-noinstPROGRAMS maintainer-clean-tags \ -- 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." -+distclean-am: clean-am distclean-compile distclean-depend \ -+ distclean-generic distclean-libtool distclean-noinstPROGRAMS \ -+ distclean-pkglibLIBRARIES distclean-tags - - maintainer-clean: maintainer-clean-am - --.PHONY: mostlyclean-pkglibLIBRARIES distclean-pkglibLIBRARIES \ --clean-pkglibLIBRARIES maintainer-clean-pkglibLIBRARIES \ --uninstall-pkglibLIBRARIES install-pkglibLIBRARIES mostlyclean-compile \ --distclean-compile clean-compile maintainer-clean-compile \ --mostlyclean-libtool distclean-libtool 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 -+maintainer-clean-am: distclean-am maintainer-clean-generic \ -+ maintainer-clean-noinstPROGRAMS \ -+ maintainer-clean-pkglibLIBRARIES -+ -+mostlyclean: mostlyclean-am -+ -+mostlyclean-am: mostlyclean-compile mostlyclean-generic \ -+ mostlyclean-libtool mostlyclean-noinstPROGRAMS \ -+ mostlyclean-pkglibLIBRARIES -+ -+.PHONY: check check-am clean clean-generic clean-libtool \ -+ clean-noinstPROGRAMS clean-pkglibLIBRARIES distclean \ -+ distclean-compile distclean-depend distclean-generic \ -+ distclean-libtool distclean-noinstPROGRAMS \ -+ distclean-pkglibLIBRARIES distclean-tags distdir dvi dvi-am \ -+ info info-am install install-am install-data install-data-am \ -+ install-exec install-exec-am install-pkglibLIBRARIES \ -+ install-strip installcheck installcheck-am installdirs \ -+ maintainer-clean maintainer-clean-generic \ -+ maintainer-clean-noinstPROGRAMS \ -+ maintainer-clean-pkglibLIBRARIES mostlyclean \ -+ mostlyclean-compile mostlyclean-generic mostlyclean-libtool \ -+ mostlyclean-noinstPROGRAMS mostlyclean-pkglibLIBRARIES tags \ -+ uninstall uninstall-am uninstall-pkglibLIBRARIES - - - # -diff -r -N -U3 mysql-3.23.32.orig/readline/Makefile.in mysql-3.23.32/readline/Makefile.in ---- mysql-3.23.32.orig/readline/Makefile.in Mon Jan 22 14:43:57 2001 -+++ mysql-3.23.32/readline/Makefile.in Thu Mar 1 17:00:58 2001 -@@ -1,6 +1,7 @@ --# Makefile.in generated automatically by automake 1.4 from Makefile.am -+# Makefile.in generated automatically by automake 1.4d from Makefile.am - --# Copyright (C) 1994, 1995-8, 1999 Free Software Foundation, Inc. -+# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001 -+# Free Software Foundation, Inc. - # This Makefile.in is free software; the Free Software Foundation - # gives unlimited permission to copy and/or distribute it, - # with or without modifications, as long as this notice is preserved. -@@ -10,10 +11,6 @@ - # even the implied warranty of MERCHANTABILITY or FITNESS FOR A - # PARTICULAR PURPOSE. - --# Makefile for the GNU readline library. --# Copyright (C) 1994,1996,1997 Free Software Foundation, Inc. -- -- - SHELL = @SHELL@ - - srcdir = @srcdir@ -@@ -35,8 +32,6 @@ - includedir = @includedir@ - oldincludedir = /usr/include - --DESTDIR = -- - pkgdatadir = $(datadir)/@PACKAGE@ - pkglibdir = $(libdir)/@PACKAGE@ - pkgincludedir = $(includedir)/@PACKAGE@ -@@ -49,9 +44,11 @@ - AUTOHEADER = @AUTOHEADER@ - - INSTALL = @INSTALL@ --INSTALL_PROGRAM = @INSTALL_PROGRAM@ $(AM_INSTALL_PROGRAM_FLAGS) -+INSTALL_PROGRAM = @INSTALL_PROGRAM@ - INSTALL_DATA = @INSTALL_DATA@ - INSTALL_SCRIPT = @INSTALL_SCRIPT@ -+INSTALL_STRIP_FLAG = -+INSTALL_HEADER = $(INSTALL_DATA) - transform = @program_transform_name@ - - NORMAL_INSTALL = : -@@ -60,6 +57,8 @@ - NORMAL_UNINSTALL = : - PRE_UNINSTALL = : - POST_UNINSTALL = : -+ -+@SET_MAKE@ - build_alias = @build_alias@ - build_triplet = @build@ - host_alias = @host_alias@ -@@ -67,6 +66,8 @@ - target_alias = @target_alias@ - target_triplet = @target@ - ALLOCA = @ALLOCA@ -+AMDEP = @AMDEP@ -+AMTAR = @AMTAR@ - AS = @AS@ - AVAILABLE_LANGUAGES = @AVAILABLE_LANGUAGES@ - AVAILABLE_LANGUAGES_ERRORS = @AVAILABLE_LANGUAGES_ERRORS@ -@@ -88,6 +89,7 @@ - CXX = @CXX@ - CXXFLAGS = @CXXFLAGS@ - CXXLDFLAGS = @CXXLDFLAGS@ -+DEPDIR = @DEPDIR@ - DLLTOOL = @DLLTOOL@ - DOT_FRM_VERSION = @DOT_FRM_VERSION@ - FIND_PROC = @FIND_PROC@ -@@ -141,11 +143,13 @@ - VERSION = @VERSION@ - WRAPLIBS = @WRAPLIBS@ - YACC = @YACC@ -+_am_include = @_am_include@ - bdb_includes = @bdb_includes@ - bdb_libs = @bdb_libs@ - bench_dirs = @bench_dirs@ - default_charset = @default_charset@ - docs_dirs = @docs_dirs@ -+install_sh = @install_sh@ - linked_client_targets = @linked_client_targets@ - readline_dir = @readline_dir@ - readline_link = @readline_link@ -@@ -155,21 +159,38 @@ - thread_dirs = @thread_dirs@ - uname_prog = @uname_prog@ - -+# Makefile for the GNU readline library. -+# Copyright (C) 1994,1996,1997 Free Software Foundation, Inc. -+ -+ - INCLUDES = -I$(srcdir)/../include -I$(srcdir)/.. -I.. - - noinst_LIBRARIES = libreadline.a - --libreadline_a_SOURCES = readline.c funmap.c keymaps.c vi_mode.c parens.c rltty.c complete.c bind.c isearch.c display.c signals.c util.c kill.c undo.c macro.c input.c callback.c terminal.c xmalloc.c history.c histsearch.c histexpand.c histfile.c nls.c search.c shell.c tilde.c -+libreadline_a_SOURCES = readline.c funmap.c keymaps.c \ -+ vi_mode.c parens.c rltty.c \ -+ complete.c bind.c isearch.c \ -+ display.c signals.c \ -+ util.c kill.c \ -+ undo.c macro.c input.c \ -+ callback.c terminal.c xmalloc.c \ -+ history.c histsearch.c histexpand.c \ -+ histfile.c nls.c search.c \ -+ shell.c tilde.c - - - pkginclude_HEADERS = readline.h chardefs.h keymaps.h history.h tilde.h - --noinst_HEADERS = rldefs.h histlib.h rlwinsize.h posixstat.h posixdir.h posixjmp.h tilde.h rlconf.h rltty.h ansi_stdlib.h tcap.h rlstdc.h -+noinst_HEADERS = rldefs.h histlib.h rlwinsize.h \ -+ posixstat.h posixdir.h posixjmp.h \ -+ tilde.h rlconf.h rltty.h ansi_stdlib.h \ -+ tcap.h rlstdc.h - - - EXTRA_DIST = emacs_keymap.c vi_keymap.c - - DEFS = -DUNDEF_THREADS_HACK -DHAVE_CONFIG_H -+subdir = readline - mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs - CONFIG_HEADER = ../config.h - CONFIG_CLEAN_FILES = -@@ -178,38 +199,51 @@ - CPPFLAGS = @CPPFLAGS@ - LDFLAGS = @LDFLAGS@ - LIBS = @LIBS@ -+libreadline_a_AR = $(AR) cru - libreadline_a_LIBADD = --libreadline_a_OBJECTS = readline.o funmap.o keymaps.o vi_mode.o \ -+am_libreadline_a_OBJECTS = readline.o funmap.o keymaps.o vi_mode.o \ - parens.o rltty.o complete.o bind.o isearch.o display.o signals.o util.o \ - kill.o undo.o macro.o input.o callback.o terminal.o xmalloc.o history.o \ - histsearch.o histexpand.o histfile.o nls.o search.o shell.o tilde.o -+libreadline_a_OBJECTS = $(am_libreadline_a_OBJECTS) - AR = ar - COMPILE = $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) - LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) - CCLD = $(CC) --LINK = $(LIBTOOL) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(LDFLAGS) -o $@ -+LINK = $(LIBTOOL) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@ -+DIST_SOURCES = $(libreadline_a_SOURCES) - HEADERS = $(noinst_HEADERS) $(pkginclude_HEADERS) - --DIST_COMMON = README COPYING INSTALL Makefile.am Makefile.in configure \ --configure.in -+depcomp = $(SHELL) $(top_srcdir)/depcomp -+@AMDEP@DEP_FILES = $(DEPDIR)/bind.Po $(DEPDIR)/callback.Po \ -+@AMDEP@$(DEPDIR)/complete.Po $(DEPDIR)/display.Po $(DEPDIR)/funmap.Po \ -+@AMDEP@$(DEPDIR)/histexpand.Po $(DEPDIR)/histfile.Po \ -+@AMDEP@$(DEPDIR)/history.Po $(DEPDIR)/histsearch.Po $(DEPDIR)/input.Po \ -+@AMDEP@$(DEPDIR)/isearch.Po $(DEPDIR)/keymaps.Po $(DEPDIR)/kill.Po \ -+@AMDEP@$(DEPDIR)/macro.Po $(DEPDIR)/nls.Po $(DEPDIR)/parens.Po \ -+@AMDEP@$(DEPDIR)/readline.Po $(DEPDIR)/rltty.Po $(DEPDIR)/search.Po \ -+@AMDEP@$(DEPDIR)/shell.Po $(DEPDIR)/signals.Po $(DEPDIR)/terminal.Po \ -+@AMDEP@$(DEPDIR)/tilde.Po $(DEPDIR)/undo.Po $(DEPDIR)/util.Po \ -+@AMDEP@$(DEPDIR)/vi_mode.Po $(DEPDIR)/xmalloc.Po -+DIST_COMMON = README $(noinst_HEADERS) $(pkginclude_HEADERS) COPYING \ -+INSTALL Makefile.am Makefile.in configure configure.in - - --DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST) -+DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) - --TAR = gtar - GZIP_ENV = --best - SOURCES = $(libreadline_a_SOURCES) --OBJECTS = $(libreadline_a_OBJECTS) -+OBJECTS = $(am_libreadline_a_OBJECTS) - --all: all-redirect -+all: all-am - .SUFFIXES: --.SUFFIXES: .S .c .lo .o .s -+.SUFFIXES: .c .lo .o - $(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 - cd $(top_builddir) \ -- && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status -+ && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= CONFIG_LINKS= $(SHELL) ./config.status - - - mostlyclean-noinstLIBRARIES: -@@ -221,34 +255,12 @@ - - maintainer-clean-noinstLIBRARIES: - --.c.o: -- $(COMPILE) -c $< -- --.s.o: -- $(COMPILE) -c $< -- --.S.o: -- $(COMPILE) -c $< -- - mostlyclean-compile: - -rm -f *.o core *.core - --clean-compile: -- - distclean-compile: - -rm -f *.tab.c - --maintainer-clean-compile: -- --.c.lo: -- $(LIBTOOL) --mode=compile $(COMPILE) -c $< -- --.s.lo: -- $(LIBTOOL) --mode=compile $(COMPILE) -c $< -- --.S.lo: -- $(LIBTOOL) --mode=compile $(COMPILE) -c $< -- - mostlyclean-libtool: - -rm -f *.lo - -@@ -256,129 +268,124 @@ - -rm -rf .libs _libs - - distclean-libtool: -- --maintainer-clean-libtool: -+ -rm -f libtool - - libreadline.a: $(libreadline_a_OBJECTS) $(libreadline_a_DEPENDENCIES) - -rm -f libreadline.a -- $(AR) cru libreadline.a $(libreadline_a_OBJECTS) $(libreadline_a_LIBADD) -+ $(libreadline_a_AR) libreadline.a $(libreadline_a_OBJECTS) $(libreadline_a_LIBADD) - $(RANLIB) libreadline.a - - install-pkgincludeHEADERS: $(pkginclude_HEADERS) - @$(NORMAL_INSTALL) - $(mkinstalldirs) $(DESTDIR)$(pkgincludedir) - @list='$(pkginclude_HEADERS)'; for p in $$list; do \ -- if test -f "$$p"; then d= ; else d="$(srcdir)/"; fi; \ -- echo " $(INSTALL_DATA) $$d$$p $(DESTDIR)$(pkgincludedir)/$$p"; \ -- $(INSTALL_DATA) $$d$$p $(DESTDIR)$(pkgincludedir)/$$p; \ -+ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ -+ f="`echo $$p | sed -e 's|^.*/||'`"; \ -+ echo " $(INSTALL_HEADER) $$d$$p $(DESTDIR)$(pkgincludedir)/$$f"; \ -+ $(INSTALL_HEADER) $$d$$p $(DESTDIR)$(pkgincludedir)/$$f; \ - done - - uninstall-pkgincludeHEADERS: - @$(NORMAL_UNINSTALL) -- list='$(pkginclude_HEADERS)'; for p in $$list; do \ -- rm -f $(DESTDIR)$(pkgincludedir)/$$p; \ -+ @list='$(pkginclude_HEADERS)'; for p in $$list; do \ -+ f="`echo $$p | sed -e 's|^.*/||'`"; \ -+ echo " rm -f $(DESTDIR)$(pkgincludedir)/$$f"; \ -+ rm -f $(DESTDIR)$(pkgincludedir)/$$f; \ - done - - tags: TAGS - --ID: $(HEADERS) $(SOURCES) $(LISP) -- list='$(SOURCES) $(HEADERS)'; \ -- unique=`for i in $$list; do echo $$i; done | \ -- awk ' { files[$$0] = 1; } \ -+ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) -+ list='$(SOURCES) $(HEADERS) $(TAGS_FILES)'; \ -+ unique=`for i in $$list; do \ -+ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ -+ done | \ -+ $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ -- here=`pwd` && cd $(srcdir) \ -- && mkid -f$$here/ID $$unique $(LISP) -+ mkid -fID $$unique $(LISP) - --TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) $(LISP) -+TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ -+ $(TAGS_FILES) $(LISP) - tags=; \ - here=`pwd`; \ -- list='$(SOURCES) $(HEADERS)'; \ -- unique=`for i in $$list; do echo $$i; done | \ -- awk ' { files[$$0] = 1; } \ -+ list='$(SOURCES) $(HEADERS) $(TAGS_FILES)'; \ -+ unique=`for i in $$list; do \ -+ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ -+ done | \ -+ $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ - test -z "$(ETAGS_ARGS)$$unique$(LISP)$$tags" \ -- || (cd $(srcdir) && etags $(ETAGS_ARGS) $$tags $$unique $(LISP) -o $$here/TAGS) -- --mostlyclean-tags: -+ || etags $(ETAGS_ARGS) $$tags $$unique $(LISP) - --clean-tags: -+GTAGS: -+ here=`CDPATH=: && cd $(top_builddir) && pwd` \ -+ && cd $(top_srcdir) \ -+ && gtags -i $$here - - distclean-tags: - -rm -f TAGS ID - --maintainer-clean-tags: -+@AMDEP@@_am_include@ $(DEPDIR)/bind.Po -+@AMDEP@@_am_include@ $(DEPDIR)/callback.Po -+@AMDEP@@_am_include@ $(DEPDIR)/complete.Po -+@AMDEP@@_am_include@ $(DEPDIR)/display.Po -+@AMDEP@@_am_include@ $(DEPDIR)/funmap.Po -+@AMDEP@@_am_include@ $(DEPDIR)/histexpand.Po -+@AMDEP@@_am_include@ $(DEPDIR)/histfile.Po -+@AMDEP@@_am_include@ $(DEPDIR)/history.Po -+@AMDEP@@_am_include@ $(DEPDIR)/histsearch.Po -+@AMDEP@@_am_include@ $(DEPDIR)/input.Po -+@AMDEP@@_am_include@ $(DEPDIR)/isearch.Po -+@AMDEP@@_am_include@ $(DEPDIR)/keymaps.Po -+@AMDEP@@_am_include@ $(DEPDIR)/kill.Po -+@AMDEP@@_am_include@ $(DEPDIR)/macro.Po -+@AMDEP@@_am_include@ $(DEPDIR)/nls.Po -+@AMDEP@@_am_include@ $(DEPDIR)/parens.Po -+@AMDEP@@_am_include@ $(DEPDIR)/readline.Po -+@AMDEP@@_am_include@ $(DEPDIR)/rltty.Po -+@AMDEP@@_am_include@ $(DEPDIR)/search.Po -+@AMDEP@@_am_include@ $(DEPDIR)/shell.Po -+@AMDEP@@_am_include@ $(DEPDIR)/signals.Po -+@AMDEP@@_am_include@ $(DEPDIR)/terminal.Po -+@AMDEP@@_am_include@ $(DEPDIR)/tilde.Po -+@AMDEP@@_am_include@ $(DEPDIR)/undo.Po -+@AMDEP@@_am_include@ $(DEPDIR)/util.Po -+@AMDEP@@_am_include@ $(DEPDIR)/vi_mode.Po -+@AMDEP@@_am_include@ $(DEPDIR)/xmalloc.Po -+ -+distclean-depend: -+ -rm -rf $(DEPDIR) -+ -+@AMDEP@CCDEPMODE = @CCDEPMODE@ -+ -+.c.o: -+@AMDEP@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ -+@AMDEP@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@ -+@AMDEP@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -+ $(COMPILE) -c -o $@ `test -f $< || echo '$(srcdir)/'`$< -+ -+.c.lo: -+@AMDEP@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ -+@AMDEP@ depfile='$(DEPDIR)/$*.Plo' tmpdepfile='$(DEPDIR)/$*.TPlo' @AMDEPBACKSLASH@ -+@AMDEP@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -+ $(LTCOMPILE) -c -o $@ `test -f $< || echo '$(srcdir)/'`$< -+ - - distdir = $(top_builddir)/$(PACKAGE)-$(VERSION)/$(subdir) - --subdir = readline - - distdir: $(DISTFILES) - @for file in $(DISTFILES); do \ - d=$(srcdir); \ - if test -d $$d/$$file; then \ -- cp -pr $$d/$$file $(distdir)/$$file; \ -+ cp -pR $$d/$$file $(distdir) \ -+ || exit 1; \ - else \ - test -f $(distdir)/$$file \ -- || ln $$d/$$file $(distdir)/$$file 2> /dev/null \ -- || cp -p $$d/$$file $(distdir)/$$file || :; \ -+ || cp -p $$d/$$file $(distdir)/$$file \ -+ || exit 1; \ - 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 -- - info-am: - info: info-am - dvi-am: -@@ -399,9 +406,8 @@ - uninstall-am: uninstall-pkgincludeHEADERS - uninstall: uninstall-am - all-am: Makefile $(LIBRARIES) $(HEADERS) --all-redirect: all-am - install-strip: -- $(MAKE) $(AM_MAKEFLAGS) AM_INSTALL_PROGRAM_FLAGS=-s install -+ $(MAKE) $(AM_MAKEFLAGS) INSTALL_STRIP_FLAG=-s install - installdirs: - $(mkinstalldirs) $(DESTDIR)$(pkgincludedir) - -@@ -415,45 +421,42 @@ - -rm -f config.cache config.log stamp-h stamp-h[0-9]* - - maintainer-clean-generic: --mostlyclean-am: mostlyclean-noinstLIBRARIES mostlyclean-compile \ -- mostlyclean-libtool mostlyclean-tags \ -- mostlyclean-generic -- --mostlyclean: mostlyclean-am -- --clean-am: clean-noinstLIBRARIES clean-compile clean-libtool clean-tags \ -- clean-generic mostlyclean-am -- -+ @echo "This command is intended for maintainers to use" -+ @echo "it deletes files that may require special tools to rebuild." -+ -rm -f Makefile.in - clean: clean-am - --distclean-am: distclean-noinstLIBRARIES distclean-compile \ -- distclean-libtool distclean-tags distclean-generic \ -- clean-am -- -rm -f libtool -+clean-am: clean-generic clean-libtool clean-noinstLIBRARIES \ -+ mostlyclean-am - - distclean: distclean-am - --maintainer-clean-am: maintainer-clean-noinstLIBRARIES \ -- maintainer-clean-compile maintainer-clean-libtool \ -- maintainer-clean-tags 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." -+distclean-am: clean-am distclean-compile distclean-depend \ -+ distclean-generic distclean-libtool distclean-noinstLIBRARIES \ -+ distclean-tags - - maintainer-clean: maintainer-clean-am - --.PHONY: mostlyclean-noinstLIBRARIES distclean-noinstLIBRARIES \ --clean-noinstLIBRARIES maintainer-clean-noinstLIBRARIES \ --mostlyclean-compile distclean-compile clean-compile \ --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 -+maintainer-clean-am: distclean-am maintainer-clean-generic \ -+ maintainer-clean-noinstLIBRARIES -+ -+mostlyclean: mostlyclean-am -+ -+mostlyclean-am: mostlyclean-compile mostlyclean-generic \ -+ mostlyclean-libtool mostlyclean-noinstLIBRARIES -+ -+.PHONY: check check-am clean clean-generic clean-libtool \ -+ clean-noinstLIBRARIES distclean distclean-compile \ -+ distclean-depend distclean-generic distclean-libtool \ -+ distclean-noinstLIBRARIES distclean-tags distdir dvi dvi-am \ -+ info info-am install install-am install-data install-data-am \ -+ install-exec install-exec-am install-pkgincludeHEADERS \ -+ install-strip installcheck installcheck-am installdirs \ -+ maintainer-clean maintainer-clean-generic \ -+ maintainer-clean-noinstLIBRARIES mostlyclean \ -+ mostlyclean-compile mostlyclean-generic mostlyclean-libtool \ -+ mostlyclean-noinstLIBRARIES tags uninstall uninstall-am \ -+ uninstall-pkgincludeHEADERS - - - # Don't update the files from bitkeeper -diff -r -N -U3 mysql-3.23.32.orig/regex/Makefile.in mysql-3.23.32/regex/Makefile.in ---- mysql-3.23.32.orig/regex/Makefile.in Mon Jan 22 14:44:06 2001 -+++ mysql-3.23.32/regex/Makefile.in Thu Mar 1 17:00:54 2001 -@@ -1,6 +1,7 @@ --# Makefile.in generated automatically by automake 1.4 from Makefile.am -+# Makefile.in generated automatically by automake 1.4d from Makefile.am - --# Copyright (C) 1994, 1995-8, 1999 Free Software Foundation, Inc. -+# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001 -+# Free Software Foundation, Inc. - # This Makefile.in is free software; the Free Software Foundation - # gives unlimited permission to copy and/or distribute it, - # with or without modifications, as long as this notice is preserved. -@@ -10,24 +11,6 @@ - # even the implied warranty of MERCHANTABILITY or FITNESS FOR A - # PARTICULAR PURPOSE. - --# Copyright (C) 2000 MySQL AB & MySQL Finland AB & TCX DataKonsult AB --# --# This library is free software; you can redistribute it and/or --# modify it under the terms of the GNU Library General Public --# License as published by the Free Software Foundation; either --# version 2 of the License, or (at your option) any later version. --# --# This library is distributed in the hope that it will be useful, --# but WITHOUT ANY WARRANTY; without even the implied warranty of --# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU --# Library General Public License for more details. --# --# You should have received a copy of the GNU Library General Public --# License along with this library; if not, write to the Free --# Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, --# MA 02111-1307, USA -- -- - SHELL = @SHELL@ - - srcdir = @srcdir@ -@@ -49,8 +32,6 @@ - includedir = @includedir@ - oldincludedir = /usr/include - --DESTDIR = -- - pkgdatadir = $(datadir)/@PACKAGE@ - pkglibdir = $(libdir)/@PACKAGE@ - pkgincludedir = $(includedir)/@PACKAGE@ -@@ -63,9 +44,11 @@ - AUTOHEADER = @AUTOHEADER@ - - INSTALL = @INSTALL@ --INSTALL_PROGRAM = @INSTALL_PROGRAM@ $(AM_INSTALL_PROGRAM_FLAGS) -+INSTALL_PROGRAM = @INSTALL_PROGRAM@ - INSTALL_DATA = @INSTALL_DATA@ - INSTALL_SCRIPT = @INSTALL_SCRIPT@ -+INSTALL_STRIP_FLAG = -+INSTALL_HEADER = $(INSTALL_DATA) - transform = @program_transform_name@ - - NORMAL_INSTALL = : -@@ -74,6 +57,8 @@ - NORMAL_UNINSTALL = : - PRE_UNINSTALL = : - POST_UNINSTALL = : -+ -+@SET_MAKE@ - build_alias = @build_alias@ - build_triplet = @build@ - host_alias = @host_alias@ -@@ -81,6 +66,8 @@ - target_alias = @target_alias@ - target_triplet = @target@ - ALLOCA = @ALLOCA@ -+AMDEP = @AMDEP@ -+AMTAR = @AMTAR@ - AS = @AS@ - AVAILABLE_LANGUAGES = @AVAILABLE_LANGUAGES@ - AVAILABLE_LANGUAGES_ERRORS = @AVAILABLE_LANGUAGES_ERRORS@ -@@ -102,6 +89,7 @@ - CXX = @CXX@ - CXXFLAGS = @CXXFLAGS@ - CXXLDFLAGS = @CXXLDFLAGS@ -+DEPDIR = @DEPDIR@ - DLLTOOL = @DLLTOOL@ - DOT_FRM_VERSION = @DOT_FRM_VERSION@ - FIND_PROC = @FIND_PROC@ -@@ -155,11 +143,13 @@ - VERSION = @VERSION@ - WRAPLIBS = @WRAPLIBS@ - YACC = @YACC@ -+_am_include = @_am_include@ - bdb_includes = @bdb_includes@ - bdb_libs = @bdb_libs@ - bench_dirs = @bench_dirs@ - default_charset = @default_charset@ - docs_dirs = @docs_dirs@ -+install_sh = @install_sh@ - linked_client_targets = @linked_client_targets@ - readline_dir = @readline_dir@ - readline_link = @readline_link@ -@@ -169,6 +159,24 @@ - thread_dirs = @thread_dirs@ - uname_prog = @uname_prog@ - -+# Copyright (C) 2000 MySQL AB & MySQL Finland AB & TCX DataKonsult AB -+# -+# This library is free software; you can redistribute it and/or -+# modify it under the terms of the GNU Library General Public -+# License as published by the Free Software Foundation; either -+# version 2 of the License, or (at your option) any later version. -+# -+# This library is distributed in the hope that it will be useful, -+# but WITHOUT ANY WARRANTY; without even the implied warranty of -+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -+# Library General Public License for more details. -+# -+# You should have received a copy of the GNU Library General Public -+# License along with this library; if not, write to the Free -+# Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, -+# MA 02111-1307, USA -+ -+ - INCLUDES = @MT_INCLUDES@ -I$(srcdir)/../include -I../include - noinst_LIBRARIES = libregex.a - LDADD = libregex.a ../strings/libmystrings.a -@@ -177,11 +185,21 @@ - noinst_PROGRAMS = re - re_SOURCES = split.c debug.c main.c - re_DEPENDENCIES = $(LIBRARIES) --EXTRA_DIST = tests CHANGES COPYRIGHT WHATSNEW regexp.c debug.ih engine.ih main.ih regcomp.ih regerror.ih regex.3 regex.7 -+EXTRA_DIST = tests CHANGES COPYRIGHT WHATSNEW regexp.c \ -+ debug.ih engine.ih main.ih regcomp.ih regerror.ih \ -+ regex.3 regex.7 - - --OMIT_DEPENDENCIES = pthread.h stdio.h __stdio.h stdlib.h __stdlib.h math.h __math.h time.h __time.h unistd.h __unistd.h types.h xtypes.h ac-types.h posix.h string.h __string.h errno.h socket.h inet.h dirent.h netdb.h cleanup.h cond.h debug_out.h fd.h kernel.h mutex.h prio_queue.h pthread_attr.h pthread_once.h queue.h sleep.h specific.h version.h pwd.h timers.h uio.h cdefs.h machdep.h signal.h __signal.h util.h -+OMIT_DEPENDENCIES = pthread.h stdio.h __stdio.h stdlib.h __stdlib.h math.h\ -+ __math.h time.h __time.h unistd.h __unistd.h types.h \ -+ xtypes.h ac-types.h posix.h string.h __string.h \ -+ errno.h socket.h inet.h dirent.h netdb.h \ -+ cleanup.h cond.h debug_out.h fd.h kernel.h mutex.h \ -+ prio_queue.h pthread_attr.h pthread_once.h queue.h\ -+ sleep.h specific.h version.h pwd.h timers.h uio.h \ -+ cdefs.h machdep.h signal.h __signal.h util.h - -+subdir = regex - mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs - CONFIG_HEADER = ../config.h - CONFIG_CLEAN_FILES = -@@ -192,39 +210,47 @@ - CPPFLAGS = @CPPFLAGS@ - LDFLAGS = @LDFLAGS@ - LIBS = @LIBS@ -+libregex_a_AR = $(AR) cru - libregex_a_LIBADD = --libregex_a_OBJECTS = regerror.o regcomp.o regexec.o regfree.o reginit.o -+am_libregex_a_OBJECTS = regerror.o regcomp.o regexec.o regfree.o \ -+reginit.o -+libregex_a_OBJECTS = $(am_libregex_a_OBJECTS) - AR = ar - PROGRAMS = $(noinst_PROGRAMS) - --re_OBJECTS = split.o debug.o main.o -+am_re_OBJECTS = split.o debug.o main.o -+re_OBJECTS = $(am_re_OBJECTS) - re_LDADD = $(LDADD) - re_LDFLAGS = - COMPILE = $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) - LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) - CCLD = $(CC) --LINK = $(LIBTOOL) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(LDFLAGS) -o $@ -+LINK = $(LIBTOOL) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@ -+DIST_SOURCES = $(libregex_a_SOURCES) $(re_SOURCES) - HEADERS = $(noinst_HEADERS) - --DIST_COMMON = README Makefile.am Makefile.in -+depcomp = $(SHELL) $(top_srcdir)/depcomp -+@AMDEP@DEP_FILES = $(DEPDIR)/debug.Po $(DEPDIR)/main.Po \ -+@AMDEP@$(DEPDIR)/regcomp.Po $(DEPDIR)/regerror.Po $(DEPDIR)/regexec.Po \ -+@AMDEP@$(DEPDIR)/regfree.Po $(DEPDIR)/reginit.Po $(DEPDIR)/split.Po -+DIST_COMMON = README $(noinst_HEADERS) Makefile.am Makefile.in - - --DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST) -+DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) - --TAR = gtar - GZIP_ENV = --best - SOURCES = $(libregex_a_SOURCES) $(re_SOURCES) --OBJECTS = $(libregex_a_OBJECTS) $(re_OBJECTS) -+OBJECTS = $(am_libregex_a_OBJECTS) $(am_re_OBJECTS) - --all: all-redirect -+all: all-am - .SUFFIXES: --.SUFFIXES: .S .c .lo .o .s -+.SUFFIXES: .c .lo .o - $(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 - cd $(top_builddir) \ -- && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status -+ && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= CONFIG_LINKS= $(SHELL) ./config.status - - - mostlyclean-noinstLIBRARIES: -@@ -236,34 +262,12 @@ - - maintainer-clean-noinstLIBRARIES: - --.c.o: -- $(COMPILE) -c $< -- --.s.o: -- $(COMPILE) -c $< -- --.S.o: -- $(COMPILE) -c $< -- - mostlyclean-compile: - -rm -f *.o core *.core - --clean-compile: -- - distclean-compile: - -rm -f *.tab.c - --maintainer-clean-compile: -- --.c.lo: -- $(LIBTOOL) --mode=compile $(COMPILE) -c $< -- --.s.lo: -- $(LIBTOOL) --mode=compile $(COMPILE) -c $< -- --.S.lo: -- $(LIBTOOL) --mode=compile $(COMPILE) -c $< -- - mostlyclean-libtool: - -rm -f *.lo - -@@ -271,12 +275,11 @@ - -rm -rf .libs _libs - - distclean-libtool: -- --maintainer-clean-libtool: -+ -rm -f libtool - - libregex.a: $(libregex_a_OBJECTS) $(libregex_a_DEPENDENCIES) - -rm -f libregex.a -- $(AR) cru libregex.a $(libregex_a_OBJECTS) $(libregex_a_LIBADD) -+ $(libregex_a_AR) libregex.a $(libregex_a_OBJECTS) $(libregex_a_LIBADD) - $(RANLIB) libregex.a - - mostlyclean-noinstPROGRAMS: -@@ -294,82 +297,78 @@ - - tags: TAGS - --ID: $(HEADERS) $(SOURCES) $(LISP) -- list='$(SOURCES) $(HEADERS)'; \ -- unique=`for i in $$list; do echo $$i; done | \ -- awk ' { files[$$0] = 1; } \ -+ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) -+ list='$(SOURCES) $(HEADERS) $(TAGS_FILES)'; \ -+ unique=`for i in $$list; do \ -+ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ -+ done | \ -+ $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ -- here=`pwd` && cd $(srcdir) \ -- && mkid -f$$here/ID $$unique $(LISP) -+ mkid -fID $$unique $(LISP) - --TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) $(LISP) -+TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ -+ $(TAGS_FILES) $(LISP) - tags=; \ - here=`pwd`; \ -- list='$(SOURCES) $(HEADERS)'; \ -- unique=`for i in $$list; do echo $$i; done | \ -- awk ' { files[$$0] = 1; } \ -+ list='$(SOURCES) $(HEADERS) $(TAGS_FILES)'; \ -+ unique=`for i in $$list; do \ -+ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ -+ done | \ -+ $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ - test -z "$(ETAGS_ARGS)$$unique$(LISP)$$tags" \ -- || (cd $(srcdir) && etags $(ETAGS_ARGS) $$tags $$unique $(LISP) -o $$here/TAGS) -- --mostlyclean-tags: -+ || etags $(ETAGS_ARGS) $$tags $$unique $(LISP) - --clean-tags: -+GTAGS: -+ here=`CDPATH=: && cd $(top_builddir) && pwd` \ -+ && cd $(top_srcdir) \ -+ && gtags -i $$here - - distclean-tags: - -rm -f TAGS ID - --maintainer-clean-tags: -+@AMDEP@@_am_include@ $(DEPDIR)/debug.Po -+@AMDEP@@_am_include@ $(DEPDIR)/main.Po -+@AMDEP@@_am_include@ $(DEPDIR)/regcomp.Po -+@AMDEP@@_am_include@ $(DEPDIR)/regerror.Po -+@AMDEP@@_am_include@ $(DEPDIR)/regexec.Po -+@AMDEP@@_am_include@ $(DEPDIR)/regfree.Po -+@AMDEP@@_am_include@ $(DEPDIR)/reginit.Po -+@AMDEP@@_am_include@ $(DEPDIR)/split.Po -+ -+distclean-depend: -+ -rm -rf $(DEPDIR) -+ -+@AMDEP@CCDEPMODE = @CCDEPMODE@ -+ -+.c.o: -+@AMDEP@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ -+@AMDEP@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@ -+@AMDEP@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -+ $(COMPILE) -c -o $@ `test -f $< || echo '$(srcdir)/'`$< -+ -+.c.lo: -+@AMDEP@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ -+@AMDEP@ depfile='$(DEPDIR)/$*.Plo' tmpdepfile='$(DEPDIR)/$*.TPlo' @AMDEPBACKSLASH@ -+@AMDEP@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -+ $(LTCOMPILE) -c -o $@ `test -f $< || echo '$(srcdir)/'`$< -+ - - distdir = $(top_builddir)/$(PACKAGE)-$(VERSION)/$(subdir) - --subdir = regex - - distdir: $(DISTFILES) - @for file in $(DISTFILES); do \ - d=$(srcdir); \ - if test -d $$d/$$file; then \ -- cp -pr $$d/$$file $(distdir)/$$file; \ -+ cp -pR $$d/$$file $(distdir) \ -+ || exit 1; \ - else \ - test -f $(distdir)/$$file \ -- || ln $$d/$$file $(distdir)/$$file 2> /dev/null \ -- || cp -p $$d/$$file $(distdir)/$$file || :; \ -+ || cp -p $$d/$$file $(distdir)/$$file \ -+ || exit 1; \ - 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 -- - info-am: - info: info-am - dvi-am: -@@ -390,9 +389,8 @@ - uninstall-am: - uninstall: uninstall-am - all-am: Makefile $(LIBRARIES) $(PROGRAMS) $(HEADERS) --all-redirect: all-am - install-strip: -- $(MAKE) $(AM_MAKEFLAGS) AM_INSTALL_PROGRAM_FLAGS=-s install -+ $(MAKE) $(AM_MAKEFLAGS) INSTALL_STRIP_FLAG=-s install - installdirs: - - -@@ -405,47 +403,45 @@ - -rm -f config.cache config.log stamp-h stamp-h[0-9]* - - maintainer-clean-generic: --mostlyclean-am: mostlyclean-noinstLIBRARIES mostlyclean-compile \ -- mostlyclean-libtool mostlyclean-noinstPROGRAMS \ -- mostlyclean-tags mostlyclean-generic -- --mostlyclean: mostlyclean-am -- --clean-am: clean-noinstLIBRARIES clean-compile clean-libtool \ -- clean-noinstPROGRAMS clean-tags clean-generic \ -- mostlyclean-am -- -+ @echo "This command is intended for maintainers to use" -+ @echo "it deletes files that may require special tools to rebuild." -+ -rm -f Makefile.in - clean: clean-am - --distclean-am: distclean-noinstLIBRARIES distclean-compile \ -- distclean-libtool distclean-noinstPROGRAMS \ -- distclean-tags distclean-generic clean-am -- -rm -f libtool -+clean-am: clean-generic clean-libtool clean-noinstLIBRARIES \ -+ clean-noinstPROGRAMS mostlyclean-am - - distclean: distclean-am - --maintainer-clean-am: maintainer-clean-noinstLIBRARIES \ -- maintainer-clean-compile maintainer-clean-libtool \ -- maintainer-clean-noinstPROGRAMS maintainer-clean-tags \ -- 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." -+distclean-am: clean-am distclean-compile distclean-depend \ -+ distclean-generic distclean-libtool distclean-noinstLIBRARIES \ -+ distclean-noinstPROGRAMS distclean-tags - - maintainer-clean: maintainer-clean-am - --.PHONY: mostlyclean-noinstLIBRARIES distclean-noinstLIBRARIES \ --clean-noinstLIBRARIES maintainer-clean-noinstLIBRARIES \ --mostlyclean-compile distclean-compile clean-compile \ --maintainer-clean-compile mostlyclean-libtool distclean-libtool \ --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 -+maintainer-clean-am: distclean-am maintainer-clean-generic \ -+ maintainer-clean-noinstLIBRARIES \ -+ maintainer-clean-noinstPROGRAMS -+ -+mostlyclean: mostlyclean-am -+ -+mostlyclean-am: mostlyclean-compile mostlyclean-generic \ -+ mostlyclean-libtool mostlyclean-noinstLIBRARIES \ -+ mostlyclean-noinstPROGRAMS -+ -+.PHONY: check check-am clean clean-generic clean-libtool \ -+ clean-noinstLIBRARIES clean-noinstPROGRAMS distclean \ -+ distclean-compile distclean-depend distclean-generic \ -+ distclean-libtool distclean-noinstLIBRARIES \ -+ distclean-noinstPROGRAMS distclean-tags distdir dvi dvi-am info \ -+ info-am install install-am install-data install-data-am \ -+ install-exec install-exec-am install-strip installcheck \ -+ installcheck-am installdirs maintainer-clean \ -+ maintainer-clean-generic maintainer-clean-noinstLIBRARIES \ -+ maintainer-clean-noinstPROGRAMS mostlyclean mostlyclean-compile \ -+ mostlyclean-generic mostlyclean-libtool \ -+ mostlyclean-noinstLIBRARIES mostlyclean-noinstPROGRAMS tags \ -+ uninstall uninstall-am - - - test: re tests -diff -r -N -U3 mysql-3.23.32.orig/scripts/Makefile.in mysql-3.23.32/scripts/Makefile.in ---- mysql-3.23.32.orig/scripts/Makefile.in Mon Jan 22 14:44:17 2001 -+++ mysql-3.23.32/scripts/Makefile.in Thu Mar 1 17:01:05 2001 -@@ -1,6 +1,7 @@ --# Makefile.in generated automatically by automake 1.4 from Makefile.am -+# Makefile.in generated automatically by automake 1.4d from Makefile.am - --# Copyright (C) 1994, 1995-8, 1999 Free Software Foundation, Inc. -+# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001 -+# Free Software Foundation, Inc. - # This Makefile.in is free software; the Free Software Foundation - # gives unlimited permission to copy and/or distribute it, - # with or without modifications, as long as this notice is preserved. -@@ -10,23 +11,6 @@ - # even the implied warranty of MERCHANTABILITY or FITNESS FOR A - # PARTICULAR PURPOSE. - --# Copyright (C) 2000 MySQL AB & MySQL Finland AB & TCX DataKonsult AB --# --# This program is free software; you can redistribute it and/or modify --# it under the terms of the GNU General Public License as published by --# the Free Software Foundation; either version 2 of the License, or --# (at your option) any later version. --# --# This program is distributed in the hope that it will be useful, --# but WITHOUT ANY WARRANTY; without even the implied warranty of --# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the --# GNU General Public License for more details. --# --# You should have received a copy of the GNU General Public License --# along with this program; if not, write to the Free Software --# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -- -- - SHELL = @SHELL@ - - srcdir = @srcdir@ -@@ -48,8 +32,6 @@ - includedir = @includedir@ - oldincludedir = /usr/include - --DESTDIR = -- - pkgdatadir = $(datadir)/@PACKAGE@ - pkglibdir = $(libdir)/@PACKAGE@ - pkgincludedir = $(includedir)/@PACKAGE@ -@@ -62,9 +44,11 @@ - AUTOHEADER = @AUTOHEADER@ - - INSTALL = @INSTALL@ --INSTALL_PROGRAM = @INSTALL_PROGRAM@ $(AM_INSTALL_PROGRAM_FLAGS) -+INSTALL_PROGRAM = @INSTALL_PROGRAM@ - INSTALL_DATA = @INSTALL_DATA@ - INSTALL_SCRIPT = @INSTALL_SCRIPT@ -+INSTALL_STRIP_FLAG = -+INSTALL_HEADER = $(INSTALL_DATA) - transform = @program_transform_name@ - - NORMAL_INSTALL = : -@@ -73,6 +57,8 @@ - NORMAL_UNINSTALL = : - PRE_UNINSTALL = : - POST_UNINSTALL = : -+ -+@SET_MAKE@ - build_alias = @build_alias@ - build_triplet = @build@ - host_alias = @host_alias@ -@@ -80,6 +66,8 @@ - target_alias = @target_alias@ - target_triplet = @target@ - ALLOCA = @ALLOCA@ -+AMDEP = @AMDEP@ -+AMTAR = @AMTAR@ - AS = @AS@ - AVAILABLE_LANGUAGES = @AVAILABLE_LANGUAGES@ - AVAILABLE_LANGUAGES_ERRORS = @AVAILABLE_LANGUAGES_ERRORS@ -@@ -101,6 +89,7 @@ - CXX = @CXX@ - CXXFLAGS = @CXXFLAGS@ - CXXLDFLAGS = @CXXLDFLAGS@ -+DEPDIR = @DEPDIR@ - DLLTOOL = @DLLTOOL@ - DOT_FRM_VERSION = @DOT_FRM_VERSION@ - FIND_PROC = @FIND_PROC@ -@@ -154,11 +143,13 @@ - VERSION = @VERSION@ - WRAPLIBS = @WRAPLIBS@ - YACC = @YACC@ -+_am_include = @_am_include@ - bdb_includes = @bdb_includes@ - bdb_libs = @bdb_libs@ - bench_dirs = @bench_dirs@ - default_charset = @default_charset@ - docs_dirs = @docs_dirs@ -+install_sh = @install_sh@ - linked_client_targets = @linked_client_targets@ - readline_dir = @readline_dir@ - readline_link = @readline_link@ -@@ -168,86 +159,146 @@ - thread_dirs = @thread_dirs@ - uname_prog = @uname_prog@ - --bin_SCRIPTS = @server_scripts@ msql2mysql mysql_config mysql_fix_privilege_tables mysql_setpermission mysql_zap mysqlaccess mysqlbug mysql_convert_table_format mysql_find_rows mysqlhotcopy mysqldumpslow mysqld_multi -- -- --EXTRA_SCRIPTS = make_binary_distribution.sh msql2mysql.sh mysql_config.sh mysql_fix_privilege_tables.sh mysql_install_db.sh mysql_setpermission.sh mysql_zap.sh mysqlaccess.sh mysqlbug.sh mysql_convert_table_format.sh mysql_find_rows.sh mysqlhotcopy.sh mysqldumpslow.sh mysqld_multi.sh safe_mysqld.sh -+# Copyright (C) 2000 MySQL AB & MySQL Finland AB & TCX DataKonsult AB -+# -+# This program is free software; you can redistribute it and/or modify -+# it under the terms of the GNU General Public License as published by -+# the Free Software Foundation; either version 2 of the License, or -+# (at your option) any later version. -+# -+# This program is distributed in the hope that it will be useful, -+# but WITHOUT ANY WARRANTY; without even the implied warranty of -+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -+# GNU General Public License for more details. -+# -+# You should have received a copy of the GNU General Public License -+# along with this program; if not, write to the Free Software -+# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - - --EXTRA_DIST = $(EXTRA_SCRIPTS) mysqlaccess.conf mysqlbug -+bin_SCRIPTS = @server_scripts@ \ -+ msql2mysql \ -+ mysql_config \ -+ mysql_fix_privilege_tables \ -+ mysql_setpermission \ -+ mysql_zap \ -+ mysqlaccess \ -+ mysqlbug \ -+ mysql_convert_table_format \ -+ mysql_find_rows \ -+ mysqlhotcopy \ -+ mysqldumpslow \ -+ mysqld_multi -+ -+ -+EXTRA_SCRIPTS = make_binary_distribution.sh \ -+ msql2mysql.sh \ -+ mysql_config.sh \ -+ mysql_fix_privilege_tables.sh \ -+ mysql_install_db.sh \ -+ mysql_setpermission.sh \ -+ mysql_zap.sh \ -+ mysqlaccess.sh \ -+ mysqlbug.sh \ -+ mysql_convert_table_format.sh \ -+ mysql_find_rows.sh \ -+ mysqlhotcopy.sh \ -+ mysqldumpslow.sh \ -+ mysqld_multi.sh \ -+ safe_mysqld.sh -+ -+ -+EXTRA_DIST = $(EXTRA_SCRIPTS) \ -+ mysqlaccess.conf \ -+ mysqlbug - - - pkgdata_DATA = make_binary_distribution - - # mysqlbug should be distributed built so that people can report build - # failures with it. --CLEANFILES = @server_scripts@ make_binary_distribution msql2mysql mysql_config mysql_fix_privilege_tables mysql_setpermission mysql_zap mysqlaccess mysql_convert_table_format mysql_find_rows mysqlhotcopy mysqldumpslow mysqld_multi -+CLEANFILES = @server_scripts@ \ -+ make_binary_distribution \ -+ msql2mysql \ -+ mysql_config \ -+ mysql_fix_privilege_tables \ -+ mysql_setpermission \ -+ mysql_zap \ -+ mysqlaccess \ -+ mysql_convert_table_format \ -+ mysql_find_rows \ -+ mysqlhotcopy \ -+ mysqldumpslow \ -+ mysqld_multi - - - SUPERCLEANFILES = mysqlbug - - SUFFIXES = .sh -+subdir = scripts - mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs - CONFIG_HEADER = ../config.h - CONFIG_CLEAN_FILES = - SCRIPTS = $(bin_SCRIPTS) - -+DIST_SOURCES = - DATA = $(pkgdata_DATA) - - DIST_COMMON = Makefile.am Makefile.in - - --DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST) -+DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) - --TAR = gtar - GZIP_ENV = --best --all: all-redirect -+all: all-am - .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 - cd $(top_builddir) \ -- && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status -+ && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= CONFIG_LINKS= $(SHELL) ./config.status - - - install-binSCRIPTS: $(bin_SCRIPTS) - @$(NORMAL_INSTALL) - $(mkinstalldirs) $(DESTDIR)$(bindir) - @list='$(bin_SCRIPTS)'; for p in $$list; do \ -+ f="`echo $$p|sed '$(transform)'`"; \ - if test -f $$p; then \ -- echo " $(INSTALL_SCRIPT) $$p $(DESTDIR)$(bindir)/`echo $$p|sed '$(transform)'`"; \ -- $(INSTALL_SCRIPT) $$p $(DESTDIR)$(bindir)/`echo $$p|sed '$(transform)'`; \ -- else if test -f $(srcdir)/$$p; then \ -- echo " $(INSTALL_SCRIPT) $(srcdir)/$$p $(DESTDIR)$(bindir)/`echo $$p|sed '$(transform)'`"; \ -- $(INSTALL_SCRIPT) $(srcdir)/$$p $(DESTDIR)$(bindir)/`echo $$p|sed '$(transform)'`; \ -- else :; fi; fi; \ -+ echo " $(INSTALL_SCRIPT) $$p $(DESTDIR)$(bindir)/$$f"; \ -+ $(INSTALL_SCRIPT) $$p $(DESTDIR)$(bindir)/$$f; \ -+ elif test -f $(srcdir)/$$p; then \ -+ echo " $(INSTALL_SCRIPT) $(srcdir)/$$p $(DESTDIR)$(bindir)/$$f"; \ -+ $(INSTALL_SCRIPT) $(srcdir)/$$p $(DESTDIR)$(bindir)/$$f; \ -+ else :; fi; \ - done - - uninstall-binSCRIPTS: - @$(NORMAL_UNINSTALL) -- list='$(bin_SCRIPTS)'; for p in $$list; do \ -- rm -f $(DESTDIR)$(bindir)/`echo $$p|sed '$(transform)'`; \ -+ @list='$(bin_SCRIPTS)'; for p in $$list; do \ -+ f="`echo $$p|sed '$(transform)'`"; \ -+ echo " rm -f $(DESTDIR)$(bindir)/$$f"; \ -+ rm -f $(DESTDIR)$(bindir)/$$f; \ - done - - install-pkgdataDATA: $(pkgdata_DATA) - @$(NORMAL_INSTALL) - $(mkinstalldirs) $(DESTDIR)$(pkgdatadir) - @list='$(pkgdata_DATA)'; for p in $$list; do \ -- if test -f $(srcdir)/$$p; then \ -- echo " $(INSTALL_DATA) $(srcdir)/$$p $(DESTDIR)$(pkgdatadir)/$$p"; \ -- $(INSTALL_DATA) $(srcdir)/$$p $(DESTDIR)$(pkgdatadir)/$$p; \ -- else if test -f $$p; then \ -- echo " $(INSTALL_DATA) $$p $(DESTDIR)$(pkgdatadir)/$$p"; \ -- $(INSTALL_DATA) $$p $(DESTDIR)$(pkgdatadir)/$$p; \ -- fi; fi; \ -+ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ -+ f="`echo $$p | sed -e 's|^.*/||'`"; \ -+ echo " $(INSTALL_DATA) $$d$$p $(DESTDIR)$(pkgdatadir)/$$f"; \ -+ $(INSTALL_DATA) $$d$$p $(DESTDIR)$(pkgdatadir)/$$f; \ - done - - uninstall-pkgdataDATA: - @$(NORMAL_UNINSTALL) -- list='$(pkgdata_DATA)'; for p in $$list; do \ -- rm -f $(DESTDIR)$(pkgdatadir)/$$p; \ -+ @list='$(pkgdata_DATA)'; for p in $$list; do \ -+ f="`echo $$p | sed -e 's|^.*/||'`"; \ -+ echo " rm -f $(DESTDIR)$(pkgdatadir)/$$f"; \ -+ rm -f $(DESTDIR)$(pkgdatadir)/$$f; \ - done - tags: TAGS - TAGS: -@@ -255,17 +306,17 @@ - - distdir = $(top_builddir)/$(PACKAGE)-$(VERSION)/$(subdir) - --subdir = scripts - - distdir: $(DISTFILES) - @for file in $(DISTFILES); do \ - d=$(srcdir); \ - if test -d $$d/$$file; then \ -- cp -pr $$d/$$file $(distdir)/$$file; \ -+ cp -pR $$d/$$file $(distdir) \ -+ || exit 1; \ - else \ - test -f $(distdir)/$$file \ -- || ln $$d/$$file $(distdir)/$$file 2> /dev/null \ -- || cp -p $$d/$$file $(distdir)/$$file || :; \ -+ || cp -p $$d/$$file $(distdir)/$$file \ -+ || exit 1; \ - fi; \ - done - info-am: -@@ -288,9 +339,8 @@ - uninstall-am: uninstall-binSCRIPTS uninstall-pkgdataDATA - uninstall: uninstall-am - all-am: Makefile $(SCRIPTS) $(DATA) --all-redirect: all-am - install-strip: -- $(MAKE) $(AM_MAKEFLAGS) AM_INSTALL_PROGRAM_FLAGS=-s install -+ $(MAKE) $(AM_MAKEFLAGS) INSTALL_STRIP_FLAG=-s install - installdirs: - $(mkinstalldirs) $(DESTDIR)$(bindir) $(DESTDIR)$(pkgdatadir) - -@@ -305,32 +355,33 @@ - -rm -f config.cache config.log stamp-h stamp-h[0-9]* - - maintainer-clean-generic: --mostlyclean-am: mostlyclean-generic -- --mostlyclean: mostlyclean-am -- --clean-am: clean-generic mostlyclean-am -- -+ @echo "This command is intended for maintainers to use" -+ @echo "it deletes files that may require special tools to rebuild." -+ -rm -f Makefile.in - clean: clean-am - --distclean-am: distclean-generic clean-am -- -rm -f libtool -+clean-am: clean-generic mostlyclean-am - - distclean: distclean-am - --maintainer-clean-am: 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." -+distclean-am: clean-am distclean-generic - - maintainer-clean: maintainer-clean-am - --.PHONY: uninstall-binSCRIPTS install-binSCRIPTS uninstall-pkgdataDATA \ --install-pkgdataDATA 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 -+maintainer-clean-am: distclean-am maintainer-clean-generic -+ -+mostlyclean: mostlyclean-am -+ -+mostlyclean-am: mostlyclean-generic -+ -+.PHONY: check check-am clean clean-generic distclean distclean-generic \ -+ distdir dvi dvi-am info info-am install install-am \ -+ install-binSCRIPTS install-data install-data-am install-exec \ -+ install-exec-am install-pkgdataDATA install-strip installcheck \ -+ installcheck-am installdirs maintainer-clean \ -+ maintainer-clean-generic mostlyclean mostlyclean-generic \ -+ uninstall uninstall-am uninstall-binSCRIPTS \ -+ uninstall-pkgdataDATA - - - # We want the right version and configure comand line in mysqlbug -diff -r -N -U3 mysql-3.23.32.orig/sql/Makefile.in mysql-3.23.32/sql/Makefile.in ---- mysql-3.23.32.orig/sql/Makefile.in Mon Jan 22 14:44:15 2001 -+++ mysql-3.23.32/sql/Makefile.in Thu Mar 1 17:01:02 2001 -@@ -1,6 +1,7 @@ --# Makefile.in generated automatically by automake 1.4 from Makefile.am -+# Makefile.in generated automatically by automake 1.4d from Makefile.am - --# Copyright (C) 1994, 1995-8, 1999 Free Software Foundation, Inc. -+# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001 -+# Free Software Foundation, Inc. - # This Makefile.in is free software; the Free Software Foundation - # gives unlimited permission to copy and/or distribute it, - # with or without modifications, as long as this notice is preserved. -@@ -10,25 +11,6 @@ - # even the implied warranty of MERCHANTABILITY or FITNESS FOR A - # PARTICULAR PURPOSE. - --# Copyright (C) 2000 MySQL AB & MySQL Finland AB & TCX DataKonsult AB --# --# This program is free software; you can redistribute it and/or modify --# it under the terms of the GNU General Public License as published by --# the Free Software Foundation; either version 2 of the License, or --# (at your option) any later version. --# --# This program is distributed in the hope that it will be useful, --# but WITHOUT ANY WARRANTY; without even the implied warranty of --# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the --# GNU General Public License for more details. --# --# You should have received a copy of the GNU General Public License --# along with this program; if not, write to the Free Software --# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -- --#called from the top level Makefile -- -- - SHELL = @SHELL@ - - srcdir = @srcdir@ -@@ -50,8 +32,6 @@ - includedir = @includedir@ - oldincludedir = /usr/include - --DESTDIR = -- - pkgdatadir = $(datadir)/@PACKAGE@ - pkglibdir = $(libdir)/@PACKAGE@ - pkgincludedir = $(includedir)/@PACKAGE@ -@@ -64,9 +44,11 @@ - AUTOHEADER = @AUTOHEADER@ - - INSTALL = @INSTALL@ --INSTALL_PROGRAM = @INSTALL_PROGRAM@ $(AM_INSTALL_PROGRAM_FLAGS) -+INSTALL_PROGRAM = @INSTALL_PROGRAM@ - INSTALL_DATA = @INSTALL_DATA@ - INSTALL_SCRIPT = @INSTALL_SCRIPT@ -+INSTALL_STRIP_FLAG = -+INSTALL_HEADER = $(INSTALL_DATA) - transform = @program_transform_name@ - - NORMAL_INSTALL = : -@@ -75,6 +57,8 @@ - NORMAL_UNINSTALL = : - PRE_UNINSTALL = : - POST_UNINSTALL = : -+ -+@SET_MAKE@ - build_alias = @build_alias@ - build_triplet = @build@ - host_alias = @host_alias@ -@@ -82,6 +66,8 @@ - target_alias = @target_alias@ - target_triplet = @target@ - ALLOCA = @ALLOCA@ -+AMDEP = @AMDEP@ -+AMTAR = @AMTAR@ - AS = @AS@ - AVAILABLE_LANGUAGES = @AVAILABLE_LANGUAGES@ - AVAILABLE_LANGUAGES_ERRORS = @AVAILABLE_LANGUAGES_ERRORS@ -@@ -103,6 +89,7 @@ - CXX = @CXX@ - CXXFLAGS = @CXXFLAGS@ - CXXLDFLAGS = @CXXLDFLAGS@ -+DEPDIR = @DEPDIR@ - DLLTOOL = @DLLTOOL@ - DOT_FRM_VERSION = @DOT_FRM_VERSION@ - FIND_PROC = @FIND_PROC@ -@@ -154,12 +141,15 @@ - THREAD_LOBJECTS = @THREAD_LOBJECTS@ - THREAD_LPROGRAMS = @THREAD_LPROGRAMS@ - VERSION = @VERSION@ -+WRAPLIBS = @WRAPLIBS@ - YACC = @YACC@ -+_am_include = @_am_include@ - bdb_includes = @bdb_includes@ - bdb_libs = @bdb_libs@ - bench_dirs = @bench_dirs@ - default_charset = @default_charset@ - docs_dirs = @docs_dirs@ -+install_sh = @install_sh@ - linked_client_targets = @linked_client_targets@ - readline_dir = @readline_dir@ - readline_link = @readline_link@ -@@ -169,38 +159,114 @@ - thread_dirs = @thread_dirs@ - uname_prog = @uname_prog@ - -+# Copyright (C) 2000 MySQL AB & MySQL Finland AB & TCX DataKonsult AB -+# -+# This program is free software; you can redistribute it and/or modify -+# it under the terms of the GNU General Public License as published by -+# the Free Software Foundation; either version 2 of the License, or -+# (at your option) any later version. -+# -+# This program is distributed in the hope that it will be useful, -+# but WITHOUT ANY WARRANTY; without even the implied warranty of -+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -+# GNU General Public License for more details. -+# -+# You should have received a copy of the GNU General Public License -+# along with this program; if not, write to the Free Software -+# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -+ -+#called from the top level Makefile -+ -+ - MYSQLDATAdir = $(localstatedir) - MYSQLSHAREdir = $(pkgdatadir) - MYSQLBASEdir = $(prefix) --INCLUDES = @MT_INCLUDES@ @bdb_includes@ -I$(srcdir)/../include -I$(srcdir)/../regex -I$(srcdir) -I../include -I.. -I. -+INCLUDES = @MT_INCLUDES@ @bdb_includes@ -I$(srcdir)/../include \ -+ -I$(srcdir)/../regex \ -+ -I$(srcdir) -I../include -I.. -I. - - WRAPLIBS = @WRAPLIBS@ - SUBDIRS = share - bin_PROGRAMS = mysqlbinlog - libexec_PROGRAMS = mysqld - noinst_PROGRAMS = gen_lex_hash --LDADD = ../isam/libnisam.a ../merge/libmerge.a ../myisam/libmyisam.a ../myisammrg/libmyisammrg.a ../heap/libheap.a ../mysys/libmysys.a ../dbug/libdbug.a ../regex/libregex.a ../strings/libmystrings.a -+LDADD = ../isam/libnisam.a \ -+ ../merge/libmerge.a \ -+ ../myisam/libmyisam.a \ -+ ../myisammrg/libmyisammrg.a \ -+ ../heap/libheap.a \ -+ ../mysys/libmysys.a \ -+ ../dbug/libdbug.a \ -+ ../regex/libregex.a \ -+ ../strings/libmystrings.a - - mysqld_LDADD = @MYSQLD_EXTRA_LDFLAGS@ @bdb_libs@ $(LDADD) $(CXXLDFLAGS) $(WRAPLIBS) --noinst_HEADERS = item.h item_func.h item_sum.h item_cmpfunc.h item_strfunc.h item_timefunc.h item_uniq.h item_create.h mysql_priv.h procedure.h sql_class.h sql_lex.h sql_list.h sql_manager.h sql_map.h sql_string.h unireg.h field.h handler.h ha_isammrg.h ha_isam.h ha_myisammrg.h ha_heap.h ha_myisam.h ha_berkeley.h ha_innobase.h opt_range.h opt_ft.h sql_select.h structs.h table.h sql_udf.h hash_filo.h lex.h lex_symbol.h sql_acl.h sql_crypt.h md5.h log_event.h mini_client.h sql_repl.h slave.h -- --mysqld_SOURCES = sql_lex.cc item.cc item_sum.cc item_buff.cc item_func.cc item_cmpfunc.cc item_strfunc.cc item_timefunc.cc thr_malloc.cc item_create.cc field.cc key.cc sql_class.cc sql_list.cc net_serv.cc violite.c net_pkg.cc lock.cc my_lock.c sql_string.cc sql_manager.cc sql_map.cc mysqld.cc password.c hash_filo.cc hostname.cc convert.cc sql_parse.cc sql_yacc.yy sql_base.cc table.cc sql_select.cc sql_insert.cc sql_update.cc sql_delete.cc procedure.cc item_uniq.cc sql_test.cc log.cc init.cc derror.cc sql_acl.cc unireg.cc time.cc opt_range.cc opt_sum.cc opt_ft.cc records.cc filesort.cc handler.cc ha_isam.cc ha_isammrg.cc ha_heap.cc ha_myisam.cc ha_myisammrg.cc ha_berkeley.cc ha_innobase.cc sql_db.cc sql_table.cc sql_rename.cc sql_crypt.cc sql_load.cc mf_iocache.cc field_conv.cc sql_show.cc sql_udf.cc sql_analyse.cc sql_analyse.h sql_cache.cc slave.cc sql_repl.cc md5.c log_event.cc mini_client.cc mini_client_errors.c -+noinst_HEADERS = item.h item_func.h item_sum.h item_cmpfunc.h \ -+ item_strfunc.h item_timefunc.h item_uniq.h \ -+ item_create.h mysql_priv.h \ -+ procedure.h sql_class.h sql_lex.h sql_list.h \ -+ sql_manager.h sql_map.h sql_string.h unireg.h \ -+ field.h handler.h \ -+ ha_isammrg.h ha_isam.h ha_myisammrg.h\ -+ ha_heap.h ha_myisam.h ha_berkeley.h ha_innobase.h \ -+ opt_range.h opt_ft.h \ -+ sql_select.h structs.h table.h sql_udf.h hash_filo.h\ -+ lex.h lex_symbol.h sql_acl.h sql_crypt.h md5.h \ -+ log_event.h mini_client.h sql_repl.h slave.h -+ -+mysqld_SOURCES = sql_lex.cc \ -+ item.cc item_sum.cc item_buff.cc item_func.cc \ -+ item_cmpfunc.cc item_strfunc.cc item_timefunc.cc \ -+ thr_malloc.cc item_create.cc \ -+ field.cc key.cc sql_class.cc sql_list.cc \ -+ net_serv.cc violite.c net_pkg.cc lock.cc my_lock.c \ -+ sql_string.cc sql_manager.cc sql_map.cc \ -+ mysqld.cc password.c hash_filo.cc hostname.cc \ -+ convert.cc sql_parse.cc sql_yacc.yy \ -+ sql_base.cc table.cc sql_select.cc sql_insert.cc \ -+ sql_update.cc sql_delete.cc \ -+ procedure.cc item_uniq.cc sql_test.cc \ -+ log.cc init.cc derror.cc sql_acl.cc unireg.cc \ -+ time.cc opt_range.cc opt_sum.cc opt_ft.cc \ -+ records.cc filesort.cc handler.cc \ -+ ha_isam.cc ha_isammrg.cc ha_heap.cc \ -+ ha_myisam.cc ha_myisammrg.cc ha_berkeley.cc \ -+ ha_innobase.cc \ -+ sql_db.cc sql_table.cc sql_rename.cc sql_crypt.cc \ -+ sql_load.cc mf_iocache.cc field_conv.cc sql_show.cc \ -+ sql_udf.cc sql_analyse.cc sql_analyse.h sql_cache.cc \ -+ slave.cc sql_repl.cc \ -+ md5.c log_event.cc mini_client.cc mini_client_errors.c - - gen_lex_hash_SOURCES = gen_lex_hash.cc - gen_lex_hash_LDADD = $(LDADD) $(CXXLDFLAGS) --mysqlbinlog_SOURCES = mysqlbinlog.cc mini_client.cc net_serv.cc mini_client_errors.c violite.c password.c -+mysqlbinlog_SOURCES = mysqlbinlog.cc mini_client.cc net_serv.cc \ -+ mini_client_errors.c violite.c password.c - - mysqlbinlog_LDADD = $(LDADD) $(CXXLDFLAGS) - --DEFS = -DMYSQL_SERVER -DDEFAULT_MYSQL_HOME="\"$(MYSQLBASEdir)\"" -DDATADIR="\"$(MYSQLDATAdir)\"" -DSHAREDIR="\"$(MYSQLSHAREdir)\"" @DEFS@ -+DEFS = -DMYSQL_SERVER \ -+ -DDEFAULT_MYSQL_HOME="\"$(MYSQLBASEdir)\"" \ -+ -DDATADIR="\"$(MYSQLDATAdir)\"" \ -+ -DSHAREDIR="\"$(MYSQLSHAREdir)\"" \ -+ @DEFS@ - - # Don't put lex_hash.h in BUILT_SOURCES as this will give infinite recursion - BUILT_SOURCES = sql_yacc.cc sql_yacc.h - EXTRA_DIST = udf_example.cc $(BUILT_SOURCES) - YFLAGS = -d - --OMIT_DEPENDENCIES = pthread.h stdio.h __stdio.h stdlib.h __stdlib.h math.h __math.h time.h __time.h unistd.h __unistd.h types.h xtypes.h ac-types.h posix.h string.h __string.h errno.h socket.h inet.h dirent.h netdb.h cleanup.h cond.h debug_out.h fd.h kernel.h mutex.h prio_queue.h pthread_attr.h pthread_once.h queue.h sleep.h specific.h version.h pwd.h timers.h uio.h cdefs.h machdep.h signal.h __signal.h util.h lex.h wait.h -+OMIT_DEPENDENCIES = pthread.h stdio.h __stdio.h stdlib.h __stdlib.h math.h\ -+ __math.h time.h __time.h unistd.h __unistd.h types.h \ -+ xtypes.h ac-types.h posix.h string.h __string.h \ -+ errno.h socket.h inet.h dirent.h netdb.h \ -+ cleanup.h cond.h debug_out.h fd.h kernel.h mutex.h \ -+ prio_queue.h pthread_attr.h pthread_once.h queue.h\ -+ sleep.h specific.h version.h pwd.h timers.h uio.h \ -+ cdefs.h machdep.h signal.h __signal.h util.h lex.h \ -+ wait.h - -+subdir = sql - mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs - CONFIG_HEADER = ../config.h - CONFIG_CLEAN_FILES = -@@ -209,14 +275,22 @@ - CPPFLAGS = @CPPFLAGS@ - LDFLAGS = @LDFLAGS@ - LIBS = @LIBS@ --mysqlbinlog_OBJECTS = mysqlbinlog.o mini_client.o net_serv.o \ -+am_gen_lex_hash_OBJECTS = gen_lex_hash.o -+gen_lex_hash_OBJECTS = $(am_gen_lex_hash_OBJECTS) -+gen_lex_hash_DEPENDENCIES = ../isam/libnisam.a ../merge/libmerge.a \ -+../myisam/libmyisam.a ../myisammrg/libmyisammrg.a ../heap/libheap.a \ -+../mysys/libmysys.a ../dbug/libdbug.a ../regex/libregex.a \ -+../strings/libmystrings.a -+gen_lex_hash_LDFLAGS = -+am_mysqlbinlog_OBJECTS = mysqlbinlog.o mini_client.o net_serv.o \ - mini_client_errors.o violite.o password.o -+mysqlbinlog_OBJECTS = $(am_mysqlbinlog_OBJECTS) - mysqlbinlog_DEPENDENCIES = ../isam/libnisam.a ../merge/libmerge.a \ - ../myisam/libmyisam.a ../myisammrg/libmyisammrg.a ../heap/libheap.a \ - ../mysys/libmysys.a ../dbug/libdbug.a ../regex/libregex.a \ - ../strings/libmystrings.a - mysqlbinlog_LDFLAGS = --mysqld_OBJECTS = sql_lex.o item.o item_sum.o item_buff.o item_func.o \ -+am_mysqld_OBJECTS = sql_lex.o item.o item_sum.o item_buff.o item_func.o \ - item_cmpfunc.o item_strfunc.o item_timefunc.o thr_malloc.o \ - item_create.o field.o key.o sql_class.o sql_list.o net_serv.o violite.o \ - net_pkg.o lock.o my_lock.o sql_string.o sql_manager.o sql_map.o \ -@@ -229,46 +303,78 @@ - sql_rename.o sql_crypt.o sql_load.o mf_iocache.o field_conv.o \ - sql_show.o sql_udf.o sql_analyse.o sql_cache.o slave.o sql_repl.o md5.o \ - log_event.o mini_client.o mini_client_errors.o -+mysqld_OBJECTS = $(am_mysqld_OBJECTS) - mysqld_DEPENDENCIES = ../isam/libnisam.a ../merge/libmerge.a \ - ../myisam/libmyisam.a ../myisammrg/libmyisammrg.a ../heap/libheap.a \ - ../mysys/libmysys.a ../dbug/libdbug.a ../regex/libregex.a \ - ../strings/libmystrings.a - mysqld_LDFLAGS = --gen_lex_hash_OBJECTS = gen_lex_hash.o --gen_lex_hash_DEPENDENCIES = ../isam/libnisam.a ../merge/libmerge.a \ --../myisam/libmyisam.a ../myisammrg/libmyisammrg.a ../heap/libheap.a \ --../mysys/libmysys.a ../dbug/libdbug.a ../regex/libregex.a \ --../strings/libmystrings.a --gen_lex_hash_LDFLAGS = -+COMPILE = $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -+LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) - CXXCOMPILE = $(CXX) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) - LTCXXCOMPILE = $(LIBTOOL) --mode=compile $(CXX) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) - CXXLD = $(CXX) --CXXLINK = $(LIBTOOL) --mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(LDFLAGS) -o $@ --COMPILE = $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) --LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -+CXXLINK = $(LIBTOOL) --mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@ - CCLD = $(CC) --LINK = $(LIBTOOL) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(LDFLAGS) -o $@ -+LINK = $(LIBTOOL) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@ -+DIST_SOURCES = $(gen_lex_hash_SOURCES) $(mysqlbinlog_SOURCES) \ -+$(mysqld_SOURCES) - HEADERS = $(noinst_HEADERS) - --DIST_COMMON = ChangeLog Makefile.am Makefile.in sql_yacc.cc -+depcomp = $(SHELL) $(top_srcdir)/depcomp -+@AMDEP@DEP_FILES = $(DEPDIR)/convert.Po $(DEPDIR)/derror.Po \ -+@AMDEP@$(DEPDIR)/field.Po $(DEPDIR)/field_conv.Po $(DEPDIR)/filesort.Po \ -+@AMDEP@$(DEPDIR)/gen_lex_hash.Po $(DEPDIR)/ha_berkeley.Po \ -+@AMDEP@$(DEPDIR)/ha_heap.Po $(DEPDIR)/ha_innobase.Po \ -+@AMDEP@$(DEPDIR)/ha_isam.Po $(DEPDIR)/ha_isammrg.Po \ -+@AMDEP@$(DEPDIR)/ha_myisam.Po $(DEPDIR)/ha_myisammrg.Po \ -+@AMDEP@$(DEPDIR)/handler.Po $(DEPDIR)/hash_filo.Po \ -+@AMDEP@$(DEPDIR)/hostname.Po $(DEPDIR)/init.Po $(DEPDIR)/item.Po \ -+@AMDEP@$(DEPDIR)/item_buff.Po $(DEPDIR)/item_cmpfunc.Po \ -+@AMDEP@$(DEPDIR)/item_create.Po $(DEPDIR)/item_func.Po \ -+@AMDEP@$(DEPDIR)/item_strfunc.Po $(DEPDIR)/item_sum.Po \ -+@AMDEP@$(DEPDIR)/item_timefunc.Po $(DEPDIR)/item_uniq.Po \ -+@AMDEP@$(DEPDIR)/key.Po $(DEPDIR)/lock.Po $(DEPDIR)/log.Po \ -+@AMDEP@$(DEPDIR)/log_event.Po $(DEPDIR)/md5.Po $(DEPDIR)/mf_iocache.Po \ -+@AMDEP@$(DEPDIR)/mini_client.Po $(DEPDIR)/mini_client_errors.Po \ -+@AMDEP@$(DEPDIR)/my_lock.Po $(DEPDIR)/mysqlbinlog.Po \ -+@AMDEP@$(DEPDIR)/mysqld.Po $(DEPDIR)/net_pkg.Po $(DEPDIR)/net_serv.Po \ -+@AMDEP@$(DEPDIR)/opt_ft.Po $(DEPDIR)/opt_range.Po $(DEPDIR)/opt_sum.Po \ -+@AMDEP@$(DEPDIR)/password.Po $(DEPDIR)/procedure.Po \ -+@AMDEP@$(DEPDIR)/records.Po $(DEPDIR)/slave.Po $(DEPDIR)/sql_acl.Po \ -+@AMDEP@$(DEPDIR)/sql_analyse.Po $(DEPDIR)/sql_base.Po \ -+@AMDEP@$(DEPDIR)/sql_cache.Po $(DEPDIR)/sql_class.Po \ -+@AMDEP@$(DEPDIR)/sql_crypt.Po $(DEPDIR)/sql_db.Po \ -+@AMDEP@$(DEPDIR)/sql_delete.Po $(DEPDIR)/sql_insert.Po \ -+@AMDEP@$(DEPDIR)/sql_lex.Po $(DEPDIR)/sql_list.Po $(DEPDIR)/sql_load.Po \ -+@AMDEP@$(DEPDIR)/sql_manager.Po $(DEPDIR)/sql_map.Po \ -+@AMDEP@$(DEPDIR)/sql_parse.Po $(DEPDIR)/sql_rename.Po \ -+@AMDEP@$(DEPDIR)/sql_repl.Po $(DEPDIR)/sql_select.Po \ -+@AMDEP@$(DEPDIR)/sql_show.Po $(DEPDIR)/sql_string.Po \ -+@AMDEP@$(DEPDIR)/sql_table.Po $(DEPDIR)/sql_test.Po \ -+@AMDEP@$(DEPDIR)/sql_udf.Po $(DEPDIR)/sql_update.Po \ -+@AMDEP@$(DEPDIR)/sql_yacc.Po $(DEPDIR)/table.Po $(DEPDIR)/thr_malloc.Po \ -+@AMDEP@$(DEPDIR)/time.Po $(DEPDIR)/unireg.Po $(DEPDIR)/violite.Po -+DIST_COMMON = $(noinst_HEADERS) ChangeLog Makefile.am Makefile.in \ -+sql_yacc.cc sql_yacc.h - - --DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST) -+DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) - --TAR = gtar - GZIP_ENV = --best --SOURCES = $(mysqlbinlog_SOURCES) $(mysqld_SOURCES) $(gen_lex_hash_SOURCES) --OBJECTS = $(mysqlbinlog_OBJECTS) $(mysqld_OBJECTS) $(gen_lex_hash_OBJECTS) -+DIST_SUBDIRS = $(SUBDIRS) -+SOURCES = $(gen_lex_hash_SOURCES) $(mysqlbinlog_SOURCES) $(mysqld_SOURCES) -+OBJECTS = $(am_gen_lex_hash_OBJECTS) $(am_mysqlbinlog_OBJECTS) $(am_mysqld_OBJECTS) - - all: all-redirect - .SUFFIXES: --.SUFFIXES: .S .c .cc .lo .o .s .yy -+.SUFFIXES: .c .cc .h .lo .o .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 - cd $(top_builddir) \ -- && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status -+ && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= CONFIG_LINKS= $(SHELL) ./config.status - - - mostlyclean-binPROGRAMS: -@@ -285,15 +391,18 @@ - $(mkinstalldirs) $(DESTDIR)$(bindir) - @list='$(bin_PROGRAMS)'; for p in $$list; do \ - if test -f $$p; then \ -- echo " $(LIBTOOL) --mode=install $(INSTALL_PROGRAM) $$p $(DESTDIR)$(bindir)/`echo $$p|sed 's/$(EXEEXT)$$//'|sed '$(transform)'|sed 's/$$/$(EXEEXT)/'`"; \ -- $(LIBTOOL) --mode=install $(INSTALL_PROGRAM) $$p $(DESTDIR)$(bindir)/`echo $$p|sed 's/$(EXEEXT)$$//'|sed '$(transform)'|sed 's/$$/$(EXEEXT)/'`; \ -+ f="`echo $$p|sed -e 's/$(EXEEXT)$$//' -e '$(transform)' -e 's/$$/$(EXEEXT)/'`"; \ -+ echo " $(LIBTOOL) --mode=install $(INSTALL_PROGRAM) $(INSTALL_STRIP_FLAG) $$p $(DESTDIR)$(bindir)/$$f"; \ -+ $(LIBTOOL) --mode=install $(INSTALL_PROGRAM) $(INSTALL_STRIP_FLAG) $$p $(DESTDIR)$(bindir)/$$f; \ - else :; fi; \ - done - - uninstall-binPROGRAMS: - @$(NORMAL_UNINSTALL) -- list='$(bin_PROGRAMS)'; for p in $$list; do \ -- rm -f $(DESTDIR)$(bindir)/`echo $$p|sed 's/$(EXEEXT)$$//'|sed '$(transform)'|sed 's/$$/$(EXEEXT)/'`; \ -+ @list='$(bin_PROGRAMS)'; for p in $$list; do \ -+ f="`echo $$p|sed -e 's/$(EXEEXT)$$//' -e '$(transform)' -e 's/$$/$(EXEEXT)/'`"; \ -+ echo " rm -f $(DESTDIR)$(bindir)/$$f"; \ -+ rm -f $(DESTDIR)$(bindir)/$$f; \ - done - - mostlyclean-libexecPROGRAMS: -@@ -310,15 +419,18 @@ - $(mkinstalldirs) $(DESTDIR)$(libexecdir) - @list='$(libexec_PROGRAMS)'; for p in $$list; do \ - if test -f $$p; then \ -- echo " $(LIBTOOL) --mode=install $(INSTALL_PROGRAM) $$p $(DESTDIR)$(libexecdir)/`echo $$p|sed 's/$(EXEEXT)$$//'|sed '$(transform)'|sed 's/$$/$(EXEEXT)/'`"; \ -- $(LIBTOOL) --mode=install $(INSTALL_PROGRAM) $$p $(DESTDIR)$(libexecdir)/`echo $$p|sed 's/$(EXEEXT)$$//'|sed '$(transform)'|sed 's/$$/$(EXEEXT)/'`; \ -+ f="`echo $$p|sed -e 's/$(EXEEXT)$$//' -e '$(transform)' -e 's/$$/$(EXEEXT)/'`"; \ -+ echo " $(LIBTOOL) --mode=install $(INSTALL_PROGRAM) $(INSTALL_STRIP_FLAG) $$p $(DESTDIR)$(libexecdir)/$$f"; \ -+ $(LIBTOOL) --mode=install $(INSTALL_PROGRAM) $(INSTALL_STRIP_FLAG) $$p $(DESTDIR)$(libexecdir)/$$f; \ - else :; fi; \ - done - - uninstall-libexecPROGRAMS: - @$(NORMAL_UNINSTALL) -- list='$(libexec_PROGRAMS)'; for p in $$list; do \ -- rm -f $(DESTDIR)$(libexecdir)/`echo $$p|sed 's/$(EXEEXT)$$//'|sed '$(transform)'|sed 's/$$/$(EXEEXT)/'`; \ -+ @list='$(libexec_PROGRAMS)'; for p in $$list; do \ -+ f="`echo $$p|sed -e 's/$(EXEEXT)$$//' -e '$(transform)' -e 's/$$/$(EXEEXT)/'`"; \ -+ echo " rm -f $(DESTDIR)$(libexecdir)/$$f"; \ -+ rm -f $(DESTDIR)$(libexecdir)/$$f; \ - done - - mostlyclean-noinstPROGRAMS: -@@ -330,34 +442,12 @@ - - maintainer-clean-noinstPROGRAMS: - --.c.o: -- $(COMPILE) -c $< -- --.s.o: -- $(COMPILE) -c $< -- --.S.o: -- $(COMPILE) -c $< -- - mostlyclean-compile: - -rm -f *.o core *.core - --clean-compile: -- - distclean-compile: - -rm -f *.tab.c - --maintainer-clean-compile: -- --.c.lo: -- $(LIBTOOL) --mode=compile $(COMPILE) -c $< -- --.s.lo: -- $(LIBTOOL) --mode=compile $(COMPILE) -c $< -- --.S.lo: -- $(LIBTOOL) --mode=compile $(COMPILE) -c $< -- - mostlyclean-libtool: - -rm -f *.lo - -@@ -365,8 +455,11 @@ - -rm -rf .libs _libs - - distclean-libtool: -+ -rm -f libtool - --maintainer-clean-libtool: -+gen_lex_hash: $(gen_lex_hash_OBJECTS) $(gen_lex_hash_DEPENDENCIES) -+ @rm -f gen_lex_hash -+ $(CXXLINK) $(gen_lex_hash_LDFLAGS) $(gen_lex_hash_OBJECTS) $(gen_lex_hash_LDADD) $(LIBS) - - mysqlbinlog: $(mysqlbinlog_OBJECTS) $(mysqlbinlog_DEPENDENCIES) - @rm -f mysqlbinlog -@@ -375,20 +468,12 @@ - mysqld: $(mysqld_OBJECTS) $(mysqld_DEPENDENCIES) - @rm -f mysqld - $(CXXLINK) $(mysqld_LDFLAGS) $(mysqld_OBJECTS) $(mysqld_LDADD) $(LIBS) -- --gen_lex_hash: $(gen_lex_hash_OBJECTS) $(gen_lex_hash_DEPENDENCIES) -- @rm -f gen_lex_hash -- $(CXXLINK) $(gen_lex_hash_LDFLAGS) $(gen_lex_hash_OBJECTS) $(gen_lex_hash_LDADD) $(LIBS) --.cc.o: -- $(CXXCOMPILE) -c $< --.cc.lo: -- $(LTCXXCOMPILE) -c $< - .yy.cc: - $(YACC) $(AM_YFLAGS) $(YFLAGS) $< && mv y.tab.c $*.cc - if test -f y.tab.h; then \ - if cmp -s y.tab.h $*.h; then rm -f y.tab.h; else mv y.tab.h $*.h; fi; \ - else :; fi --sql_yacc.hh: sql_yacc.cc -+sql_yacc.h: sql_yacc.cc - - - # This directory's subdirectories are mostly independent; you can cd -@@ -397,9 +482,6 @@ - # (1) if the variable is set in `config.status', edit `config.status' - # (which will cause the Makefiles to be regenerated when you run `make'); - # (2) otherwise, pass the desired values on the `make' command line. -- --@SET_MAKE@ -- - all-recursive install-data-recursive install-exec-recursive \ - installdirs-recursive install-recursive uninstall-recursive \ - check-recursive installcheck-recursive info-recursive dvi-recursive: -@@ -425,11 +507,16 @@ - maintainer-clean-recursive: - @set fnord $(MAKEFLAGS); amf=$$2; \ - dot_seen=no; \ -- rev=''; list='$(SUBDIRS)'; for subdir in $$list; do \ -- rev="$$subdir $$rev"; \ -- test "$$subdir" = "." && dot_seen=yes; \ -+ case "$@" in \ -+ distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \ -+ *) list='$(SUBDIRS)' ;; \ -+ esac; \ -+ rev=''; for subdir in $$list; do \ -+ if test "$$subdir" = "."; then :; else \ -+ rev="$$subdir $$rev"; \ -+ fi; \ - done; \ -- test "$$dot_seen" = "no" && rev=". $$rev"; \ -+ rev="$$rev ."; \ - target=`echo $@ | sed s/-recursive//`; \ - for subdir in $$rev; do \ - echo "Making $$target in $$subdir"; \ -@@ -448,15 +535,17 @@ - - tags: TAGS - --ID: $(HEADERS) $(SOURCES) $(LISP) -- list='$(SOURCES) $(HEADERS)'; \ -- unique=`for i in $$list; do echo $$i; done | \ -- awk ' { files[$$0] = 1; } \ -+ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) -+ list='$(SOURCES) $(HEADERS) $(TAGS_FILES)'; \ -+ unique=`for i in $$list; do \ -+ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ -+ done | \ -+ $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ -- here=`pwd` && cd $(srcdir) \ -- && mkid -f$$here/ID $$unique $(LISP) -+ mkid -fID $$unique $(LISP) - --TAGS: tags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) $(LISP) -+TAGS: tags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ -+ $(TAGS_FILES) $(LISP) - tags=; \ - here=`pwd`; \ - list='$(SUBDIRS)'; for subdir in $$list; do \ -@@ -464,35 +553,146 @@ - test -f $$subdir/TAGS && tags="$$tags -i $$here/$$subdir/TAGS"; \ - fi; \ - done; \ -- list='$(SOURCES) $(HEADERS)'; \ -- unique=`for i in $$list; do echo $$i; done | \ -- awk ' { files[$$0] = 1; } \ -+ list='$(SOURCES) $(HEADERS) $(TAGS_FILES)'; \ -+ unique=`for i in $$list; do \ -+ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ -+ done | \ -+ $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ - test -z "$(ETAGS_ARGS)$$unique$(LISP)$$tags" \ -- || (cd $(srcdir) && etags $(ETAGS_ARGS) $$tags $$unique $(LISP) -o $$here/TAGS) -- --mostlyclean-tags: -+ || etags $(ETAGS_ARGS) $$tags $$unique $(LISP) - --clean-tags: -+GTAGS: -+ here=`CDPATH=: && cd $(top_builddir) && pwd` \ -+ && cd $(top_srcdir) \ -+ && gtags -i $$here - - distclean-tags: - -rm -f TAGS ID - --maintainer-clean-tags: -+@AMDEP@@_am_include@ $(DEPDIR)/convert.Po -+@AMDEP@@_am_include@ $(DEPDIR)/derror.Po -+@AMDEP@@_am_include@ $(DEPDIR)/field.Po -+@AMDEP@@_am_include@ $(DEPDIR)/field_conv.Po -+@AMDEP@@_am_include@ $(DEPDIR)/filesort.Po -+@AMDEP@@_am_include@ $(DEPDIR)/gen_lex_hash.Po -+@AMDEP@@_am_include@ $(DEPDIR)/ha_berkeley.Po -+@AMDEP@@_am_include@ $(DEPDIR)/ha_heap.Po -+@AMDEP@@_am_include@ $(DEPDIR)/ha_innobase.Po -+@AMDEP@@_am_include@ $(DEPDIR)/ha_isam.Po -+@AMDEP@@_am_include@ $(DEPDIR)/ha_isammrg.Po -+@AMDEP@@_am_include@ $(DEPDIR)/ha_myisam.Po -+@AMDEP@@_am_include@ $(DEPDIR)/ha_myisammrg.Po -+@AMDEP@@_am_include@ $(DEPDIR)/handler.Po -+@AMDEP@@_am_include@ $(DEPDIR)/hash_filo.Po -+@AMDEP@@_am_include@ $(DEPDIR)/hostname.Po -+@AMDEP@@_am_include@ $(DEPDIR)/init.Po -+@AMDEP@@_am_include@ $(DEPDIR)/item.Po -+@AMDEP@@_am_include@ $(DEPDIR)/item_buff.Po -+@AMDEP@@_am_include@ $(DEPDIR)/item_cmpfunc.Po -+@AMDEP@@_am_include@ $(DEPDIR)/item_create.Po -+@AMDEP@@_am_include@ $(DEPDIR)/item_func.Po -+@AMDEP@@_am_include@ $(DEPDIR)/item_strfunc.Po -+@AMDEP@@_am_include@ $(DEPDIR)/item_sum.Po -+@AMDEP@@_am_include@ $(DEPDIR)/item_timefunc.Po -+@AMDEP@@_am_include@ $(DEPDIR)/item_uniq.Po -+@AMDEP@@_am_include@ $(DEPDIR)/key.Po -+@AMDEP@@_am_include@ $(DEPDIR)/lock.Po -+@AMDEP@@_am_include@ $(DEPDIR)/log.Po -+@AMDEP@@_am_include@ $(DEPDIR)/log_event.Po -+@AMDEP@@_am_include@ $(DEPDIR)/md5.Po -+@AMDEP@@_am_include@ $(DEPDIR)/mf_iocache.Po -+@AMDEP@@_am_include@ $(DEPDIR)/mini_client.Po -+@AMDEP@@_am_include@ $(DEPDIR)/mini_client_errors.Po -+@AMDEP@@_am_include@ $(DEPDIR)/my_lock.Po -+@AMDEP@@_am_include@ $(DEPDIR)/mysqlbinlog.Po -+@AMDEP@@_am_include@ $(DEPDIR)/mysqld.Po -+@AMDEP@@_am_include@ $(DEPDIR)/net_pkg.Po -+@AMDEP@@_am_include@ $(DEPDIR)/net_serv.Po -+@AMDEP@@_am_include@ $(DEPDIR)/opt_ft.Po -+@AMDEP@@_am_include@ $(DEPDIR)/opt_range.Po -+@AMDEP@@_am_include@ $(DEPDIR)/opt_sum.Po -+@AMDEP@@_am_include@ $(DEPDIR)/password.Po -+@AMDEP@@_am_include@ $(DEPDIR)/procedure.Po -+@AMDEP@@_am_include@ $(DEPDIR)/records.Po -+@AMDEP@@_am_include@ $(DEPDIR)/slave.Po -+@AMDEP@@_am_include@ $(DEPDIR)/sql_acl.Po -+@AMDEP@@_am_include@ $(DEPDIR)/sql_analyse.Po -+@AMDEP@@_am_include@ $(DEPDIR)/sql_base.Po -+@AMDEP@@_am_include@ $(DEPDIR)/sql_cache.Po -+@AMDEP@@_am_include@ $(DEPDIR)/sql_class.Po -+@AMDEP@@_am_include@ $(DEPDIR)/sql_crypt.Po -+@AMDEP@@_am_include@ $(DEPDIR)/sql_db.Po -+@AMDEP@@_am_include@ $(DEPDIR)/sql_delete.Po -+@AMDEP@@_am_include@ $(DEPDIR)/sql_insert.Po -+@AMDEP@@_am_include@ $(DEPDIR)/sql_lex.Po -+@AMDEP@@_am_include@ $(DEPDIR)/sql_list.Po -+@AMDEP@@_am_include@ $(DEPDIR)/sql_load.Po -+@AMDEP@@_am_include@ $(DEPDIR)/sql_manager.Po -+@AMDEP@@_am_include@ $(DEPDIR)/sql_map.Po -+@AMDEP@@_am_include@ $(DEPDIR)/sql_parse.Po -+@AMDEP@@_am_include@ $(DEPDIR)/sql_rename.Po -+@AMDEP@@_am_include@ $(DEPDIR)/sql_repl.Po -+@AMDEP@@_am_include@ $(DEPDIR)/sql_select.Po -+@AMDEP@@_am_include@ $(DEPDIR)/sql_show.Po -+@AMDEP@@_am_include@ $(DEPDIR)/sql_string.Po -+@AMDEP@@_am_include@ $(DEPDIR)/sql_table.Po -+@AMDEP@@_am_include@ $(DEPDIR)/sql_test.Po -+@AMDEP@@_am_include@ $(DEPDIR)/sql_udf.Po -+@AMDEP@@_am_include@ $(DEPDIR)/sql_update.Po -+@AMDEP@@_am_include@ $(DEPDIR)/sql_yacc.Po -+@AMDEP@@_am_include@ $(DEPDIR)/table.Po -+@AMDEP@@_am_include@ $(DEPDIR)/thr_malloc.Po -+@AMDEP@@_am_include@ $(DEPDIR)/time.Po -+@AMDEP@@_am_include@ $(DEPDIR)/unireg.Po -+@AMDEP@@_am_include@ $(DEPDIR)/violite.Po -+ -+distclean-depend: -+ -rm -rf $(DEPDIR) -+ -+@AMDEP@CCDEPMODE = @CCDEPMODE@ -+ -+.c.o: -+@AMDEP@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ -+@AMDEP@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@ -+@AMDEP@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -+ $(COMPILE) -c -o $@ `test -f $< || echo '$(srcdir)/'`$< -+ -+.c.lo: -+@AMDEP@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ -+@AMDEP@ depfile='$(DEPDIR)/$*.Plo' tmpdepfile='$(DEPDIR)/$*.TPlo' @AMDEPBACKSLASH@ -+@AMDEP@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -+ $(LTCOMPILE) -c -o $@ `test -f $< || echo '$(srcdir)/'`$< -+ -+ -+@AMDEP@CXXDEPMODE = @CXXDEPMODE@ -+ -+.cc.o: -+@AMDEP@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ -+@AMDEP@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@ -+@AMDEP@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -+ $(CXXCOMPILE) -c -o $@ `test -f $< || echo '$(srcdir)/'`$< -+ -+.cc.lo: -+@AMDEP@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ -+@AMDEP@ depfile='$(DEPDIR)/$*.Plo' tmpdepfile='$(DEPDIR)/$*.TPlo' @AMDEPBACKSLASH@ -+@AMDEP@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -+ $(LTCXXCOMPILE) -c -o $@ `test -f $< || echo '$(srcdir)/'`$< -+ - - distdir = $(top_builddir)/$(PACKAGE)-$(VERSION)/$(subdir) - --subdir = sql - - distdir: $(DISTFILES) - @for file in $(DISTFILES); do \ - d=$(srcdir); \ - if test -d $$d/$$file; then \ -- cp -pr $$d/$$file $(distdir)/$$file; \ -+ cp -pR $$d/$$file $(distdir) \ -+ || exit 1; \ - else \ - test -f $(distdir)/$$file \ -- || ln $$d/$$file $(distdir)/$$file 2> /dev/null \ -- || cp -p $$d/$$file $(distdir)/$$file || :; \ -+ || cp -p $$d/$$file $(distdir)/$$file \ -+ || exit 1; \ - fi; \ - done - for subdir in $(SUBDIRS); do \ -@@ -500,1169 +700,11 @@ - test -d $(distdir)/$$subdir \ - || mkdir $(distdir)/$$subdir \ - || exit 1; \ -- chmod 777 $(distdir)/$$subdir; \ -- (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) top_distdir=../$(top_distdir) distdir=../$(distdir)/$$subdir distdir) \ -+ (cd $$subdir && \ -+ $(MAKE) $(AM_MAKEFLAGS) top_distdir=../$(top_distdir) distdir=../$(distdir)/$$subdir distdir) \ - || 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/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/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/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/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/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/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/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/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_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/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/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/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/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/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 \ -- ../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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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_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/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/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/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/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/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/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/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/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/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/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/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/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_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/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/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/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_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/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/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/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/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/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/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/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/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/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/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/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 --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/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/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/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/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/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/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/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/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 -- - info-am: - info: info-recursive - dvi-am: -@@ -1671,6 +713,9 @@ - check: check-recursive - installcheck-am: - installcheck: installcheck-recursive -+all-redirect: $(BUILT_SOURCES) -+ $(MAKE) $(AM_MAKEFLAGS) all-recursive -+ - install-exec-am: install-binPROGRAMS install-libexecPROGRAMS - install-exec: install-exec-recursive - -@@ -1683,9 +728,8 @@ - uninstall-am: uninstall-binPROGRAMS uninstall-libexecPROGRAMS - uninstall: uninstall-recursive - all-am: Makefile $(PROGRAMS) $(HEADERS) --all-redirect: all-recursive - install-strip: -- $(MAKE) $(AM_MAKEFLAGS) AM_INSTALL_PROGRAM_FLAGS=-s install -+ $(MAKE) $(AM_MAKEFLAGS) INSTALL_STRIP_FLAG=-s install - installdirs: installdirs-recursive - installdirs-am: - $(mkinstalldirs) $(DESTDIR)$(bindir) $(DESTDIR)$(libexecdir) -@@ -1700,60 +744,55 @@ - -rm -f config.cache config.log stamp-h stamp-h[0-9]* - - maintainer-clean-generic: -- -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-generic -- --mostlyclean: mostlyclean-recursive -- --clean-am: clean-binPROGRAMS clean-libexecPROGRAMS clean-noinstPROGRAMS \ -- clean-compile clean-libtool clean-tags clean-generic \ -- mostlyclean-am -- -+ @echo "This command is intended for maintainers to use" -+ @echo "it deletes files that may require special tools to rebuild." -+ -rm -f Makefile.in -+ -test -z "sql_yacc.hsql_yacc.cc$(BUILT_SOURCES)" || rm -f sql_yacc.h sql_yacc.cc $(BUILT_SOURCES) - clean: clean-recursive - --distclean-am: distclean-binPROGRAMS distclean-libexecPROGRAMS \ -- distclean-noinstPROGRAMS distclean-compile \ -- distclean-libtool distclean-tags distclean-generic \ -- clean-am -- -rm -f libtool -+clean-am: clean-binPROGRAMS clean-generic clean-libexecPROGRAMS \ -+ clean-libtool clean-noinstPROGRAMS mostlyclean-am - - distclean: distclean-recursive - --maintainer-clean-am: maintainer-clean-binPROGRAMS \ -- maintainer-clean-libexecPROGRAMS \ -- maintainer-clean-noinstPROGRAMS \ -- maintainer-clean-compile maintainer-clean-libtool \ -- maintainer-clean-tags 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." -+distclean-am: clean-am distclean-binPROGRAMS distclean-compile \ -+ distclean-depend distclean-generic distclean-libexecPROGRAMS \ -+ distclean-libtool distclean-noinstPROGRAMS distclean-tags - - maintainer-clean: maintainer-clean-recursive - --.PHONY: mostlyclean-binPROGRAMS distclean-binPROGRAMS clean-binPROGRAMS \ --maintainer-clean-binPROGRAMS uninstall-binPROGRAMS install-binPROGRAMS \ --mostlyclean-libexecPROGRAMS distclean-libexecPROGRAMS \ --clean-libexecPROGRAMS maintainer-clean-libexecPROGRAMS \ --uninstall-libexecPROGRAMS install-libexecPROGRAMS \ --mostlyclean-noinstPROGRAMS distclean-noinstPROGRAMS \ --clean-noinstPROGRAMS maintainer-clean-noinstPROGRAMS \ --mostlyclean-compile distclean-compile clean-compile \ --maintainer-clean-compile mostlyclean-libtool distclean-libtool \ --clean-libtool maintainer-clean-libtool install-data-recursive \ --uninstall-data-recursive install-exec-recursive \ --uninstall-exec-recursive installdirs-recursive uninstalldirs-recursive \ --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 -+maintainer-clean-am: distclean-am maintainer-clean-binPROGRAMS \ -+ maintainer-clean-generic maintainer-clean-libexecPROGRAMS \ -+ maintainer-clean-noinstPROGRAMS -+ -+mostlyclean: mostlyclean-recursive -+ -+mostlyclean-am: mostlyclean-binPROGRAMS mostlyclean-compile \ -+ mostlyclean-generic mostlyclean-libexecPROGRAMS \ -+ mostlyclean-libtool mostlyclean-noinstPROGRAMS -+ -+.PHONY: all-recursive all-redirect check check-am check-recursive clean \ -+ clean-binPROGRAMS clean-generic clean-libexecPROGRAMS \ -+ clean-libtool clean-noinstPROGRAMS clean-recursive distclean \ -+ distclean-binPROGRAMS distclean-compile distclean-depend \ -+ distclean-generic distclean-libexecPROGRAMS distclean-libtool \ -+ distclean-noinstPROGRAMS distclean-recursive distclean-tags \ -+ distdir dvi dvi-am dvi-recursive info info-am info-recursive \ -+ install install-am install-binPROGRAMS install-data \ -+ install-data-am install-data-recursive install-exec \ -+ install-exec-am install-exec-recursive install-libexecPROGRAMS \ -+ install-recursive install-strip installcheck installcheck-am \ -+ installcheck-recursive installdirs installdirs-am \ -+ installdirs-recursive maintainer-clean \ -+ maintainer-clean-binPROGRAMS maintainer-clean-generic \ -+ maintainer-clean-libexecPROGRAMS \ -+ maintainer-clean-noinstPROGRAMS maintainer-clean-recursive \ -+ mostlyclean mostlyclean-binPROGRAMS mostlyclean-compile \ -+ mostlyclean-generic mostlyclean-libexecPROGRAMS \ -+ mostlyclean-libtool mostlyclean-noinstPROGRAMS \ -+ mostlyclean-recursive tags tags-recursive uninstall \ -+ uninstall-am uninstall-binPROGRAMS uninstall-libexecPROGRAMS \ -+ uninstall-recursive - - - link_sources: -diff -r -N -U3 mysql-3.23.32.orig/sql/share/Makefile.in mysql-3.23.32/sql/share/Makefile.in ---- mysql-3.23.32.orig/sql/share/Makefile.in Mon Jan 22 14:44:16 2001 -+++ mysql-3.23.32/sql/share/Makefile.in Thu Mar 1 17:01:03 2001 -@@ -1,6 +1,7 @@ --# Makefile.in generated automatically by automake 1.4 from Makefile.am -+# Makefile.in generated automatically by automake 1.4d from Makefile.am - --# Copyright (C) 1994, 1995-8, 1999 Free Software Foundation, Inc. -+# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001 -+# Free Software Foundation, Inc. - # This Makefile.in is free software; the Free Software Foundation - # gives unlimited permission to copy and/or distribute it, - # with or without modifications, as long as this notice is preserved. -@@ -10,9 +11,6 @@ - # even the implied warranty of MERCHANTABILITY or FITNESS FOR A - # PARTICULAR PURPOSE. - --# This requires gnu cp at distribution time. -- -- - SHELL = @SHELL@ - - srcdir = @srcdir@ -@@ -34,8 +32,6 @@ - includedir = @includedir@ - oldincludedir = /usr/include - --DESTDIR = -- - pkgdatadir = $(datadir)/@PACKAGE@ - pkglibdir = $(libdir)/@PACKAGE@ - pkgincludedir = $(includedir)/@PACKAGE@ -@@ -48,9 +44,11 @@ - AUTOHEADER = @AUTOHEADER@ - - INSTALL = @INSTALL@ --INSTALL_PROGRAM = @INSTALL_PROGRAM@ $(AM_INSTALL_PROGRAM_FLAGS) -+INSTALL_PROGRAM = @INSTALL_PROGRAM@ - INSTALL_DATA = @INSTALL_DATA@ - INSTALL_SCRIPT = @INSTALL_SCRIPT@ -+INSTALL_STRIP_FLAG = -+INSTALL_HEADER = $(INSTALL_DATA) - transform = @program_transform_name@ - - NORMAL_INSTALL = : -@@ -59,6 +57,8 @@ - NORMAL_UNINSTALL = : - PRE_UNINSTALL = : - POST_UNINSTALL = : -+ -+@SET_MAKE@ - build_alias = @build_alias@ - build_triplet = @build@ - host_alias = @host_alias@ -@@ -66,6 +66,8 @@ - target_alias = @target_alias@ - target_triplet = @target@ - ALLOCA = @ALLOCA@ -+AMDEP = @AMDEP@ -+AMTAR = @AMTAR@ - AS = @AS@ - AVAILABLE_LANGUAGES = @AVAILABLE_LANGUAGES@ - AVAILABLE_LANGUAGES_ERRORS = @AVAILABLE_LANGUAGES_ERRORS@ -@@ -87,6 +89,7 @@ - CXX = @CXX@ - CXXFLAGS = @CXXFLAGS@ - CXXLDFLAGS = @CXXLDFLAGS@ -+DEPDIR = @DEPDIR@ - DLLTOOL = @DLLTOOL@ - DOT_FRM_VERSION = @DOT_FRM_VERSION@ - FIND_PROC = @FIND_PROC@ -@@ -140,11 +143,13 @@ - VERSION = @VERSION@ - WRAPLIBS = @WRAPLIBS@ - YACC = @YACC@ -+_am_include = @_am_include@ - bdb_includes = @bdb_includes@ - bdb_libs = @bdb_libs@ - bench_dirs = @bench_dirs@ - default_charset = @default_charset@ - docs_dirs = @docs_dirs@ -+install_sh = @install_sh@ - linked_client_targets = @linked_client_targets@ - readline_dir = @readline_dir@ - readline_link = @readline_link@ -@@ -153,24 +158,28 @@ - sql_server_dirs = @sql_server_dirs@ - thread_dirs = @thread_dirs@ - uname_prog = @uname_prog@ -+ -+# This requires gnu cp at distribution time. -+ -+subdir = sql/share - mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs - CONFIG_HEADER = ../../config.h - CONFIG_CLEAN_FILES = -+DIST_SOURCES = - DIST_COMMON = Makefile.am Makefile.in - - --DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST) -+DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) - --TAR = gtar - GZIP_ENV = --best --all: all-redirect -+all: all-am - .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 - cd $(top_builddir) \ -- && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status -+ && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= CONFIG_LINKS= $(SHELL) ./config.status - - tags: TAGS - TAGS: -@@ -178,17 +187,17 @@ - - distdir = $(top_builddir)/$(PACKAGE)-$(VERSION)/$(subdir) - --subdir = sql/share - - distdir: $(DISTFILES) - @for file in $(DISTFILES); do \ - d=$(srcdir); \ - if test -d $$d/$$file; then \ -- cp -pr $$d/$$file $(distdir)/$$file; \ -+ cp -pR $$d/$$file $(distdir) \ -+ || exit 1; \ - else \ - test -f $(distdir)/$$file \ -- || ln $$d/$$file $(distdir)/$$file 2> /dev/null \ -- || cp -p $$d/$$file $(distdir)/$$file || :; \ -+ || cp -p $$d/$$file $(distdir)/$$file \ -+ || exit 1; \ - fi; \ - done - $(MAKE) $(AM_MAKEFLAGS) top_distdir="$(top_distdir)" distdir="$(distdir)" dist-hook -@@ -212,9 +221,8 @@ - uninstall-am: - uninstall: uninstall-am - all-am: Makefile --all-redirect: all-am - install-strip: -- $(MAKE) $(AM_MAKEFLAGS) AM_INSTALL_PROGRAM_FLAGS=-s install -+ $(MAKE) $(AM_MAKEFLAGS) INSTALL_STRIP_FLAG=-s install - installdirs: - - -@@ -227,31 +235,31 @@ - -rm -f config.cache config.log stamp-h stamp-h[0-9]* - - maintainer-clean-generic: --mostlyclean-am: mostlyclean-generic -- --mostlyclean: mostlyclean-am -- --clean-am: clean-generic mostlyclean-am -- -+ @echo "This command is intended for maintainers to use" -+ @echo "it deletes files that may require special tools to rebuild." -+ -rm -f Makefile.in - clean: clean-am - --distclean-am: distclean-generic clean-am -- -rm -f libtool -+clean-am: clean-generic mostlyclean-am - - distclean: distclean-am - --maintainer-clean-am: 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." -+distclean-am: clean-am distclean-generic - - maintainer-clean: maintainer-clean-am - --.PHONY: tags distdir info-am info dvi-am dvi check check-am \ --installcheck-am installcheck install-exec-am install-exec \ --install-data-local 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 -+maintainer-clean-am: distclean-am maintainer-clean-generic -+ -+mostlyclean: mostlyclean-am -+ -+mostlyclean-am: mostlyclean-generic -+ -+.PHONY: check check-am clean clean-generic distclean distclean-generic \ -+ distdir dvi dvi-am info info-am install install-am install-data \ -+ install-data-am install-data-local install-exec install-exec-am \ -+ install-strip installcheck installcheck-am installdirs \ -+ maintainer-clean maintainer-clean-generic mostlyclean \ -+ mostlyclean-generic uninstall uninstall-am - - - dist-hook: -diff -r -N -U3 mysql-3.23.32.orig/sql-bench/Makefile.in mysql-3.23.32/sql-bench/Makefile.in ---- mysql-3.23.32.orig/sql-bench/Makefile.in Mon Jan 22 14:44:19 2001 -+++ mysql-3.23.32/sql-bench/Makefile.in Thu Mar 1 17:01:06 2001 -@@ -1,6 +1,7 @@ --# Makefile.in generated automatically by automake 1.4 from Makefile.am -+# Makefile.in generated automatically by automake 1.4d from Makefile.am - --# Copyright (C) 1994, 1995-8, 1999 Free Software Foundation, Inc. -+# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001 -+# Free Software Foundation, Inc. - # This Makefile.in is free software; the Free Software Foundation - # gives unlimited permission to copy and/or distribute it, - # with or without modifications, as long as this notice is preserved. -@@ -10,24 +11,6 @@ - # even the implied warranty of MERCHANTABILITY or FITNESS FOR A - # PARTICULAR PURPOSE. - --# Copyright (C) 2000 MySQL AB & MySQL Finland AB & TCX DataKonsult AB --# --# This library is free software; you can redistribute it and/or --# modify it under the terms of the GNU Library General Public --# License as published by the Free Software Foundation; either --# version 2 of the License, or (at your option) any later version. --# --# This library is distributed in the hope that it will be useful, --# but WITHOUT ANY WARRANTY; without even the implied warranty of --# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU --# Library General Public License for more details. --# --# You should have received a copy of the GNU Library General Public --# License along with this library; if not, write to the Free --# Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, --# MA 02111-1307, USA -- -- - SHELL = @SHELL@ - - srcdir = @srcdir@ -@@ -49,8 +32,6 @@ - includedir = @includedir@ - oldincludedir = /usr/include - --DESTDIR = -- - pkgdatadir = $(datadir)/@PACKAGE@ - pkglibdir = $(libdir)/@PACKAGE@ - pkgincludedir = $(includedir)/@PACKAGE@ -@@ -63,9 +44,11 @@ - AUTOHEADER = @AUTOHEADER@ - - INSTALL = @INSTALL@ --INSTALL_PROGRAM = @INSTALL_PROGRAM@ $(AM_INSTALL_PROGRAM_FLAGS) -+INSTALL_PROGRAM = @INSTALL_PROGRAM@ - INSTALL_DATA = @INSTALL_DATA@ - INSTALL_SCRIPT = @INSTALL_SCRIPT@ -+INSTALL_STRIP_FLAG = -+INSTALL_HEADER = $(INSTALL_DATA) - transform = @program_transform_name@ - - NORMAL_INSTALL = : -@@ -74,6 +57,8 @@ - NORMAL_UNINSTALL = : - PRE_UNINSTALL = : - POST_UNINSTALL = : -+ -+@SET_MAKE@ - build_alias = @build_alias@ - build_triplet = @build@ - host_alias = @host_alias@ -@@ -81,6 +66,8 @@ - target_alias = @target_alias@ - target_triplet = @target@ - ALLOCA = @ALLOCA@ -+AMDEP = @AMDEP@ -+AMTAR = @AMTAR@ - AS = @AS@ - AVAILABLE_LANGUAGES = @AVAILABLE_LANGUAGES@ - AVAILABLE_LANGUAGES_ERRORS = @AVAILABLE_LANGUAGES_ERRORS@ -@@ -102,6 +89,7 @@ - CXX = @CXX@ - CXXFLAGS = @CXXFLAGS@ - CXXLDFLAGS = @CXXLDFLAGS@ -+DEPDIR = @DEPDIR@ - DLLTOOL = @DLLTOOL@ - DOT_FRM_VERSION = @DOT_FRM_VERSION@ - FIND_PROC = @FIND_PROC@ -@@ -155,11 +143,13 @@ - VERSION = @VERSION@ - WRAPLIBS = @WRAPLIBS@ - YACC = @YACC@ -+_am_include = @_am_include@ - bdb_includes = @bdb_includes@ - bdb_libs = @bdb_libs@ - bench_dirs = @bench_dirs@ - default_charset = @default_charset@ - docs_dirs = @docs_dirs@ -+install_sh = @install_sh@ - linked_client_targets = @linked_client_targets@ - readline_dir = @readline_dir@ - readline_link = @readline_link@ -@@ -169,56 +159,86 @@ - thread_dirs = @thread_dirs@ - uname_prog = @uname_prog@ - -+# Copyright (C) 2000 MySQL AB & MySQL Finland AB & TCX DataKonsult AB -+# -+# This library is free software; you can redistribute it and/or -+# modify it under the terms of the GNU Library General Public -+# License as published by the Free Software Foundation; either -+# version 2 of the License, or (at your option) any later version. -+# -+# This library is distributed in the hope that it will be useful, -+# but WITHOUT ANY WARRANTY; without even the implied warranty of -+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -+# Library General Public License for more details. -+# -+# You should have received a copy of the GNU Library General Public -+# License along with this library; if not, write to the Free -+# Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, -+# MA 02111-1307, USA -+ -+ - benchdir_root = $(prefix) - benchdir = $(benchdir_root)/sql-bench --bench_SCRIPTS = test-ATIS test-connect test-create test-insert test-big-tables test-select test-wisconsin test-alter-table bench-init.pl compare-results run-all-tests server-cfg crash-me copy-db -+bench_SCRIPTS = test-ATIS test-connect test-create test-insert \ -+ test-big-tables test-select test-wisconsin \ -+ test-alter-table \ -+ bench-init.pl compare-results run-all-tests \ -+ server-cfg crash-me copy-db - - CLEANFILES = $(bench_SCRIPTS) --EXTRA_SCRIPTS = test-ATIS.sh test-connect.sh test-create.sh test-insert.sh test-big-tables.sh test-select.sh test-alter-table.sh test-wisconsin.sh bench-init.pl.sh compare-results.sh server-cfg.sh run-all-tests.sh crash-me.sh copy-db.sh -+EXTRA_SCRIPTS = test-ATIS.sh test-connect.sh test-create.sh \ -+ test-insert.sh test-big-tables.sh test-select.sh \ -+ test-alter-table.sh test-wisconsin.sh \ -+ bench-init.pl.sh compare-results.sh server-cfg.sh \ -+ run-all-tests.sh crash-me.sh copy-db.sh - - EXTRA_DIST = $(EXTRA_SCRIPTS) - - SUFFIXES = .sh -+subdir = sql-bench - mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs - CONFIG_HEADER = ../config.h - CONFIG_CLEAN_FILES = - SCRIPTS = $(bench_SCRIPTS) - -+DIST_SOURCES = - DIST_COMMON = README ChangeLog Makefile.am Makefile.in - - --DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST) -+DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) - --TAR = gtar - GZIP_ENV = --best --all: all-redirect -+all: all-am - .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 - cd $(top_builddir) \ -- && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status -+ && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= CONFIG_LINKS= $(SHELL) ./config.status - - - install-benchSCRIPTS: $(bench_SCRIPTS) - @$(NORMAL_INSTALL) - $(mkinstalldirs) $(DESTDIR)$(benchdir) - @list='$(bench_SCRIPTS)'; for p in $$list; do \ -+ f="`echo $$p|sed '$(transform)'`"; \ - if test -f $$p; then \ -- echo " $(INSTALL_SCRIPT) $$p $(DESTDIR)$(benchdir)/`echo $$p|sed '$(transform)'`"; \ -- $(INSTALL_SCRIPT) $$p $(DESTDIR)$(benchdir)/`echo $$p|sed '$(transform)'`; \ -- else if test -f $(srcdir)/$$p; then \ -- echo " $(INSTALL_SCRIPT) $(srcdir)/$$p $(DESTDIR)$(benchdir)/`echo $$p|sed '$(transform)'`"; \ -- $(INSTALL_SCRIPT) $(srcdir)/$$p $(DESTDIR)$(benchdir)/`echo $$p|sed '$(transform)'`; \ -- else :; fi; fi; \ -+ echo " $(INSTALL_SCRIPT) $$p $(DESTDIR)$(benchdir)/$$f"; \ -+ $(INSTALL_SCRIPT) $$p $(DESTDIR)$(benchdir)/$$f; \ -+ elif test -f $(srcdir)/$$p; then \ -+ echo " $(INSTALL_SCRIPT) $(srcdir)/$$p $(DESTDIR)$(benchdir)/$$f"; \ -+ $(INSTALL_SCRIPT) $(srcdir)/$$p $(DESTDIR)$(benchdir)/$$f; \ -+ else :; fi; \ - done - - uninstall-benchSCRIPTS: - @$(NORMAL_UNINSTALL) -- list='$(bench_SCRIPTS)'; for p in $$list; do \ -- rm -f $(DESTDIR)$(benchdir)/`echo $$p|sed '$(transform)'`; \ -+ @list='$(bench_SCRIPTS)'; for p in $$list; do \ -+ f="`echo $$p|sed '$(transform)'`"; \ -+ echo " rm -f $(DESTDIR)$(benchdir)/$$f"; \ -+ rm -f $(DESTDIR)$(benchdir)/$$f; \ - done - tags: TAGS - TAGS: -@@ -226,17 +246,17 @@ - - distdir = $(top_builddir)/$(PACKAGE)-$(VERSION)/$(subdir) - --subdir = sql-bench - - distdir: $(DISTFILES) - @for file in $(DISTFILES); do \ - d=$(srcdir); \ - if test -d $$d/$$file; then \ -- cp -pr $$d/$$file $(distdir)/$$file; \ -+ cp -pR $$d/$$file $(distdir) \ -+ || exit 1; \ - else \ - test -f $(distdir)/$$file \ -- || ln $$d/$$file $(distdir)/$$file 2> /dev/null \ -- || cp -p $$d/$$file $(distdir)/$$file || :; \ -+ || cp -p $$d/$$file $(distdir)/$$file \ -+ || exit 1; \ - fi; \ - done - $(MAKE) $(AM_MAKEFLAGS) top_distdir="$(top_distdir)" distdir="$(distdir)" dist-hook -@@ -260,9 +280,8 @@ - uninstall-am: uninstall-benchSCRIPTS - uninstall: uninstall-am - all-am: Makefile $(SCRIPTS) --all-redirect: all-am - install-strip: -- $(MAKE) $(AM_MAKEFLAGS) AM_INSTALL_PROGRAM_FLAGS=-s install -+ $(MAKE) $(AM_MAKEFLAGS) INSTALL_STRIP_FLAG=-s install - installdirs: - $(mkinstalldirs) $(DESTDIR)$(benchdir) - -@@ -277,32 +296,32 @@ - -rm -f config.cache config.log stamp-h stamp-h[0-9]* - - maintainer-clean-generic: --mostlyclean-am: mostlyclean-generic -- --mostlyclean: mostlyclean-am -- --clean-am: clean-generic mostlyclean-am -- -+ @echo "This command is intended for maintainers to use" -+ @echo "it deletes files that may require special tools to rebuild." -+ -rm -f Makefile.in - clean: clean-am - --distclean-am: distclean-generic clean-am -- -rm -f libtool -+clean-am: clean-generic mostlyclean-am - - distclean: distclean-am - --maintainer-clean-am: 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." -+distclean-am: clean-am distclean-generic - - maintainer-clean: maintainer-clean-am - --.PHONY: uninstall-benchSCRIPTS install-benchSCRIPTS tags distdir info-am \ --info dvi-am dvi check check-am installcheck-am installcheck \ --install-exec-am install-exec install-data-local 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 -+maintainer-clean-am: distclean-am maintainer-clean-generic -+ -+mostlyclean: mostlyclean-am -+ -+mostlyclean-am: mostlyclean-generic -+ -+.PHONY: check check-am clean clean-generic distclean distclean-generic \ -+ distdir dvi dvi-am info info-am install install-am \ -+ install-benchSCRIPTS install-data install-data-am \ -+ install-data-local install-exec install-exec-am install-strip \ -+ installcheck installcheck-am installdirs maintainer-clean \ -+ maintainer-clean-generic mostlyclean mostlyclean-generic \ -+ uninstall uninstall-am uninstall-benchSCRIPTS - - - dist-hook: -diff -r -N -U3 mysql-3.23.32.orig/strings/Makefile.in mysql-3.23.32/strings/Makefile.in ---- mysql-3.23.32.orig/strings/Makefile.in Mon Jan 22 14:44:02 2001 -+++ mysql-3.23.32/strings/Makefile.in Thu Mar 1 17:00:53 2001 -@@ -1,6 +1,7 @@ --# Makefile.in generated automatically by automake 1.4 from Makefile.am -+# Makefile.in generated automatically by automake 1.4d from Makefile.am - --# Copyright (C) 1994, 1995-8, 1999 Free Software Foundation, Inc. -+# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001 -+# Free Software Foundation, Inc. - # This Makefile.in is free software; the Free Software Foundation - # gives unlimited permission to copy and/or distribute it, - # with or without modifications, as long as this notice is preserved. -@@ -10,25 +11,6 @@ - # even the implied warranty of MERCHANTABILITY or FITNESS FOR A - # PARTICULAR PURPOSE. - --# Copyright (C) 2000 MySQL AB & MySQL Finland AB & TCX DataKonsult AB --# --# This program is free software; you can redistribute it and/or modify --# it under the terms of the GNU General Public License as published by --# the Free Software Foundation; either version 2 of the License, or --# (at your option) any later version. --# --# This program is distributed in the hope that it will be useful, --# but WITHOUT ANY WARRANTY; without even the implied warranty of --# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the --# GNU General Public License for more details. --# --# You should have received a copy of the GNU General Public License --# along with this program; if not, write to the Free Software --# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -- --# This file is public domain and comes with NO WARRANTY of any kind -- -- - SHELL = @SHELL@ - - srcdir = @srcdir@ -@@ -50,8 +32,6 @@ - includedir = @includedir@ - oldincludedir = /usr/include - --DESTDIR = -- - pkgdatadir = $(datadir)/@PACKAGE@ - pkglibdir = $(libdir)/@PACKAGE@ - pkgincludedir = $(includedir)/@PACKAGE@ -@@ -64,9 +44,11 @@ - AUTOHEADER = @AUTOHEADER@ - - INSTALL = @INSTALL@ --INSTALL_PROGRAM = @INSTALL_PROGRAM@ $(AM_INSTALL_PROGRAM_FLAGS) -+INSTALL_PROGRAM = @INSTALL_PROGRAM@ - INSTALL_DATA = @INSTALL_DATA@ - INSTALL_SCRIPT = @INSTALL_SCRIPT@ -+INSTALL_STRIP_FLAG = -+INSTALL_HEADER = $(INSTALL_DATA) - transform = @program_transform_name@ - - NORMAL_INSTALL = : -@@ -75,6 +57,8 @@ - NORMAL_UNINSTALL = : - PRE_UNINSTALL = : - POST_UNINSTALL = : -+ -+@SET_MAKE@ - build_alias = @build_alias@ - build_triplet = @build@ - host_alias = @host_alias@ -@@ -82,6 +66,8 @@ - target_alias = @target_alias@ - target_triplet = @target@ - ALLOCA = @ALLOCA@ -+AMDEP = @AMDEP@ -+AMTAR = @AMTAR@ - AS = @AS@ - AVAILABLE_LANGUAGES = @AVAILABLE_LANGUAGES@ - AVAILABLE_LANGUAGES_ERRORS = @AVAILABLE_LANGUAGES_ERRORS@ -@@ -103,6 +89,7 @@ - CXX = @CXX@ - CXXFLAGS = @CXXFLAGS@ - CXXLDFLAGS = @CXXLDFLAGS@ -+DEPDIR = @DEPDIR@ - DLLTOOL = @DLLTOOL@ - DOT_FRM_VERSION = @DOT_FRM_VERSION@ - FIND_PROC = @FIND_PROC@ -@@ -156,11 +143,13 @@ - VERSION = @VERSION@ - WRAPLIBS = @WRAPLIBS@ - YACC = @YACC@ -+_am_include = @_am_include@ - bdb_includes = @bdb_includes@ - bdb_libs = @bdb_libs@ - bench_dirs = @bench_dirs@ - default_charset = @default_charset@ - docs_dirs = @docs_dirs@ -+install_sh = @install_sh@ - linked_client_targets = @linked_client_targets@ - readline_dir = @readline_dir@ - readline_link = @readline_link@ -@@ -170,31 +159,68 @@ - thread_dirs = @thread_dirs@ - uname_prog = @uname_prog@ - -+# Copyright (C) 2000 MySQL AB & MySQL Finland AB & TCX DataKonsult AB -+# -+# This program is free software; you can redistribute it and/or modify -+# it under the terms of the GNU General Public License as published by -+# the Free Software Foundation; either version 2 of the License, or -+# (at your option) any later version. -+# -+# This program is distributed in the hope that it will be useful, -+# but WITHOUT ANY WARRANTY; without even the implied warranty of -+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -+# GNU General Public License for more details. -+# -+# You should have received a copy of the GNU General Public License -+# along with this program; if not, write to the Free Software -+# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -+ -+# This file is public domain and comes with NO WARRANTY of any kind -+ -+ - INCLUDES = @MT_INCLUDES@ -I$(srcdir)/../include -I../include - pkglib_LIBRARIES = libmystrings.a - #no assembler --@ASSEMBLER_x86_TRUE@ASRCS = strings-x86.s longlong2str-x86.s --@ASSEMBLER_x86_FALSE@@ASSEMBLER_sparc_TRUE@ASRCS = bmove_upp-sparc.s strappend-sparc.s strend-sparc.s strinstr-sparc.s strmake-sparc.s strmov-sparc.s strnmov-sparc.s strstr-sparc.s strxmov-sparc.s -+@ASSEMBLER_x86_TRUE@ASRCS = @ASSEMBLER_x86_TRUE@strings-x86.s longlong2str-x86.s -+@ASSEMBLER_x86_FALSE@@ASSEMBLER_sparc_TRUE@ASRCS = @ASSEMBLER_x86_FALSE@@ASSEMBLER_sparc_TRUE@bmove_upp-sparc.s strappend-sparc.s strend-sparc.s strinstr-sparc.s strmake-sparc.s strmov-sparc.s strnmov-sparc.s strstr-sparc.s strxmov-sparc.s - @ASSEMBLER_x86_FALSE@@ASSEMBLER_sparc_FALSE@ASRCS = - # These file MUST all be on the same line!! Otherwise automake - # generats a very broken makefile --@ASSEMBLER_x86_TRUE@CSRCS = bfill.c bmove.c bmove512.c bchange.c strxnmov.c int2str.c str2int.c r_strinstr.c atof.c bcmp.c strtol.c strtoul.c strtoll.c strtoull.c strxmov.c bmove_upp.c strappend.c strcont.c strend.c strfill.c strcend.c is_prefix.c strstr.c strinstr.c strmake.c strnmov.c strmov.c longlong2str.c llstr.c ctype.c strnlen.c --@ASSEMBLER_x86_FALSE@@ASSEMBLER_sparc_TRUE@CSRCS = strcont.c strfill.c strcend.c is_prefix.c longlong2str.c bfill.c bmove.c bmove512.c bchange.c strxnmov.c int2str.c str2int.c r_strinstr.c atof.c bcmp.c strtol.c strtoul.c strtoll.c strtoull.c llstr.c ctype.c strnlen.c --@ASSEMBLER_x86_FALSE@@ASSEMBLER_sparc_FALSE@CSRCS = strxmov.c bmove_upp.c strappend.c strcont.c strend.c strfill.c strcend.c is_prefix.c strstr.c strinstr.c strmake.c strnmov.c strmov.c longlong2str.c bfill.c bmove.c bmove512.c bchange.c strxnmov.c int2str.c str2int.c r_strinstr.c atof.c bcmp.c strtol.c strtoul.c strtoll.c strtoull.c llstr.c ctype.c strnlen.c -+@ASSEMBLER_x86_TRUE@CSRCS = @ASSEMBLER_x86_TRUE@bfill.c bmove.c bmove512.c bchange.c strxnmov.c int2str.c str2int.c r_strinstr.c atof.c bcmp.c strtol.c strtoul.c strtoll.c strtoull.c strxmov.c bmove_upp.c strappend.c strcont.c strend.c strfill.c strcend.c is_prefix.c strstr.c strinstr.c strmake.c strnmov.c strmov.c longlong2str.c llstr.c ctype.c strnlen.c -+@ASSEMBLER_x86_FALSE@@ASSEMBLER_sparc_TRUE@CSRCS = @ASSEMBLER_x86_FALSE@@ASSEMBLER_sparc_TRUE@strcont.c strfill.c strcend.c is_prefix.c longlong2str.c bfill.c bmove.c bmove512.c bchange.c strxnmov.c int2str.c str2int.c r_strinstr.c atof.c bcmp.c strtol.c strtoul.c strtoll.c strtoull.c llstr.c ctype.c strnlen.c -+@ASSEMBLER_x86_FALSE@@ASSEMBLER_sparc_FALSE@CSRCS = @ASSEMBLER_x86_FALSE@@ASSEMBLER_sparc_FALSE@strxmov.c bmove_upp.c strappend.c strcont.c strend.c strfill.c strcend.c is_prefix.c strstr.c strinstr.c strmake.c strnmov.c strmov.c longlong2str.c bfill.c bmove.c bmove512.c bchange.c strxnmov.c int2str.c str2int.c r_strinstr.c atof.c bcmp.c strtol.c strtoul.c strtoll.c strtoull.c llstr.c ctype.c strnlen.c - - libmystrings_a_SOURCES = @CHARSET_SRCS@ $(ASRCS) $(CSRCS) - - noinst_PROGRAMS = conf_to_src - # Default charset definitions --EXTRA_DIST = ctype-big5.c ctype-czech.c ctype-euc_kr.c ctype-gb2312.c ctype-gbk.c ctype-sjis.c ctype-tis620.c ctype-ujis.c ctype_autoconf.c strto.c strings-x86.s longlong2str-x86.s strxmov.c bmove_upp.c strappend.c strcont.c strend.c strfill.c strcend.c is_prefix.c strstr.c strinstr.c strmake.c strnmov.c strmov.c strnlen.c bmove_upp-sparc.s strappend-sparc.s strend-sparc.s strinstr-sparc.s strmake-sparc.s strmov-sparc.s strnmov-sparc.s strstr-sparc.s strxmov-sparc.s -- -- --OMIT_DEPENDENCIES = pthread.h stdio.h __stdio.h stdlib.h __stdlib.h math.h __math.h time.h __time.h unistd.h __unistd.h types.h xtypes.h ac-types.h posix.h string.h __string.h errno.h socket.h inet.h dirent.h netdb.h cleanup.h cond.h debug_out.h fd.h kernel.h mutex.h prio_queue.h pthread_attr.h pthread_once.h queue.h sleep.h specific.h version.h pwd.h timers.h uio.h cdefs.h machdep.h signal.h __signal.h util.h -+EXTRA_DIST = ctype-big5.c ctype-czech.c ctype-euc_kr.c \ -+ ctype-gb2312.c ctype-gbk.c ctype-sjis.c \ -+ ctype-tis620.c ctype-ujis.c \ -+ ctype_autoconf.c \ -+ strto.c strings-x86.s longlong2str-x86.s \ -+ strxmov.c bmove_upp.c strappend.c strcont.c strend.c \ -+ strfill.c strcend.c is_prefix.c strstr.c strinstr.c \ -+ strmake.c strnmov.c strmov.c strnlen.c \ -+ bmove_upp-sparc.s strappend-sparc.s strend-sparc.s \ -+ strinstr-sparc.s strmake-sparc.s strmov-sparc.s \ -+ strnmov-sparc.s strstr-sparc.s strxmov-sparc.s -+ -+ -+OMIT_DEPENDENCIES = pthread.h stdio.h __stdio.h stdlib.h __stdlib.h math.h\ -+ __math.h time.h __time.h unistd.h __unistd.h types.h \ -+ xtypes.h ac-types.h posix.h string.h __string.h \ -+ errno.h socket.h inet.h dirent.h netdb.h \ -+ cleanup.h cond.h debug_out.h fd.h kernel.h mutex.h \ -+ prio_queue.h pthread_attr.h pthread_once.h queue.h\ -+ sleep.h specific.h version.h pwd.h timers.h uio.h \ -+ cdefs.h machdep.h signal.h __signal.h util.h - - - libmystrings_a_LIBADD = @CHARSET_OBJS@ - conf_to_src_SOURCES = conf_to_src.c - conf_to_src_LDADD = -+subdir = strings - mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs - CONFIG_HEADER = ../config.h - CONFIG_CLEAN_FILES = -@@ -205,102 +231,118 @@ - CPPFLAGS = @CPPFLAGS@ - LDFLAGS = @LDFLAGS@ - LIBS = @LIBS@ -+libmystrings_a_AR = $(AR) cru - 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 \ --@ASSEMBLER_x86_FALSE@@ASSEMBLER_sparc_TRUE@strend-sparc.o \ --@ASSEMBLER_x86_FALSE@@ASSEMBLER_sparc_TRUE@strinstr-sparc.o \ --@ASSEMBLER_x86_FALSE@@ASSEMBLER_sparc_TRUE@strmake-sparc.o \ --@ASSEMBLER_x86_FALSE@@ASSEMBLER_sparc_TRUE@strmov-sparc.o \ --@ASSEMBLER_x86_FALSE@@ASSEMBLER_sparc_TRUE@strnmov-sparc.o \ --@ASSEMBLER_x86_FALSE@@ASSEMBLER_sparc_TRUE@strstr-sparc.o \ --@ASSEMBLER_x86_FALSE@@ASSEMBLER_sparc_TRUE@strxmov-sparc.o strcont.o \ --@ASSEMBLER_x86_FALSE@@ASSEMBLER_sparc_TRUE@strfill.o strcend.o \ --@ASSEMBLER_x86_FALSE@@ASSEMBLER_sparc_TRUE@is_prefix.o longlong2str.o \ --@ASSEMBLER_x86_FALSE@@ASSEMBLER_sparc_TRUE@bfill.o bmove.o bmove512.o \ --@ASSEMBLER_x86_FALSE@@ASSEMBLER_sparc_TRUE@bchange.o strxnmov.o \ --@ASSEMBLER_x86_FALSE@@ASSEMBLER_sparc_TRUE@int2str.o str2int.o \ --@ASSEMBLER_x86_FALSE@@ASSEMBLER_sparc_TRUE@r_strinstr.o atof.o bcmp.o \ --@ASSEMBLER_x86_FALSE@@ASSEMBLER_sparc_TRUE@strtol.o strtoul.o strtoll.o \ --@ASSEMBLER_x86_FALSE@@ASSEMBLER_sparc_TRUE@strtoull.o llstr.o ctype.o \ --@ASSEMBLER_x86_FALSE@@ASSEMBLER_sparc_TRUE@strnlen.o --@ASSEMBLER_x86_FALSE@@ASSEMBLER_sparc_FALSE@libmystrings_a_OBJECTS = \ --@ASSEMBLER_x86_FALSE@@ASSEMBLER_sparc_FALSE@strxmov.o bmove_upp.o \ --@ASSEMBLER_x86_FALSE@@ASSEMBLER_sparc_FALSE@strappend.o strcont.o \ --@ASSEMBLER_x86_FALSE@@ASSEMBLER_sparc_FALSE@strend.o strfill.o \ --@ASSEMBLER_x86_FALSE@@ASSEMBLER_sparc_FALSE@strcend.o is_prefix.o \ --@ASSEMBLER_x86_FALSE@@ASSEMBLER_sparc_FALSE@strstr.o strinstr.o \ --@ASSEMBLER_x86_FALSE@@ASSEMBLER_sparc_FALSE@strmake.o strnmov.o \ --@ASSEMBLER_x86_FALSE@@ASSEMBLER_sparc_FALSE@strmov.o longlong2str.o \ --@ASSEMBLER_x86_FALSE@@ASSEMBLER_sparc_FALSE@bfill.o bmove.o bmove512.o \ --@ASSEMBLER_x86_FALSE@@ASSEMBLER_sparc_FALSE@bchange.o strxnmov.o \ --@ASSEMBLER_x86_FALSE@@ASSEMBLER_sparc_FALSE@int2str.o str2int.o \ --@ASSEMBLER_x86_FALSE@@ASSEMBLER_sparc_FALSE@r_strinstr.o atof.o bcmp.o \ --@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_TRUE@libmystrings_a_OBJECTS = \ --@ASSEMBLER_x86_TRUE@@ASSEMBLER_sparc_TRUE@strings-x86.o \ --@ASSEMBLER_x86_TRUE@@ASSEMBLER_sparc_TRUE@longlong2str-x86.o bfill.o \ --@ASSEMBLER_x86_TRUE@@ASSEMBLER_sparc_TRUE@bmove.o bmove512.o bchange.o \ --@ASSEMBLER_x86_TRUE@@ASSEMBLER_sparc_TRUE@strxnmov.o int2str.o \ --@ASSEMBLER_x86_TRUE@@ASSEMBLER_sparc_TRUE@str2int.o r_strinstr.o atof.o \ --@ASSEMBLER_x86_TRUE@@ASSEMBLER_sparc_TRUE@bcmp.o strtol.o strtoul.o \ --@ASSEMBLER_x86_TRUE@@ASSEMBLER_sparc_TRUE@strtoll.o strtoull.o \ --@ASSEMBLER_x86_TRUE@@ASSEMBLER_sparc_TRUE@strxmov.o bmove_upp.o \ --@ASSEMBLER_x86_TRUE@@ASSEMBLER_sparc_TRUE@strappend.o strcont.o \ --@ASSEMBLER_x86_TRUE@@ASSEMBLER_sparc_TRUE@strend.o strfill.o strcend.o \ --@ASSEMBLER_x86_TRUE@@ASSEMBLER_sparc_TRUE@is_prefix.o strstr.o \ --@ASSEMBLER_x86_TRUE@@ASSEMBLER_sparc_TRUE@strinstr.o strmake.o \ --@ASSEMBLER_x86_TRUE@@ASSEMBLER_sparc_TRUE@strnmov.o strmov.o \ --@ASSEMBLER_x86_TRUE@@ASSEMBLER_sparc_TRUE@longlong2str.o llstr.o \ --@ASSEMBLER_x86_TRUE@@ASSEMBLER_sparc_TRUE@ctype.o strnlen.o -+@ASSEMBLER_sparc_FALSE@@ASSEMBLER_x86_FALSE@am_libmystrings_a_OBJECTS = \ -+@ASSEMBLER_sparc_FALSE@@ASSEMBLER_x86_FALSE@strxmov.o bmove_upp.o \ -+@ASSEMBLER_sparc_FALSE@@ASSEMBLER_x86_FALSE@strappend.o strcont.o \ -+@ASSEMBLER_sparc_FALSE@@ASSEMBLER_x86_FALSE@strend.o strfill.o \ -+@ASSEMBLER_sparc_FALSE@@ASSEMBLER_x86_FALSE@strcend.o is_prefix.o \ -+@ASSEMBLER_sparc_FALSE@@ASSEMBLER_x86_FALSE@strstr.o strinstr.o \ -+@ASSEMBLER_sparc_FALSE@@ASSEMBLER_x86_FALSE@strmake.o strnmov.o \ -+@ASSEMBLER_sparc_FALSE@@ASSEMBLER_x86_FALSE@strmov.o longlong2str.o \ -+@ASSEMBLER_sparc_FALSE@@ASSEMBLER_x86_FALSE@bfill.o bmove.o bmove512.o \ -+@ASSEMBLER_sparc_FALSE@@ASSEMBLER_x86_FALSE@bchange.o strxnmov.o \ -+@ASSEMBLER_sparc_FALSE@@ASSEMBLER_x86_FALSE@int2str.o str2int.o \ -+@ASSEMBLER_sparc_FALSE@@ASSEMBLER_x86_FALSE@r_strinstr.o atof.o bcmp.o \ -+@ASSEMBLER_sparc_FALSE@@ASSEMBLER_x86_FALSE@strtol.o strtoul.o \ -+@ASSEMBLER_sparc_FALSE@@ASSEMBLER_x86_FALSE@strtoll.o strtoull.o \ -+@ASSEMBLER_sparc_FALSE@@ASSEMBLER_x86_FALSE@llstr.o ctype.o strnlen.o -+@ASSEMBLER_sparc_FALSE@@ASSEMBLER_x86_TRUE@am_libmystrings_a_OBJECTS = \ -+@ASSEMBLER_sparc_FALSE@@ASSEMBLER_x86_TRUE@strings-x86.o \ -+@ASSEMBLER_sparc_FALSE@@ASSEMBLER_x86_TRUE@longlong2str-x86.o bfill.o \ -+@ASSEMBLER_sparc_FALSE@@ASSEMBLER_x86_TRUE@bmove.o bmove512.o bchange.o \ -+@ASSEMBLER_sparc_FALSE@@ASSEMBLER_x86_TRUE@strxnmov.o int2str.o \ -+@ASSEMBLER_sparc_FALSE@@ASSEMBLER_x86_TRUE@str2int.o r_strinstr.o \ -+@ASSEMBLER_sparc_FALSE@@ASSEMBLER_x86_TRUE@atof.o bcmp.o strtol.o \ -+@ASSEMBLER_sparc_FALSE@@ASSEMBLER_x86_TRUE@strtoul.o strtoll.o \ -+@ASSEMBLER_sparc_FALSE@@ASSEMBLER_x86_TRUE@strtoull.o strxmov.o \ -+@ASSEMBLER_sparc_FALSE@@ASSEMBLER_x86_TRUE@bmove_upp.o strappend.o \ -+@ASSEMBLER_sparc_FALSE@@ASSEMBLER_x86_TRUE@strcont.o strend.o strfill.o \ -+@ASSEMBLER_sparc_FALSE@@ASSEMBLER_x86_TRUE@strcend.o is_prefix.o \ -+@ASSEMBLER_sparc_FALSE@@ASSEMBLER_x86_TRUE@strstr.o strinstr.o \ -+@ASSEMBLER_sparc_FALSE@@ASSEMBLER_x86_TRUE@strmake.o strnmov.o strmov.o \ -+@ASSEMBLER_sparc_FALSE@@ASSEMBLER_x86_TRUE@longlong2str.o llstr.o \ -+@ASSEMBLER_sparc_FALSE@@ASSEMBLER_x86_TRUE@ctype.o strnlen.o -+@ASSEMBLER_sparc_TRUE@@ASSEMBLER_x86_FALSE@am_libmystrings_a_OBJECTS = \ -+@ASSEMBLER_sparc_TRUE@@ASSEMBLER_x86_FALSE@bmove_upp-sparc.o \ -+@ASSEMBLER_sparc_TRUE@@ASSEMBLER_x86_FALSE@strappend-sparc.o \ -+@ASSEMBLER_sparc_TRUE@@ASSEMBLER_x86_FALSE@strend-sparc.o \ -+@ASSEMBLER_sparc_TRUE@@ASSEMBLER_x86_FALSE@strinstr-sparc.o \ -+@ASSEMBLER_sparc_TRUE@@ASSEMBLER_x86_FALSE@strmake-sparc.o \ -+@ASSEMBLER_sparc_TRUE@@ASSEMBLER_x86_FALSE@strmov-sparc.o \ -+@ASSEMBLER_sparc_TRUE@@ASSEMBLER_x86_FALSE@strnmov-sparc.o \ -+@ASSEMBLER_sparc_TRUE@@ASSEMBLER_x86_FALSE@strstr-sparc.o \ -+@ASSEMBLER_sparc_TRUE@@ASSEMBLER_x86_FALSE@strxmov-sparc.o strcont.o \ -+@ASSEMBLER_sparc_TRUE@@ASSEMBLER_x86_FALSE@strfill.o strcend.o \ -+@ASSEMBLER_sparc_TRUE@@ASSEMBLER_x86_FALSE@is_prefix.o longlong2str.o \ -+@ASSEMBLER_sparc_TRUE@@ASSEMBLER_x86_FALSE@bfill.o bmove.o bmove512.o \ -+@ASSEMBLER_sparc_TRUE@@ASSEMBLER_x86_FALSE@bchange.o strxnmov.o \ -+@ASSEMBLER_sparc_TRUE@@ASSEMBLER_x86_FALSE@int2str.o str2int.o \ -+@ASSEMBLER_sparc_TRUE@@ASSEMBLER_x86_FALSE@r_strinstr.o atof.o bcmp.o \ -+@ASSEMBLER_sparc_TRUE@@ASSEMBLER_x86_FALSE@strtol.o strtoul.o strtoll.o \ -+@ASSEMBLER_sparc_TRUE@@ASSEMBLER_x86_FALSE@strtoull.o llstr.o ctype.o \ -+@ASSEMBLER_sparc_TRUE@@ASSEMBLER_x86_FALSE@strnlen.o -+@ASSEMBLER_sparc_TRUE@@ASSEMBLER_x86_TRUE@am_libmystrings_a_OBJECTS = \ -+@ASSEMBLER_sparc_TRUE@@ASSEMBLER_x86_TRUE@strings-x86.o \ -+@ASSEMBLER_sparc_TRUE@@ASSEMBLER_x86_TRUE@longlong2str-x86.o bfill.o \ -+@ASSEMBLER_sparc_TRUE@@ASSEMBLER_x86_TRUE@bmove.o bmove512.o bchange.o \ -+@ASSEMBLER_sparc_TRUE@@ASSEMBLER_x86_TRUE@strxnmov.o int2str.o \ -+@ASSEMBLER_sparc_TRUE@@ASSEMBLER_x86_TRUE@str2int.o r_strinstr.o atof.o \ -+@ASSEMBLER_sparc_TRUE@@ASSEMBLER_x86_TRUE@bcmp.o strtol.o strtoul.o \ -+@ASSEMBLER_sparc_TRUE@@ASSEMBLER_x86_TRUE@strtoll.o strtoull.o \ -+@ASSEMBLER_sparc_TRUE@@ASSEMBLER_x86_TRUE@strxmov.o bmove_upp.o \ -+@ASSEMBLER_sparc_TRUE@@ASSEMBLER_x86_TRUE@strappend.o strcont.o \ -+@ASSEMBLER_sparc_TRUE@@ASSEMBLER_x86_TRUE@strend.o strfill.o strcend.o \ -+@ASSEMBLER_sparc_TRUE@@ASSEMBLER_x86_TRUE@is_prefix.o strstr.o \ -+@ASSEMBLER_sparc_TRUE@@ASSEMBLER_x86_TRUE@strinstr.o strmake.o \ -+@ASSEMBLER_sparc_TRUE@@ASSEMBLER_x86_TRUE@strnmov.o strmov.o \ -+@ASSEMBLER_sparc_TRUE@@ASSEMBLER_x86_TRUE@longlong2str.o llstr.o \ -+@ASSEMBLER_sparc_TRUE@@ASSEMBLER_x86_TRUE@ctype.o strnlen.o -+libmystrings_a_OBJECTS = $(am_libmystrings_a_OBJECTS) - AR = ar - PROGRAMS = $(noinst_PROGRAMS) - --conf_to_src_OBJECTS = conf_to_src.o -+am_conf_to_src_OBJECTS = conf_to_src.o -+conf_to_src_OBJECTS = $(am_conf_to_src_OBJECTS) - conf_to_src_DEPENDENCIES = - conf_to_src_LDFLAGS = - COMPILE = $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) - LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) - CCLD = $(CC) --LINK = $(LIBTOOL) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(LDFLAGS) -o $@ -+LINK = $(LIBTOOL) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@ -+DIST_SOURCES = $(libmystrings_a_SOURCES) $(conf_to_src_SOURCES) -+depcomp = $(SHELL) $(top_srcdir)/depcomp -+@AMDEP@DEP_FILES = $(DEPDIR)/atof.Po $(DEPDIR)/bchange.Po \ -+@AMDEP@$(DEPDIR)/bcmp.Po $(DEPDIR)/bfill.Po $(DEPDIR)/bmove.Po \ -+@AMDEP@$(DEPDIR)/bmove512.Po $(DEPDIR)/bmove_upp.Po \ -+@AMDEP@$(DEPDIR)/conf_to_src.Po $(DEPDIR)/ctype.Po $(DEPDIR)/int2str.Po \ -+@AMDEP@$(DEPDIR)/is_prefix.Po $(DEPDIR)/llstr.Po \ -+@AMDEP@$(DEPDIR)/longlong2str.Po $(DEPDIR)/r_strinstr.Po \ -+@AMDEP@$(DEPDIR)/str2int.Po $(DEPDIR)/strappend.Po $(DEPDIR)/strcend.Po \ -+@AMDEP@$(DEPDIR)/strcont.Po $(DEPDIR)/strend.Po $(DEPDIR)/strfill.Po \ -+@AMDEP@$(DEPDIR)/strinstr.Po $(DEPDIR)/strmake.Po $(DEPDIR)/strmov.Po \ -+@AMDEP@$(DEPDIR)/strnlen.Po $(DEPDIR)/strnmov.Po $(DEPDIR)/strstr.Po \ -+@AMDEP@$(DEPDIR)/strtol.Po $(DEPDIR)/strtoll.Po $(DEPDIR)/strtoul.Po \ -+@AMDEP@$(DEPDIR)/strtoull.Po $(DEPDIR)/strxmov.Po $(DEPDIR)/strxnmov.Po - DIST_COMMON = README ChangeLog Makefile.am Makefile.in - - --DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST) -+DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) - --TAR = gtar - GZIP_ENV = --best - SOURCES = $(libmystrings_a_SOURCES) $(conf_to_src_SOURCES) --OBJECTS = $(libmystrings_a_OBJECTS) $(conf_to_src_OBJECTS) -+OBJECTS = $(am_libmystrings_a_OBJECTS) $(am_conf_to_src_OBJECTS) - --all: all-redirect -+all: all-am - .SUFFIXES: --.SUFFIXES: .S .c .lo .o .s -+.SUFFIXES: .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 - cd $(top_builddir) \ -- && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status -+ && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= CONFIG_LINKS= $(SHELL) ./config.status - - - mostlyclean-pkglibLIBRARIES: -@@ -331,38 +373,17 @@ - - uninstall-pkglibLIBRARIES: - @$(NORMAL_UNINSTALL) -- list='$(pkglib_LIBRARIES)'; for p in $$list; do \ -+ @list='$(pkglib_LIBRARIES)'; for p in $$list; do \ -+ echo " rm -f $(DESTDIR)$(pkglibdir)/$$p"; \ - rm -f $(DESTDIR)$(pkglibdir)/$$p; \ - done - --.c.o: -- $(COMPILE) -c $< -- --.s.o: -- $(COMPILE) -c $< -- --.S.o: -- $(COMPILE) -c $< -- - mostlyclean-compile: - -rm -f *.o core *.core - --clean-compile: -- - distclean-compile: - -rm -f *.tab.c - --maintainer-clean-compile: -- --.c.lo: -- $(LIBTOOL) --mode=compile $(COMPILE) -c $< -- --.s.lo: -- $(LIBTOOL) --mode=compile $(COMPILE) -c $< -- --.S.lo: -- $(LIBTOOL) --mode=compile $(COMPILE) -c $< -- - mostlyclean-libtool: - -rm -f *.lo - -@@ -370,12 +391,11 @@ - -rm -rf .libs _libs - - distclean-libtool: -- --maintainer-clean-libtool: -+ -rm -f libtool - - libmystrings.a: $(libmystrings_a_OBJECTS) $(libmystrings_a_DEPENDENCIES) - -rm -f libmystrings.a -- $(AR) cru libmystrings.a $(libmystrings_a_OBJECTS) $(libmystrings_a_LIBADD) -+ $(libmystrings_a_AR) libmystrings.a $(libmystrings_a_OBJECTS) $(libmystrings_a_LIBADD) - $(RANLIB) libmystrings.a - - mostlyclean-noinstPROGRAMS: -@@ -390,177 +410,109 @@ - conf_to_src: $(conf_to_src_OBJECTS) $(conf_to_src_DEPENDENCIES) - @rm -f conf_to_src - $(LINK) $(conf_to_src_LDFLAGS) $(conf_to_src_OBJECTS) $(conf_to_src_LDADD) $(LIBS) -+.s.o: -+ $(COMPILE) -c $< -+.s.lo: -+ $(LTCOMPILE) -c -o $@ $< - - tags: TAGS - --ID: $(HEADERS) $(SOURCES) $(LISP) -- list='$(SOURCES) $(HEADERS)'; \ -- unique=`for i in $$list; do echo $$i; done | \ -- awk ' { files[$$0] = 1; } \ -+ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) -+ list='$(SOURCES) $(HEADERS) $(TAGS_FILES)'; \ -+ unique=`for i in $$list; do \ -+ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ -+ done | \ -+ $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ -- here=`pwd` && cd $(srcdir) \ -- && mkid -f$$here/ID $$unique $(LISP) -+ mkid -fID $$unique $(LISP) - --TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) $(LISP) -+TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ -+ $(TAGS_FILES) $(LISP) - tags=; \ - here=`pwd`; \ -- list='$(SOURCES) $(HEADERS)'; \ -- unique=`for i in $$list; do echo $$i; done | \ -- awk ' { files[$$0] = 1; } \ -+ list='$(SOURCES) $(HEADERS) $(TAGS_FILES)'; \ -+ unique=`for i in $$list; do \ -+ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ -+ done | \ -+ $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ - test -z "$(ETAGS_ARGS)$$unique$(LISP)$$tags" \ -- || (cd $(srcdir) && etags $(ETAGS_ARGS) $$tags $$unique $(LISP) -o $$here/TAGS) -- --mostlyclean-tags: -+ || etags $(ETAGS_ARGS) $$tags $$unique $(LISP) - --clean-tags: -+GTAGS: -+ here=`CDPATH=: && cd $(top_builddir) && pwd` \ -+ && cd $(top_srcdir) \ -+ && gtags -i $$here - - distclean-tags: - -rm -f TAGS ID - --maintainer-clean-tags: -+@AMDEP@@_am_include@ $(DEPDIR)/atof.Po -+@AMDEP@@_am_include@ $(DEPDIR)/bchange.Po -+@AMDEP@@_am_include@ $(DEPDIR)/bcmp.Po -+@AMDEP@@_am_include@ $(DEPDIR)/bfill.Po -+@AMDEP@@_am_include@ $(DEPDIR)/bmove.Po -+@AMDEP@@_am_include@ $(DEPDIR)/bmove512.Po -+@AMDEP@@_am_include@ $(DEPDIR)/bmove_upp.Po -+@AMDEP@@_am_include@ $(DEPDIR)/conf_to_src.Po -+@AMDEP@@_am_include@ $(DEPDIR)/ctype.Po -+@AMDEP@@_am_include@ $(DEPDIR)/int2str.Po -+@AMDEP@@_am_include@ $(DEPDIR)/is_prefix.Po -+@AMDEP@@_am_include@ $(DEPDIR)/llstr.Po -+@AMDEP@@_am_include@ $(DEPDIR)/longlong2str.Po -+@AMDEP@@_am_include@ $(DEPDIR)/r_strinstr.Po -+@AMDEP@@_am_include@ $(DEPDIR)/str2int.Po -+@AMDEP@@_am_include@ $(DEPDIR)/strappend.Po -+@AMDEP@@_am_include@ $(DEPDIR)/strcend.Po -+@AMDEP@@_am_include@ $(DEPDIR)/strcont.Po -+@AMDEP@@_am_include@ $(DEPDIR)/strend.Po -+@AMDEP@@_am_include@ $(DEPDIR)/strfill.Po -+@AMDEP@@_am_include@ $(DEPDIR)/strinstr.Po -+@AMDEP@@_am_include@ $(DEPDIR)/strmake.Po -+@AMDEP@@_am_include@ $(DEPDIR)/strmov.Po -+@AMDEP@@_am_include@ $(DEPDIR)/strnlen.Po -+@AMDEP@@_am_include@ $(DEPDIR)/strnmov.Po -+@AMDEP@@_am_include@ $(DEPDIR)/strstr.Po -+@AMDEP@@_am_include@ $(DEPDIR)/strtol.Po -+@AMDEP@@_am_include@ $(DEPDIR)/strtoll.Po -+@AMDEP@@_am_include@ $(DEPDIR)/strtoul.Po -+@AMDEP@@_am_include@ $(DEPDIR)/strtoull.Po -+@AMDEP@@_am_include@ $(DEPDIR)/strxmov.Po -+@AMDEP@@_am_include@ $(DEPDIR)/strxnmov.Po -+ -+distclean-depend: -+ -rm -rf $(DEPDIR) -+ -+@AMDEP@CCDEPMODE = @CCDEPMODE@ -+ -+.c.o: -+@AMDEP@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ -+@AMDEP@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@ -+@AMDEP@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -+ $(COMPILE) -c -o $@ `test -f $< || echo '$(srcdir)/'`$< -+ -+.c.lo: -+@AMDEP@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ -+@AMDEP@ depfile='$(DEPDIR)/$*.Plo' tmpdepfile='$(DEPDIR)/$*.TPlo' @AMDEPBACKSLASH@ -+@AMDEP@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -+ $(LTCOMPILE) -c -o $@ `test -f $< || echo '$(srcdir)/'`$< -+ - - distdir = $(top_builddir)/$(PACKAGE)-$(VERSION)/$(subdir) - --subdir = strings - - distdir: $(DISTFILES) - @for file in $(DISTFILES); do \ - d=$(srcdir); \ - if test -d $$d/$$file; then \ -- cp -pr $$d/$$file $(distdir)/$$file; \ -+ cp -pR $$d/$$file $(distdir) \ -+ || exit 1; \ - else \ - test -f $(distdir)/$$file \ -- || ln $$d/$$file $(distdir)/$$file 2> /dev/null \ -- || cp -p $$d/$$file $(distdir)/$$file || :; \ -+ || cp -p $$d/$$file $(distdir)/$$file \ -+ || exit 1; \ - 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 -- - info-am: - info: info-am - dvi-am: -@@ -581,9 +533,8 @@ - uninstall-am: uninstall-pkglibLIBRARIES - uninstall: uninstall-am - all-am: Makefile $(LIBRARIES) $(PROGRAMS) --all-redirect: all-am - install-strip: -- $(MAKE) $(AM_MAKEFLAGS) AM_INSTALL_PROGRAM_FLAGS=-s install -+ $(MAKE) $(AM_MAKEFLAGS) INSTALL_STRIP_FLAG=-s install - installdirs: - $(mkinstalldirs) $(DESTDIR)$(pkglibdir) - -@@ -597,48 +548,46 @@ - -rm -f config.cache config.log stamp-h stamp-h[0-9]* - - maintainer-clean-generic: --mostlyclean-am: mostlyclean-pkglibLIBRARIES mostlyclean-compile \ -- mostlyclean-libtool mostlyclean-noinstPROGRAMS \ -- mostlyclean-tags mostlyclean-generic -- --mostlyclean: mostlyclean-am -- --clean-am: clean-pkglibLIBRARIES clean-compile clean-libtool \ -- clean-noinstPROGRAMS clean-tags clean-generic \ -- mostlyclean-am clean-local -- -+ @echo "This command is intended for maintainers to use" -+ @echo "it deletes files that may require special tools to rebuild." -+ -rm -f Makefile.in - clean: clean-am - --distclean-am: distclean-pkglibLIBRARIES distclean-compile \ -- distclean-libtool distclean-noinstPROGRAMS \ -- distclean-tags distclean-generic clean-am -- -rm -f libtool -+clean-am: clean-generic clean-libtool clean-local clean-noinstPROGRAMS \ -+ clean-pkglibLIBRARIES mostlyclean-am - - distclean: distclean-am - --maintainer-clean-am: maintainer-clean-pkglibLIBRARIES \ -- maintainer-clean-compile maintainer-clean-libtool \ -- maintainer-clean-noinstPROGRAMS maintainer-clean-tags \ -- 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." -+distclean-am: clean-am distclean-compile distclean-depend \ -+ distclean-generic distclean-libtool distclean-noinstPROGRAMS \ -+ distclean-pkglibLIBRARIES distclean-tags - - maintainer-clean: maintainer-clean-am - --.PHONY: mostlyclean-pkglibLIBRARIES distclean-pkglibLIBRARIES \ --clean-pkglibLIBRARIES maintainer-clean-pkglibLIBRARIES \ --uninstall-pkglibLIBRARIES install-pkglibLIBRARIES mostlyclean-compile \ --distclean-compile clean-compile maintainer-clean-compile \ --mostlyclean-libtool distclean-libtool 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 -+maintainer-clean-am: distclean-am maintainer-clean-generic \ -+ maintainer-clean-noinstPROGRAMS \ -+ maintainer-clean-pkglibLIBRARIES -+ -+mostlyclean: mostlyclean-am -+ -+mostlyclean-am: mostlyclean-compile mostlyclean-generic \ -+ mostlyclean-libtool mostlyclean-noinstPROGRAMS \ -+ mostlyclean-pkglibLIBRARIES -+ -+.PHONY: check check-am clean clean-generic clean-libtool \ -+ clean-noinstPROGRAMS clean-pkglibLIBRARIES distclean \ -+ distclean-compile distclean-depend distclean-generic \ -+ distclean-libtool distclean-noinstPROGRAMS \ -+ distclean-pkglibLIBRARIES distclean-tags distdir dvi dvi-am \ -+ info info-am install install-am install-data install-data-am \ -+ install-exec install-exec-am install-pkglibLIBRARIES \ -+ install-strip installcheck installcheck-am installdirs \ -+ maintainer-clean maintainer-clean-generic \ -+ maintainer-clean-noinstPROGRAMS \ -+ maintainer-clean-pkglibLIBRARIES mostlyclean \ -+ mostlyclean-compile mostlyclean-generic mostlyclean-libtool \ -+ mostlyclean-noinstPROGRAMS mostlyclean-pkglibLIBRARIES tags \ -+ uninstall uninstall-am uninstall-pkglibLIBRARIES - - ctype.o: ctype_extra_sources.c - -diff -r -N -U3 mysql-3.23.32.orig/support-files/Makefile.in mysql-3.23.32/support-files/Makefile.in ---- mysql-3.23.32.orig/support-files/Makefile.in Mon Jan 22 14:44:20 2001 -+++ mysql-3.23.32/support-files/Makefile.in Thu Mar 1 17:01:09 2001 -@@ -1,6 +1,7 @@ --# Makefile.in generated automatically by automake 1.4 from Makefile.am -+# Makefile.in generated automatically by automake 1.4d from Makefile.am - --# Copyright (C) 1994, 1995-8, 1999 Free Software Foundation, Inc. -+# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001 -+# Free Software Foundation, Inc. - # This Makefile.in is free software; the Free Software Foundation - # gives unlimited permission to copy and/or distribute it, - # with or without modifications, as long as this notice is preserved. -@@ -10,24 +11,6 @@ - # even the implied warranty of MERCHANTABILITY or FITNESS FOR A - # PARTICULAR PURPOSE. - --# Copyright (C) 2000 MySQL AB & MySQL Finland AB & TCX DataKonsult AB --# --# This library is free software; you can redistribute it and/or --# modify it under the terms of the GNU Library General Public --# License as published by the Free Software Foundation; either --# version 2 of the License, or (at your option) any later version. --# --# This library is distributed in the hope that it will be useful, --# but WITHOUT ANY WARRANTY; without even the implied warranty of --# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU --# Library General Public License for more details. --# --# You should have received a copy of the GNU Library General Public --# License along with this library; if not, write to the Free --# Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, --# MA 02111-1307, USA -- -- - SHELL = @SHELL@ - - srcdir = @srcdir@ -@@ -49,8 +32,6 @@ - includedir = @includedir@ - oldincludedir = /usr/include - --DESTDIR = -- - pkgdatadir = $(datadir)/@PACKAGE@ - pkglibdir = $(libdir)/@PACKAGE@ - pkgincludedir = $(includedir)/@PACKAGE@ -@@ -63,9 +44,11 @@ - AUTOHEADER = @AUTOHEADER@ - - INSTALL = @INSTALL@ --INSTALL_PROGRAM = @INSTALL_PROGRAM@ $(AM_INSTALL_PROGRAM_FLAGS) -+INSTALL_PROGRAM = @INSTALL_PROGRAM@ - INSTALL_DATA = @INSTALL_DATA@ - INSTALL_SCRIPT = @INSTALL_SCRIPT@ -+INSTALL_STRIP_FLAG = -+INSTALL_HEADER = $(INSTALL_DATA) - transform = @program_transform_name@ - - NORMAL_INSTALL = : -@@ -74,6 +57,8 @@ - NORMAL_UNINSTALL = : - PRE_UNINSTALL = : - POST_UNINSTALL = : -+ -+@SET_MAKE@ - build_alias = @build_alias@ - build_triplet = @build@ - host_alias = @host_alias@ -@@ -81,6 +66,8 @@ - target_alias = @target_alias@ - target_triplet = @target@ - ALLOCA = @ALLOCA@ -+AMDEP = @AMDEP@ -+AMTAR = @AMTAR@ - AS = @AS@ - AVAILABLE_LANGUAGES = @AVAILABLE_LANGUAGES@ - AVAILABLE_LANGUAGES_ERRORS = @AVAILABLE_LANGUAGES_ERRORS@ -@@ -102,6 +89,7 @@ - CXX = @CXX@ - CXXFLAGS = @CXXFLAGS@ - CXXLDFLAGS = @CXXLDFLAGS@ -+DEPDIR = @DEPDIR@ - DLLTOOL = @DLLTOOL@ - DOT_FRM_VERSION = @DOT_FRM_VERSION@ - FIND_PROC = @FIND_PROC@ -@@ -155,11 +143,13 @@ - VERSION = @VERSION@ - WRAPLIBS = @WRAPLIBS@ - YACC = @YACC@ -+_am_include = @_am_include@ - bdb_includes = @bdb_includes@ - bdb_libs = @bdb_libs@ - bench_dirs = @bench_dirs@ - default_charset = @default_charset@ - docs_dirs = @docs_dirs@ -+install_sh = @install_sh@ - linked_client_targets = @linked_client_targets@ - readline_dir = @readline_dir@ - readline_link = @readline_link@ -@@ -169,56 +159,97 @@ - thread_dirs = @thread_dirs@ - uname_prog = @uname_prog@ - --EXTRA_DIST = mysql.spec.sh my-small.cnf.sh my-medium.cnf.sh my-large.cnf.sh my-huge.cnf.sh mysql-log-rotate.sh mysql.server.sh binary-configure.sh magic -- -- --pkgdata_DATA = my-small.cnf my-medium.cnf my-large.cnf my-huge.cnf mysql-log-rotate mysql-@VERSION@.spec mysql.server binary-configure -+# Copyright (C) 2000 MySQL AB & MySQL Finland AB & TCX DataKonsult AB -+# -+# This library is free software; you can redistribute it and/or -+# modify it under the terms of the GNU Library General Public -+# License as published by the Free Software Foundation; either -+# version 2 of the License, or (at your option) any later version. -+# -+# This library is distributed in the hope that it will be useful, -+# but WITHOUT ANY WARRANTY; without even the implied warranty of -+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -+# Library General Public License for more details. -+# -+# You should have received a copy of the GNU Library General Public -+# License along with this library; if not, write to the Free -+# Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, -+# MA 02111-1307, USA - - --CLEANFILES = my-small.cnf my-medium.cnf my-large.cnf my-huge.cnf mysql.spec mysql-@VERSION@.spec mysql-log-rotate mysql.server binary-configure -+EXTRA_DIST = mysql.spec.sh \ -+ my-small.cnf.sh \ -+ my-medium.cnf.sh \ -+ my-large.cnf.sh \ -+ my-huge.cnf.sh \ -+ mysql-log-rotate.sh \ -+ mysql.server.sh \ -+ binary-configure.sh \ -+ magic -+ -+ -+pkgdata_DATA = my-small.cnf \ -+ my-medium.cnf \ -+ my-large.cnf \ -+ my-huge.cnf \ -+ mysql-log-rotate \ -+ mysql-@VERSION@.spec \ -+ mysql.server \ -+ binary-configure -+ -+ -+CLEANFILES = my-small.cnf \ -+ my-medium.cnf \ -+ my-large.cnf \ -+ my-huge.cnf \ -+ mysql.spec \ -+ mysql-@VERSION@.spec \ -+ mysql-log-rotate \ -+ mysql.server \ -+ binary-configure - - - SUFFIXES = .sh -+subdir = support-files - mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs - CONFIG_HEADER = ../config.h - CONFIG_CLEAN_FILES = -+DIST_SOURCES = - DATA = $(pkgdata_DATA) - - DIST_COMMON = Makefile.am Makefile.in - - --DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST) -+DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) - --TAR = gtar - GZIP_ENV = --best --all: all-redirect -+all: all-am - .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 - cd $(top_builddir) \ -- && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status -+ && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= CONFIG_LINKS= $(SHELL) ./config.status - - - install-pkgdataDATA: $(pkgdata_DATA) - @$(NORMAL_INSTALL) - $(mkinstalldirs) $(DESTDIR)$(pkgdatadir) - @list='$(pkgdata_DATA)'; for p in $$list; do \ -- if test -f $(srcdir)/$$p; then \ -- echo " $(INSTALL_DATA) $(srcdir)/$$p $(DESTDIR)$(pkgdatadir)/$$p"; \ -- $(INSTALL_DATA) $(srcdir)/$$p $(DESTDIR)$(pkgdatadir)/$$p; \ -- else if test -f $$p; then \ -- echo " $(INSTALL_DATA) $$p $(DESTDIR)$(pkgdatadir)/$$p"; \ -- $(INSTALL_DATA) $$p $(DESTDIR)$(pkgdatadir)/$$p; \ -- fi; fi; \ -+ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ -+ f="`echo $$p | sed -e 's|^.*/||'`"; \ -+ echo " $(INSTALL_DATA) $$d$$p $(DESTDIR)$(pkgdatadir)/$$f"; \ -+ $(INSTALL_DATA) $$d$$p $(DESTDIR)$(pkgdatadir)/$$f; \ - done - - uninstall-pkgdataDATA: - @$(NORMAL_UNINSTALL) -- list='$(pkgdata_DATA)'; for p in $$list; do \ -- rm -f $(DESTDIR)$(pkgdatadir)/$$p; \ -+ @list='$(pkgdata_DATA)'; for p in $$list; do \ -+ f="`echo $$p | sed -e 's|^.*/||'`"; \ -+ echo " rm -f $(DESTDIR)$(pkgdatadir)/$$f"; \ -+ rm -f $(DESTDIR)$(pkgdatadir)/$$f; \ - done - tags: TAGS - TAGS: -@@ -226,17 +257,17 @@ - - distdir = $(top_builddir)/$(PACKAGE)-$(VERSION)/$(subdir) - --subdir = support-files - - distdir: $(DISTFILES) - @for file in $(DISTFILES); do \ - d=$(srcdir); \ - if test -d $$d/$$file; then \ -- cp -pr $$d/$$file $(distdir)/$$file; \ -+ cp -pR $$d/$$file $(distdir) \ -+ || exit 1; \ - else \ - test -f $(distdir)/$$file \ -- || ln $$d/$$file $(distdir)/$$file 2> /dev/null \ -- || cp -p $$d/$$file $(distdir)/$$file || :; \ -+ || cp -p $$d/$$file $(distdir)/$$file \ -+ || exit 1; \ - fi; \ - done - info-am: -@@ -259,9 +290,8 @@ - uninstall-am: uninstall-pkgdataDATA - uninstall: uninstall-am - all-am: Makefile $(DATA) --all-redirect: all-am - install-strip: -- $(MAKE) $(AM_MAKEFLAGS) AM_INSTALL_PROGRAM_FLAGS=-s install -+ $(MAKE) $(AM_MAKEFLAGS) INSTALL_STRIP_FLAG=-s install - installdirs: - $(mkinstalldirs) $(DESTDIR)$(pkgdatadir) - -@@ -276,31 +306,32 @@ - -rm -f config.cache config.log stamp-h stamp-h[0-9]* - - maintainer-clean-generic: --mostlyclean-am: mostlyclean-generic -- --mostlyclean: mostlyclean-am -- --clean-am: clean-generic mostlyclean-am -- -+ @echo "This command is intended for maintainers to use" -+ @echo "it deletes files that may require special tools to rebuild." -+ -rm -f Makefile.in - clean: clean-am - --distclean-am: distclean-generic clean-am -- -rm -f libtool -+clean-am: clean-generic mostlyclean-am - - distclean: distclean-am - --maintainer-clean-am: 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." -+distclean-am: clean-am distclean-generic - - maintainer-clean: maintainer-clean-am - --.PHONY: uninstall-pkgdataDATA install-pkgdataDATA 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 -+maintainer-clean-am: distclean-am maintainer-clean-generic -+ -+mostlyclean: mostlyclean-am -+ -+mostlyclean-am: mostlyclean-generic -+ -+.PHONY: check check-am clean clean-generic distclean distclean-generic \ -+ distdir dvi dvi-am info info-am install install-am install-data \ -+ install-data-am install-exec install-exec-am \ -+ install-pkgdataDATA install-strip installcheck installcheck-am \ -+ installdirs maintainer-clean maintainer-clean-generic \ -+ mostlyclean mostlyclean-generic uninstall uninstall-am \ -+ uninstall-pkgdataDATA - - - mysql-@VERSION@.spec: mysql.spec -diff -r -N -U3 mysql-3.23.32.orig/tests/Makefile.in mysql-3.23.32/tests/Makefile.in ---- mysql-3.23.32.orig/tests/Makefile.in Mon Jan 22 14:44:17 2001 -+++ mysql-3.23.32/tests/Makefile.in Thu Mar 1 17:01:07 2001 -@@ -1,6 +1,7 @@ --# Makefile.in generated automatically by automake 1.4 from Makefile.am -+# Makefile.in generated automatically by automake 1.4d from Makefile.am - --# Copyright (C) 1994, 1995-8, 1999 Free Software Foundation, Inc. -+# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001 -+# Free Software Foundation, Inc. - # This Makefile.in is free software; the Free Software Foundation - # gives unlimited permission to copy and/or distribute it, - # with or without modifications, as long as this notice is preserved. -@@ -10,24 +11,6 @@ - # even the implied warranty of MERCHANTABILITY or FITNESS FOR A - # PARTICULAR PURPOSE. - --# Copyright (C) 2000 MySQL AB & MySQL Finland AB & TCX DataKonsult AB --# --# This library is free software; you can redistribute it and/or --# modify it under the terms of the GNU Library General Public --# License as published by the Free Software Foundation; either --# version 2 of the License, or (at your option) any later version. --# --# This library is distributed in the hope that it will be useful, --# but WITHOUT ANY WARRANTY; without even the implied warranty of --# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU --# Library General Public License for more details. --# --# You should have received a copy of the GNU Library General Public --# License along with this library; if not, write to the Free --# Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, --# MA 02111-1307, USA -- -- - SHELL = @SHELL@ - - srcdir = @srcdir@ -@@ -49,8 +32,6 @@ - includedir = @includedir@ - oldincludedir = /usr/include - --DESTDIR = -- - pkgdatadir = $(datadir)/@PACKAGE@ - pkglibdir = $(libdir)/@PACKAGE@ - pkgincludedir = $(includedir)/@PACKAGE@ -@@ -63,9 +44,11 @@ - AUTOHEADER = @AUTOHEADER@ - - INSTALL = @INSTALL@ --INSTALL_PROGRAM = @INSTALL_PROGRAM@ $(AM_INSTALL_PROGRAM_FLAGS) -+INSTALL_PROGRAM = @INSTALL_PROGRAM@ - INSTALL_DATA = @INSTALL_DATA@ - INSTALL_SCRIPT = @INSTALL_SCRIPT@ -+INSTALL_STRIP_FLAG = -+INSTALL_HEADER = $(INSTALL_DATA) - transform = @program_transform_name@ - - NORMAL_INSTALL = : -@@ -74,6 +57,8 @@ - NORMAL_UNINSTALL = : - PRE_UNINSTALL = : - POST_UNINSTALL = : -+ -+@SET_MAKE@ - build_alias = @build_alias@ - build_triplet = @build@ - host_alias = @host_alias@ -@@ -81,6 +66,8 @@ - target_alias = @target_alias@ - target_triplet = @target@ - ALLOCA = @ALLOCA@ -+AMDEP = @AMDEP@ -+AMTAR = @AMTAR@ - AS = @AS@ - AVAILABLE_LANGUAGES = @AVAILABLE_LANGUAGES@ - AVAILABLE_LANGUAGES_ERRORS = @AVAILABLE_LANGUAGES_ERRORS@ -@@ -102,6 +89,7 @@ - CXX = @CXX@ - CXXFLAGS = @CXXFLAGS@ - CXXLDFLAGS = @CXXLDFLAGS@ -+DEPDIR = @DEPDIR@ - DLLTOOL = @DLLTOOL@ - DOT_FRM_VERSION = @DOT_FRM_VERSION@ - FIND_PROC = @FIND_PROC@ -@@ -155,11 +143,13 @@ - VERSION = @VERSION@ - WRAPLIBS = @WRAPLIBS@ - YACC = @YACC@ -+_am_include = @_am_include@ - bdb_includes = @bdb_includes@ - bdb_libs = @bdb_libs@ - bench_dirs = @bench_dirs@ - default_charset = @default_charset@ - docs_dirs = @docs_dirs@ -+install_sh = @install_sh@ - linked_client_targets = @linked_client_targets@ - readline_dir = @readline_dir@ - readline_link = @readline_link@ -@@ -169,26 +159,52 @@ - thread_dirs = @thread_dirs@ - uname_prog = @uname_prog@ - --EXTRA_DIST = auto_increment.res auto_increment.tst function.res function.tst lock_test.pl lock_test.res export.pl big_record.pl fork_test.pl fork2_test.pl fork3_test.pl insert_and_repair.pl grant.pl grant.res test_delayed_insert.pl pmail.pl mail_to_db.pl table_types.pl udf_test udf_test.res -+# Copyright (C) 2000 MySQL AB & MySQL Finland AB & TCX DataKonsult AB -+# -+# This library is free software; you can redistribute it and/or -+# modify it under the terms of the GNU Library General Public -+# License as published by the Free Software Foundation; either -+# version 2 of the License, or (at your option) any later version. -+# -+# This library is distributed in the hope that it will be useful, -+# but WITHOUT ANY WARRANTY; without even the implied warranty of -+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -+# Library General Public License for more details. -+# -+# You should have received a copy of the GNU Library General Public -+# License along with this library; if not, write to the Free -+# Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, -+# MA 02111-1307, USA -+ -+ -+EXTRA_DIST = auto_increment.res auto_increment.tst \ -+ function.res function.tst lock_test.pl lock_test.res \ -+ export.pl big_record.pl \ -+ fork_test.pl fork2_test.pl fork3_test.pl \ -+ insert_and_repair.pl \ -+ grant.pl grant.res test_delayed_insert.pl \ -+ pmail.pl mail_to_db.pl table_types.pl \ -+ udf_test udf_test.res - -+subdir = tests - mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs - CONFIG_HEADER = ../config.h - CONFIG_CLEAN_FILES = -+DIST_SOURCES = - DIST_COMMON = Makefile.am Makefile.in - - --DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST) -+DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) - --TAR = gtar - GZIP_ENV = --best --all: all-redirect -+all: all-am - .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 - cd $(top_builddir) \ -- && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status -+ && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= CONFIG_LINKS= $(SHELL) ./config.status - - tags: TAGS - TAGS: -@@ -196,17 +212,17 @@ - - distdir = $(top_builddir)/$(PACKAGE)-$(VERSION)/$(subdir) - --subdir = tests - - distdir: $(DISTFILES) - @for file in $(DISTFILES); do \ - d=$(srcdir); \ - if test -d $$d/$$file; then \ -- cp -pr $$d/$$file $(distdir)/$$file; \ -+ cp -pR $$d/$$file $(distdir) \ -+ || exit 1; \ - else \ - test -f $(distdir)/$$file \ -- || ln $$d/$$file $(distdir)/$$file 2> /dev/null \ -- || cp -p $$d/$$file $(distdir)/$$file || :; \ -+ || cp -p $$d/$$file $(distdir)/$$file \ -+ || exit 1; \ - fi; \ - done - info-am: -@@ -229,9 +245,8 @@ - uninstall-am: - uninstall: uninstall-am - all-am: Makefile --all-redirect: all-am - install-strip: -- $(MAKE) $(AM_MAKEFLAGS) AM_INSTALL_PROGRAM_FLAGS=-s install -+ $(MAKE) $(AM_MAKEFLAGS) INSTALL_STRIP_FLAG=-s install - installdirs: - - -@@ -244,31 +259,31 @@ - -rm -f config.cache config.log stamp-h stamp-h[0-9]* - - maintainer-clean-generic: --mostlyclean-am: mostlyclean-generic -- --mostlyclean: mostlyclean-am -- --clean-am: clean-generic mostlyclean-am -- -+ @echo "This command is intended for maintainers to use" -+ @echo "it deletes files that may require special tools to rebuild." -+ -rm -f Makefile.in - clean: clean-am - --distclean-am: distclean-generic clean-am -- -rm -f libtool -+clean-am: clean-generic mostlyclean-am - - distclean: distclean-am - --maintainer-clean-am: 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." -+distclean-am: clean-am distclean-generic - - maintainer-clean: maintainer-clean-am - --.PHONY: 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 -+maintainer-clean-am: distclean-am maintainer-clean-generic -+ -+mostlyclean: mostlyclean-am -+ -+mostlyclean-am: mostlyclean-generic -+ -+.PHONY: check check-am clean clean-generic distclean distclean-generic \ -+ distdir dvi dvi-am info info-am install install-am install-data \ -+ install-data-am install-exec install-exec-am install-strip \ -+ installcheck installcheck-am installdirs maintainer-clean \ -+ maintainer-clean-generic mostlyclean mostlyclean-generic \ -+ uninstall uninstall-am - - - # Don't update the files from bitkeeper diff --git a/dev-db/mysql/files/mysql-3.23.32-nisam.h-gentoo.diff b/dev-db/mysql/files/mysql-3.23.32-nisam.h-gentoo.diff deleted file mode 100644 index 488f54206610..000000000000 --- a/dev-db/mysql/files/mysql-3.23.32-nisam.h-gentoo.diff +++ /dev/null @@ -1,12 +0,0 @@ -diff -r -N -U3 mysql-3.23.32.orig/include/nisam.h mysql-3.23.32/include/nisam.h ---- mysql-3.23.32.orig/include/nisam.h Mon Jan 22 14:37:03 2001 -+++ mysql-3.23.32/include/nisam.h Thu Mar 1 17:26:14 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/files/mysql-3.23.32-r1-gentoo.diff b/dev-db/mysql/files/mysql-3.23.32-r1-gentoo.diff deleted file mode 100644 index c029a6c435de..000000000000 --- a/dev-db/mysql/files/mysql-3.23.32-r1-gentoo.diff +++ /dev/null @@ -1,27 +0,0 @@ -diff -ru mysql-3.23.32.orig/acinclude.m4 mysql-3.23.32/acinclude.m4 ---- mysql-3.23.32.orig/acinclude.m4 Mon Jan 22 08:37:02 2001 -+++ mysql-3.23.32/acinclude.m4 Thu Feb 15 22:31:56 2001 -@@ -744,12 +744,12 @@ - if test X"$bdb_version_ok" = Xyes; then - save_LDFLAGS="$LDFLAGS" - LDFLAGS="-L$lib $LDFLAGS" -- AC_CHECK_LIB(db,db_env_create, [ -+ AC_CHECK_LIB(db-3.2,db_env_create, [ - bdb_dir_ok=installed - MYSQL_TOP_BUILDDIR([inc]) - MYSQL_TOP_BUILDDIR([lib]) - bdb_includes="-I$inc" -- bdb_libs="-L$lib -ldb" -+ bdb_libs="-L$lib -ldb-3.2" - ]) - LDFLAGS="$save_LDFLAGS" - else -@@ -777,7 +777,7 @@ - bdb="$dir" - MYSQL_TOP_BUILDDIR([dir]) - bdb_includes="-I$dir/build_unix" -- bdb_libs="-L$dir/build_unix -ldb" -+ bdb_libs="-L$dir/build_unix -ldb-3.2" - else - bdb_dir_ok="$bdb_version_ok" - fi diff --git a/dev-db/mysql/mysql-3.23.28.ebuild b/dev-db/mysql/mysql-3.23.28.ebuild deleted file mode 100644 index 360c5eed5b92..000000000000 --- a/dev-db/mysql/mysql-3.23.28.ebuild +++ /dev/null @@ -1,104 +0,0 @@ -# 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.28.ebuild,v 1.1 2000/11/26 12:38:24 achim Exp $ - -P=${PN}-${PV}-gamma -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=">=sys-apps/bash-2.04 - >=sys-apps/tcp-wrappers-7.6 - >=sys-libs/glibc-2.1.3 - >=sys-libs/gpm-1.19.3 - >=sys-libs/ncurses-5.1" - -src_compile() { - if [ "$PLATFORM" = "i686-pc-linux-gnu" ] - then - export CFLAGS="-mpentium" - export CXXFLAGS="-mpentium" - fi - # Patch for qmail-mysql - cd ${S}/include - cp nisam.h nisam.h.orig - sed -e "s/define N_MAX_KEY_LENGTH 256/define N_MAX_KEY_LENGTH 500/" nisam.h.orig > nisam.h - - cd ${S} - CXX=gcc ./configure --prefix=/usr --host=${CHOST} \ - --enable-shared \ - --enable-static \ - --enable-assembler \ - --enable-thread-safe-client \ - --with-raid \ - --with-low-memory \ - --with-libwrap \ - --with-berkley-db \ - --libdir=/usr/lib \ - --libexecdir=/usr/sbin \ - --sysconfdir=/etc/mysql \ - --localstatedir=/var/mysql \ - --infodir=/usr/info \ - --mandir=/usr/man \ - --without-debug \ - --with-mysql-user=mysql - try make benchdir=/usr/share/mysql-bench -} - -src_install() { - - cd ${S} - - # 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/info \ - mandir=${D}/usr/man \ - 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 ${O}/files/my.cnf ${D}/etc/mysql - - dodir /etc/rc.d/init.d - cp ${O}/files/mysql ${D}/etc/rc.d/init.d/mysql - - # MySQL Docs - - cd ${S} - into /usr - dodoc INSTALL-SOURCE README MIRRORS - cd ${S}/Docs - dodoc INSTALL-BINARY manual.ps manual.txt - docinto html - dodoc manual.html manual_toc.html - -} - -pkg_config () { - - echo "Setting up symlinks..." - ${ROOT}/usr/sbin/rc-update add mysql - -} - - - - - - - diff --git a/dev-db/mysql/mysql-3.23.31.ebuild b/dev-db/mysql/mysql-3.23.31.ebuild deleted file mode 100644 index 6116be86f963..000000000000 --- a/dev-db/mysql/mysql-3.23.31.ebuild +++ /dev/null @@ -1,112 +0,0 @@ -# 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.31.ebuild,v 1.1 2001/01/18 19:47:11 achim Exp $ - -P=${PN}-${PV} -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=">=sys-apps/bash-2.04 - >=sys-apps/tcp-wrappers-7.6 - =sys-libs/db-3.2.3h - >=sys-libs/glibc-2.1.3 - >=sys-libs/gpm-1.19.3 - >=sys-libs/ncurses-5.1" - -src_unpack() { - unpack ${A} - cd ${S} - cp configure configure.orig - sed -e "s:DB_VERSION_STRING\.\*g:DB_VERSION_STRING.*h:" \ - -e "s:-ldb:-ldb-3.2:" configure.orig > configure -} - -src_compile() { - export CFLAGS="${CFLAGS/-O?/}" - export CXXFLAGS="${CXXFLAGS/-O?/}" - # Patch for qmail-mysql - cd ${S}/include - cp nisam.h nisam.h.orig - sed -e "s/define N_MAX_KEY_LENGTH 256/define N_MAX_KEY_LENGTH 500/" nisam.h.orig > nisam.h - - cd ${S} - CXX=gcc ./configure --prefix=/usr --host=${CHOST} \ - --enable-shared \ - --enable-static \ - --enable-assembler \ - --enable-thread-safe-client \ - --with-raid \ - --with-low-memory \ - --with-libwrap \ - --without-readline \ - --libdir=/usr/lib \ - --libexecdir=/usr/sbin \ - --sysconfdir=/etc/mysql \ - --localstatedir=/var/mysql \ - --infodir=/usr/info \ - --mandir=/usr/man \ - --without-debug \ - --with-mysql-user=mysql \ - --with-berkeley-db-includes=/usr/include/db3 \ - --with-berkeley-db-libs=/usr/lib - try make benchdir=/usr/share/mysql-bench -} - -src_install() { - - cd ${S} - - # 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/info \ - mandir=${D}/usr/man \ - 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 ${O}/files/my.cnf ${D}/etc/mysql - - dodir /etc/rc.d/init.d - cp ${O}/files/mysql ${D}/etc/rc.d/init.d/mysql - - # MySQL Docs - - cd ${S} - into /usr - dodoc INSTALL-SOURCE README MIRRORS - cd ${S}/Docs - dodoc INSTALL-BINARY manual.ps manual.txt - docinto html - dodoc manual.html manual_toc.html - -} - -pkg_config () { - - echo "Setting up symlinks..." - ${ROOT}/usr/sbin/rc-update add mysql - -} - - - - - - - diff --git a/dev-db/mysql/mysql-3.23.32-r1.ebuild b/dev-db/mysql/mysql-3.23.32-r1.ebuild deleted file mode 100644 index 97df601aed01..000000000000 --- a/dev-db/mysql/mysql-3.23.32-r1.ebuild +++ /dev/null @@ -1,121 +0,0 @@ -# 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.32-r1.ebuild,v 1.1 2001/02/16 14:01:14 pete Exp $ - -#P= -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=">=sys-apps/bash-2.04 - >=sys-apps/tcp-wrappers-7.6 - >=sys-libs/db-3.2.3h - >=sys-libs/glibc-2.1.3 - >=sys-libs/gpm-1.19.3 - >=sys-libs/ncurses-5.1 - >=sys-devel/autoconf-2.13 - >=sys-devel/automake-1.4" - -RDEPEND=">=sys-apps/bash-2.04 - >=sys-apps/tcp-wrappers-7.6 - >=sys-libs/db-3.2.3h - >=sys-libs/glibc-2.1.3 - >=sys-libs/gpm-1.19.3 - >=sys-libs/ncurses-5.1" - -src_unpack() { - unpack ${A} - cd ${S} - echo ">>> Applying ${PF}-gentoo.diff..." - patch -p1 < ${FILESDIR}/${PF}-gentoo.diff - echo ">>> Running aclocal..." - aclocal - echo ">>> Running autoconf (ignore any warnings concerning AC_TRY_RUN)..." - autoconf - echo ">>> Running automake..." - automake - # Patch for qmail-mysql - cd ${S}/include - mv nisam.h nisam.h.orig - sed -e "s/define N_MAX_KEY_LENGTH 256/define N_MAX_KEY_LENGTH 500/" nisam.h.orig > nisam.h -} - -src_compile() { - - export CFLAGS="${CFLAGS/-O?/}" - export CXXFLAGS="${CXXFLAGS/-O?/}" - - try CXX=gcc ./configure --prefix=/usr --host=${CHOST} \ - --enable-shared \ - --enable-static \ - --enable-assembler \ - --enable-thread-safe-client \ - --with-raid \ - --with-low-memory \ - --with-libwrap \ - --without-readline \ - --libdir=/usr/lib \ - --libexecdir=/usr/sbin \ - --sysconfdir=/etc/mysql \ - --localstatedir=/var/mysql \ - --infodir=/usr/share/info \ - --mandir=/usr/share/man \ - --without-debug \ - --with-mysql-user=mysql \ - --with-berkeley-db-includes=/usr/include/db3 \ - --with-berkeley-db-libs=/usr/lib - 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 - -} diff --git a/dev-db/mysql/mysql-3.23.32-r2.ebuild b/dev-db/mysql/mysql-3.23.32-r2.ebuild deleted file mode 100644 index b83eec0472c2..000000000000 --- a/dev-db/mysql/mysql-3.23.32-r2.ebuild +++ /dev/null @@ -1,114 +0,0 @@ -# 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.32-r2.ebuild,v 1.1 2001/03/06 05:27:27 achim Exp $ - -#P= -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=">=sys-apps/bash-2.04 - >=sys-apps/tcp-wrappers-7.6 - >=sys-libs/db-3.2.3h - >=sys-libs/glibc-2.1.3 - >=sys-libs/gpm-1.19.3 - >=sys-libs/ncurses-5.1 - >=sys-devel/autoconf-2.13 - >=sys-devel/automake-1.4" - -RDEPEND=">=sys-apps/bash-2.04 - >=sys-apps/tcp-wrappers-7.6 - >=sys-libs/db-3.2.3h - >=sys-libs/glibc-2.1.3 - >=sys-libs/gpm-1.19.3 - >=sys-libs/ncurses-5.1" - -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 -p1 < ${FILESDIR}/${P}-nisam.h-gentoo.diff -} - -src_compile() { - - export CFLAGS="${CFLAGS/-O?/}" - export CXXFLAGS="${CXXFLAGS/-O?/}" - - try CXX=gcc ./configure --prefix=/usr --host=${CHOST} \ - --enable-shared \ - --enable-static \ - --enable-assembler \ - --enable-thread-safe-client \ - --with-raid \ - --with-low-memory \ - --with-libwrap \ - --without-readline \ - --libdir=/usr/lib \ - --libexecdir=/usr/sbin \ - --sysconfdir=/etc/mysql \ - --localstatedir=/var/mysql \ - --infodir=/usr/share/info \ - --mandir=/usr/share/man \ - --without-debug \ - --with-mysql-user=mysql \ - --with-berkeley-db-includes=/usr/include/db3 \ - --with-berkeley-db-libs=/usr/lib - 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 - -} diff --git a/dev-db/mysql/mysql-3.23.32.ebuild b/dev-db/mysql/mysql-3.23.32.ebuild deleted file mode 100644 index dcfe2b370e17..000000000000 --- a/dev-db/mysql/mysql-3.23.32.ebuild +++ /dev/null @@ -1,115 +0,0 @@ -# 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.32.ebuild,v 1.1 2001/02/08 21:03:10 achim Exp $ - -P=${PN}-${PV} -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=">=sys-apps/bash-2.04 - >=sys-apps/tcp-wrappers-7.6 - =sys-libs/db-3.2.3h - >=sys-libs/glibc-2.1.3 - >=sys-libs/gpm-1.19.3 - >=sys-libs/ncurses-5.1" - -src_unpack() { - - unpack ${A} - cd ${S} - cp configure configure.orig - sed -e "s:DB_VERSION_STRING\.\*g:DB_VERSION_STRING.*h:" \ - -e "s:-ldb:-ldb-3.2:" configure.orig > configure - # Patch for qmail-mysql - cd ${S}/include - cp nisam.h nisam.h.orig - sed -e "s/define N_MAX_KEY_LENGTH 256/define N_MAX_KEY_LENGTH 500/" nisam.h.orig > nisam.h -} - -src_compile() { - - export CFLAGS="${CFLAGS/-O?/}" - export CXXFLAGS="${CXXFLAGS/-O?/}" - - CXX=gcc ./configure --prefix=/usr --host=${CHOST} \ - --enable-shared \ - --enable-static \ - --enable-assembler \ - --enable-thread-safe-client \ - --with-raid \ - --with-low-memory \ - --with-libwrap \ - --without-readline \ - --libdir=/usr/lib \ - --libexecdir=/usr/sbin \ - --sysconfdir=/etc/mysql \ - --localstatedir=/var/mysql \ - --infodir=/usr/share/info \ - --mandir=/usr/share/man \ - --without-debug \ - --with-mysql-user=mysql \ - --with-berkeley-db-includes=/usr/include/db3 \ - --with-berkeley-db-libs=/usr/lib - 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 - -} - - - - - - - diff --git a/dev-db/postgresql/files/digest-postgresql-7.0.3 b/dev-db/postgresql/files/digest-postgresql-7.0.3 deleted file mode 100644 index 2fa7e81e47a2..000000000000 --- a/dev-db/postgresql/files/digest-postgresql-7.0.3 +++ /dev/null @@ -1 +0,0 @@ -MD5 b416c04e6c91967160dfde866293ee6f postgresql-7.0.3.tar.gz diff --git a/dev-db/postgresql/files/digest-postgresql-7.0.3-r1 b/dev-db/postgresql/files/digest-postgresql-7.0.3-r1 deleted file mode 100644 index 2fa7e81e47a2..000000000000 --- a/dev-db/postgresql/files/digest-postgresql-7.0.3-r1 +++ /dev/null @@ -1 +0,0 @@ -MD5 b416c04e6c91967160dfde866293ee6f postgresql-7.0.3.tar.gz diff --git a/dev-db/postgresql/files/digest-postgresql-7.0.3-r3 b/dev-db/postgresql/files/digest-postgresql-7.0.3-r3 deleted file mode 100644 index 2fa7e81e47a2..000000000000 --- a/dev-db/postgresql/files/digest-postgresql-7.0.3-r3 +++ /dev/null @@ -1 +0,0 @@ -MD5 b416c04e6c91967160dfde866293ee6f postgresql-7.0.3.tar.gz diff --git a/dev-db/postgresql/files/digest-postgresql-7.1_beta3 b/dev-db/postgresql/files/digest-postgresql-7.1_beta3 deleted file mode 100644 index b9ec4395fc3d..000000000000 --- a/dev-db/postgresql/files/digest-postgresql-7.1_beta3 +++ /dev/null @@ -1 +0,0 @@ -MD5 ad2b3b181753e902c4857fada6c01158 postgresql-7.1beta3.tar.gz diff --git a/dev-db/postgresql/postgresql-7.0.3-r1.ebuild b/dev-db/postgresql/postgresql-7.0.3-r1.ebuild deleted file mode 100644 index 3307f58d3e73..000000000000 --- a/dev-db/postgresql/postgresql-7.0.3-r1.ebuild +++ /dev/null @@ -1,50 +0,0 @@ -# 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/postgresql/postgresql-7.0.3-r1.ebuild,v 1.5 2001/01/27 14:41:33 achim Exp $ - -#P= -A=${P}.tar.gz -S=${WORKDIR}/${P}/src -DESCRIPTION="PostgreSQL is a sophisticated Object-Relational DBMS" -SRC_URI="ftp://ftp.postgresql.org/pub/v7.0.3/${A}" -HOMEPAGE="http://postgresql.readysetnet.com/" - -DEPEND=">=dev-lang/tcl-tk-8" - -src_unpack() { - unpack ${A} - cd ${S}/backend/catalog - cp genbki.sh.in genbki.sh.orig - sed -e 's:\\name:name:' genbki.sh.orig > genbki.sh.in -} - -src_compile() { - - cd ${S} - try ./configure --prefix=/usr --host=${CHOST} \ - --enable-locale --with-tcl --enable-syslog - cp Makefile.global Makefile.orig - sed -e "s:^TEMPLATEDIR=.*:TEMPLATEDIR=\$(POSTGRESDIR)/lib/postgres:" \ - -e "s:^HEADERDIR=.*:HEADERDIR=\$(POSTGRESDIR)/include/postgres:" \ - -e "s:-O2:${CFLAGS}:" \ - Makefile.orig > Makefile.global - try make - -} - -src_install () { - - cd ${S} - dodir /usr/include/postgres - try make POSTGRESDIR=${D}/usr install - dosed "s:/usr/pgaccess:/usr/lib/pgaccess:" /usr/bin/pgaccess - cd ${D}/usr - mv pgaccess lib - cd lib/postgres - cd ${S}/../doc - dodoc FAQ* KNOWN_BUGS MISSING_FEATURES README* - dodoc TODO* internals.ps bug.template - dodoc *.tar.gz -} - diff --git a/dev-db/postgresql/postgresql-7.0.3.ebuild b/dev-db/postgresql/postgresql-7.0.3.ebuild deleted file mode 100644 index 03649f23a146..000000000000 --- a/dev-db/postgresql/postgresql-7.0.3.ebuild +++ /dev/null @@ -1,35 +0,0 @@ -# Copyright 1999-2000 Gentoo Technologies, Inc. -# Distributed under the terms of the GNU General Public License, v2 or later -# Author Your Name <your email> -# $Header: /var/cvsroot/gentoo-x86/dev-db/postgresql/postgresql-7.0.3.ebuild,v 1.2 2000/11/27 15:12:34 achim Exp $ - -#P= -A=${P}.tar.gz -S=${WORKDIR}/${P}/src -DESCRIPTION="PostgreSQL is a sophisticated Object-Relational DBMS" -SRC_URI="ftp://ftp.postgresql.org/pub/v7.0.3/${A}" -HOMEPAGE="http://postgresql.readysetnet.com/" - - -src_compile() { - - cd ${S} - try ./configure --prefix=/usr --host=${CHOST} \ - --enable-locale --with-tcl --enable-syslog - cp Makefile.global Makefile.orig - sed -e "s:^TEMPLATEDIR=.*:TEMPLATEDIR=\$(POSTGRESDIR)/lib/postgres:" \ - -e "s:^HEADERDIR=.*:HEADERDIR=\$(POSTGRESDIR)/include/postgres:" \ - -e "s:-O2:${CFLAGS}:" \ - Makefile.orig > Makefile.global - try make - -} - -src_install () { - - cd ${S} - dodir /usr/include/postgres - try make POSTGRESDIR=${D}/usr install - -} - diff --git a/dev-db/postgresql/postgresql-7.1_beta3.ebuild b/dev-db/postgresql/postgresql-7.1_beta3.ebuild deleted file mode 100644 index 7cadc9af31ab..000000000000 --- a/dev-db/postgresql/postgresql-7.1_beta3.ebuild +++ /dev/null @@ -1,36 +0,0 @@ -# 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> -# /home/cvsroot/gentoo-x86/dev-db/postgresql/postgresql-7.0.3-r1.ebuild,v 1.4 2001/01/23 19:54:43 achim Exp - -P=postgresql-7.1beta3 -A=${P}.tar.gz -S=${WORKDIR}/${P} -DESCRIPTION="PostgreSQL is a sophisticated Object-Relational DBMS" -SRC_URI="ftp://ftp.postgresql.org/pub/dev/${A}" -HOMEPAGE="http://postgresql.readysetnet.com/" - -DEPEND=">=dev-lang/tcl-tk-8" - -src_unpack() { - unpack ${A} - cd ${S}/src/backend/catalog - cp genbki.sh genbki.sh.orig - sed -e 's:\\name:\\ name:' genbki.sh.orig > genbki.sh -} - -src_compile() { - - try ./configure --prefix=/usr --host=${CHOST} \ - --datadir=/usr/share/postgres --includedir=/usr/include/postgres \ - --enable-locale --with-tcl --enable-syslog - try make - -} - -src_install () { - - try make prefix=${D}/usr includedir=${D}/usr/include/postgres \ - datadir=${D}/usr/share/postgres install -} - diff --git a/dev-db/unixODBC/files/digest-unixODBC-1.8.13 b/dev-db/unixODBC/files/digest-unixODBC-1.8.13 deleted file mode 100644 index a54ace41a9ad..000000000000 --- a/dev-db/unixODBC/files/digest-unixODBC-1.8.13 +++ /dev/null @@ -1 +0,0 @@ -MD5 732338e03ab52a7382968ef2a0f6dd51 unixODBC-1.8.13.tar.gz diff --git a/dev-db/unixODBC/files/digest-unixODBC-2.0.2 b/dev-db/unixODBC/files/digest-unixODBC-2.0.2 deleted file mode 100644 index 245cac8908a8..000000000000 --- a/dev-db/unixODBC/files/digest-unixODBC-2.0.2 +++ /dev/null @@ -1 +0,0 @@ -MD5 ee3db6b20a0bfda7fcceb583f68387f2 unixODBC-2.0.2.tar.gz diff --git a/dev-db/unixODBC/unixODBC-1.8.13.ebuild b/dev-db/unixODBC/unixODBC-1.8.13.ebuild deleted file mode 100644 index c70687361e4e..000000000000 --- a/dev-db/unixODBC/unixODBC-1.8.13.ebuild +++ /dev/null @@ -1,37 +0,0 @@ -# Copyright 1999-2000 Gentoo Technologies, Inc. -# Distributed under the terms of the GNU General Public License, v2 or later -# Author Your Name <your email> -# $Header: /var/cvsroot/gentoo-x86/dev-db/unixODBC/unixODBC-1.8.13.ebuild,v 1.4 2000/12/11 16:40:49 achim Exp $ - -A=${P}.tar.gz -S=${WORKDIR}/${P} -DESCRIPTION="ODBC Interface for Linux" -SRC_URI="http://www.unixodbc.org/${A}" -HOMEPAGE="http://www.unixodbc.org" - -DEPEND=">=x11-libs/qt-x11-2.2.2" - -src_unpack() { - - unpack ${A} - cd ${S} - cp Makefile.in Makefile.orig - sed -e "s:touch :touch \${DESTDIR}/:" Makefile.orig > Makefile.in - -} -src_compile() { - - cd ${S} - try ./configure --prefix=/usr --sysconfdir=/etc/unixODBC --host=${CHOST} - - try make - -} - -src_install () { - - cd ${S} - try make DESTDIR=${D} install - dodoc AUTHORS COPYING ChangeLog NEWS REDAME* -} - diff --git a/dev-db/unixODBC/unixODBC-2.0.2.ebuild b/dev-db/unixODBC/unixODBC-2.0.2.ebuild deleted file mode 100644 index b46f398cd670..000000000000 --- a/dev-db/unixODBC/unixODBC-2.0.2.ebuild +++ /dev/null @@ -1,37 +0,0 @@ -# Copyright 1999-2000 Gentoo Technologies, Inc. -# Distributed under the terms of the GNU General Public License, v2 or later -# Author Your Name <your email> -# $Header: /var/cvsroot/gentoo-x86/dev-db/unixODBC/unixODBC-2.0.2.ebuild,v 1.1 2001/01/13 20:07:52 achim Exp $ - -A=${P}.tar.gz -S=${WORKDIR}/${P} -DESCRIPTION="ODBC Interface for Linux" -SRC_URI="http://www.unixodbc.org/${A}" -HOMEPAGE="http://www.unixodbc.org" - -DEPEND=">=x11-libs/qt-x11-2.2.2" - -src_unpack() { - - unpack ${A} - cd ${S} - cp Makefile.in Makefile.orig - sed -e "s:touch :touch \${DESTDIR}/:" Makefile.orig > Makefile.in - -} -src_compile() { - - cd ${S} - try ./configure --prefix=/usr --sysconfdir=/etc/unixODBC --host=${CHOST} - - try make - -} - -src_install () { - - cd ${S} - try make DESTDIR=${D} install - dodoc AUTHORS COPYING ChangeLog NEWS REDAME* -} - diff --git a/dev-lang/entity/entity-0.7.0_pre.ebuild b/dev-lang/entity/entity-0.7.0_pre.ebuild deleted file mode 100644 index b7c7c38fca94..000000000000 --- a/dev-lang/entity/entity-0.7.0_pre.ebuild +++ /dev/null @@ -1,39 +0,0 @@ -# Copyright 1999-2000 Gentoo Technologies, Inc. -# Distributed under the terms of the GNU General Public License, v2 or later -# Author Your Name <your email> -# $Header: /var/cvsroot/gentoo-x86/dev-lang/entity/entity-0.7.0_pre.ebuild,v 1.1 2001/02/27 03:06:16 drobbins Exp $ - -A=entity-pre0.7.0.tar.gz -S=${WORKDIR}/${P} -DESCRIPTION="An XML Framework" -SRC_URI="http://entity.evilplan.org/Download/files/${A}" -HOMEPAGE="http://entity.evilplan.org" - -DEPEND=">=media-libs/imlib-1.9.8.1 - >=dev-libs/libpcre-3.2 - >=dev-lang/tcl-tk-8.1.1 - >=sys-devel/perl-5.6" - -RDEPEND="$DEPEND - sys-apps/bash" - -src_compile() { - - cd ${S} - try DEBIAN_ENTITY_MAGIC=voodoo ./configure --prefix=/usr --host=${CHOST} \ - --enable-exec-class=yes \ - --enable-gtk=module \ - --enable-perl=static --enable-python=no \ - --enable-tcl=module --with-tcl=/usr/lib \ - --enable-c=module \ - --enable-javascript=yes --with-included-njs - try make - -} - -src_install () { - - cd ${S} - make DESTDIR=${D} install -} - diff --git a/dev-lang/entity/files/digest-entity-pre-0.7.0 b/dev-lang/entity/files/digest-entity-pre-0.7.0 deleted file mode 100644 index 1e22137cad54..000000000000 --- a/dev-lang/entity/files/digest-entity-pre-0.7.0 +++ /dev/null @@ -1 +0,0 @@ -MD5 9d863556a6c5a594bb35dbf2b47cb4a4 entity-pre0.7.0.tar.gz diff --git a/dev-lang/kaffe/files/digest-kaffe-1.0.6 b/dev-lang/kaffe/files/digest-kaffe-1.0.6 deleted file mode 100644 index c637af971dd1..000000000000 --- a/dev-lang/kaffe/files/digest-kaffe-1.0.6 +++ /dev/null @@ -1 +0,0 @@ -MD5 5a900dd33e7bde48d2fa94ada273e80e kaffe-1.0.6.tar.gz diff --git a/dev-lang/kaffe/kaffe-1.0.6.ebuild b/dev-lang/kaffe/kaffe-1.0.6.ebuild deleted file mode 100644 index 1ec4050f3699..000000000000 --- a/dev-lang/kaffe/kaffe-1.0.6.ebuild +++ /dev/null @@ -1,27 +0,0 @@ -# Copyright 1999-2000 Gentoo Technologies, Inc. -# Distributed under the terms of the GNU General Public License, v2 or later -# Author Jerry Alexandratos <jerry@gentoo.org> -# $Header: /var/cvsroot/gentoo-x86/dev-lang/kaffe/kaffe-1.0.6.ebuild,v 1.1 2000/11/22 03:05:44 jerry Exp $ - -A=${P}.tar.gz -S=${WORKDIR}/${P} -DESCRIPTION="A cleanroom, open source Java VM and class libraries" -SRC_URI="http://www.kaffe.org/ftp/pub/kaffe/${A}" -HOMEPAGE="http://www.kaffe.org/" - -DEPEND=">=dev-libs/gmp-3.1 - >=media-libs/jpeg-6b - >=media-libs/libpng-1.0.7 - >=sys-libs/glibc-2.1.3 - >=x11-base/xfree-4.0.1" - -src_compile() { - cd ${S} - try ./configure --prefix=/opt/kaffe --host=${CHOST} - try make -} - -src_install () { - cd ${S} - try make DESTDIR=${D} install -} diff --git a/dev-lang/nasm/files/digest-nasm-0.98-r1 b/dev-lang/nasm/files/digest-nasm-0.98-r1 deleted file mode 100644 index e100eaea6fd3..000000000000 --- a/dev-lang/nasm/files/digest-nasm-0.98-r1 +++ /dev/null @@ -1 +0,0 @@ -MD5 9b7b0cb51d6b777edcbed7e0447a5f4e nasm-0.98.tar.bz2 diff --git a/dev-lang/nasm/nasm-0.98-r1.ebuild b/dev-lang/nasm/nasm-0.98-r1.ebuild deleted file mode 100644 index 99e9d5552bdb..000000000000 --- a/dev-lang/nasm/nasm-0.98-r1.ebuild +++ /dev/null @@ -1,37 +0,0 @@ -# Copyright 1999-2000 Gentoo Technologies, Inc. -# Distributed under the terms of the GNU General Public License, v2 or later -# Author Daniel Robbins <drobbins@gentoo.org> -# $Header: /var/cvsroot/gentoo-x86/dev-lang/nasm/nasm-0.98-r1.ebuild,v 1.5 2000/11/01 04:44:14 achim Exp $ - -P=nasm-0.98 -A=${P}.tar.bz2 -S=${WORKDIR}/${P} -DESCRIPTION="groovy little assembler" -SRC_URI="ftp://ftp.kernel.org/pub/software/devel/nasm/source/${A} - ftp://ftp.de.kernel.org/pub/software/devel/nasm/source/${A} - ftp://ftp.uk.kernel.org/pub/software/devel/nasm/source/${A}" -HOMEPAGE="http://nasm.sourceforge.net/" - -DEPEND=">=sys-devel/perl-5 - >=sys-apps/texinfo-4.0 - >=sys-libs/glibc-2.1.3" - -src_compile() { - try ./configure --prefix=/usr - try make - cd doc - try make -} - -src_install() { - into /usr - dobin nasm ndisasm - dobin rdoff/ldrdf rdoff/rdf2bin rdoff/rdfdump rdoff/rdflib rdoff/rdx - doman nasm.1 ndisasm.1 - dodoc COPYING Changes Licence MODIFIED Readme Wishlist doc/nasmdoc.txt - docinto html - dodoc doc/html/*.html - doinfo doc/info/*.info* -} - - diff --git a/dev-lang/python/files/digest-python-2.0-r1 b/dev-lang/python/files/digest-python-2.0-r1 deleted file mode 100644 index d5edd17f12a5..000000000000 --- a/dev-lang/python/files/digest-python-2.0-r1 +++ /dev/null @@ -1,2 +0,0 @@ -MD5 4751f4619eda0b5ade9d9dd017e7c1ef BeOpen-Python-2.0.tar.bz2 -MD5 7c99113a11b03599d8494638f6d90b56 python-fchksum-1.1.tar.gz diff --git a/dev-lang/python/python-2.0-r1.ebuild b/dev-lang/python/python-2.0-r1.ebuild deleted file mode 100644 index 6aef57c72047..000000000000 --- a/dev-lang/python/python-2.0-r1.ebuild +++ /dev/null @@ -1,81 +0,0 @@ -# Copyright 1999-2000 Gentoo Technologies, Inc. -# Distributed under the terms of the GNU General Public License, v2 or later -# Author Daniel Robbins <drobbins@gentoo.org> -# $Header: /var/cvsroot/gentoo-x86/dev-lang/python/python-2.0-r1.ebuild,v 1.1 2001/01/19 17:36:18 achim Exp $ - -S=${WORKDIR}/Python-2.0 -S2=${WORKDIR}/python-fchksum-1.1 -DESCRIPTION="A really great language" -SRC_URI="http://www.python.org/ftp/python/src/BeOpen-Python-2.0.tar.bz2 - http://www.azstarnet.com/~donut/programs/fchksum/python-fchksum-1.1.tar.gz" - -HOMEPAGE="http://www.python.org http://www.azstarnet.com/~donut/programs/fchksum/" -DEPEND=">=sys-libs/gpm-1.19.3 >=dev-lang/tcl-tk-8.0.5" -RDEPEND="$DEPEND >=sys-apps/bash-2.04" -PROVIDE="virtual/python-2.0" - -src_unpack() { - unpack BeOpen-Python-2.0.tar.bz2 - cd ${S}/Modules - sed -e 's/#readline/readline/' -e 's/-lreadline -ltermcap/-lreadline/' \ - -e 's/#_locale/_locale/' -e 's/#crypt/crypt/' -e 's/# -lcrypt/-lcrypt/' \ - -e 's/#syslog/syslog/' -e 's/#_curses _cursesmodule.c -lcurses -ltermcap/_curses _cursesmodule.c -lncurses/' \ - -e 's:#zlib zlibmodule.c -I$(prefix)/include -L$(exec_prefix)/lib -lz:zlib zlibmodule.c -lz:' \ - -e 's:#dbm.*:dbm dbmmodule.c -I/usr/include/db3 -ldb-3.2:' \ - -e 's:^TKPATH=\:lib-tk:#TKPATH:' \ - Setup.in > Setup - echo "fchksum fchksum.c md5_2.c" >> Setup - - cd ${S}/Modules - - #patch the dbmmodule to use db3's dbm compatibility code. That way, we're depending on db3 rather than - #old db1. We'll link with db3, of course. - cp dbmmodule.c dbmmodule.c.orig - sed -e '10,25d' -e '26i\' -e '#define DB_DBM_HSEARCH 1\' -e 'static char *which_dbm = "BSD db";\' -e '#include <db3/db.h>' dbmmodule.c.orig > dbmmodule.c - - cp ${FILESDIR}/pfconfig.h . - unpack python-fchksum-1.1.tar.gz - - cd python-fchksum-1.1 - mv md5.h ../md5_2.h - sed -e 's:"md5.h":"md5_2.h":' md5.c > ../md5_2.c - sed -e 's:"md5.h":"md5_2.h":' fchksum.c > ../fchksum.c - - #for some reason, python 2.0 can't find /usr/lib/python2.0 without this fix to the source code. - cd ${S}/Python - cp pythonrun.c pythonrun.c.orig - sed -e 's:static char \*default_home = NULL:static char \*default_home = "/usr":' pythonrun.c.orig > pythonrun.c -} - - -src_compile() { - cd ${S} - try ./configure --prefix=/usr --without-libdb - #libdb3 support is available from http://pybsddb.sourceforge.net/; the one - #included with python is for db 1.85 only. - cp Makefile Makefile.orig - sed -e "s/-g -O2/${CFLAGS}/" Makefile.orig > Makefile - cd ${S}/Modules - cp Makefile.pre Makefile.orig - sed -e "s:MODOBJS=:MODOBJS=fchksum.o md5_2.o:" \ - Makefile.orig > Makefile.pre - - # Parallel make does not work - cd ${S} - try make -} - -src_install() { - dodir /usr - try make install prefix=${D}/usr - rm ${D}/usr/bin/python - dosym python2.0 /usr/bin/python -# mv ${D}/bin/python1.5 ${D}/bin/spython1.5 - # for i in lib-dynload lib-stdwin lib-tk test - # do - # rm -r ${D}/lib/python1.5/${i} - # done - # rm -r ${D}/include - dodoc README -} - diff --git a/dev-lang/python/python-2.0.ebuild b/dev-lang/python/python-2.0.ebuild deleted file mode 100644 index cc101af67003..000000000000 --- a/dev-lang/python/python-2.0.ebuild +++ /dev/null @@ -1,81 +0,0 @@ -# Copyright 1999-2000 Gentoo Technologies, Inc. -# Distributed under the terms of the GNU General Public License, v2 or later -# Author Daniel Robbins <drobbins@gentoo.org> -# $Header: /var/cvsroot/gentoo-x86/dev-lang/python/python-2.0.ebuild,v 1.3 2001/01/16 07:36:16 drobbins Exp $ - -S=${WORKDIR}/Python-2.0 -S2=${WORKDIR}/python-fchksum-1.1 -DESCRIPTION="A really great language" -SRC_URI="http://www.python.org/ftp/python/src/BeOpen-Python-2.0.tar.bz2 - http://www.azstarnet.com/~donut/programs/fchksum/python-fchksum-1.1.tar.gz" - -HOMEPAGE="http://www.python.org http://www.azstarnet.com/~donut/programs/fchksum/" -DEPEND=">=sys-libs/gpm-1.19.3 >=dev-lang/tcl-tk-8.0.5" -RDEPEND="$DEPEND >=sys-apps/bash-2.04" -PROVIDE="virtual/python-2.0" - -src_unpack() { - unpack BeOpen-Python-2.0.tar.bz2 - cd ${S}/Modules - sed -e 's/#readline/readline/' -e 's/-lreadline -ltermcap/-lreadline/' \ - -e 's/#_locale/_locale/' -e 's/#crypt/crypt/' -e 's/# -lcrypt/-lcrypt/' \ - -e 's/#syslog/syslog/' -e 's/#_curses _cursesmodule.c -lcurses -ltermcap/_curses _cursesmodule.c -lncurses/' \ - -e 's:#zlib zlibmodule.c -I$(prefix)/include -L$(exec_prefix)/lib -lz:zlib zlibmodule.c -lz:' \ - -e 's:#dbm.*:dbm dbmmodule.c -I/usr/include/db3 -ldb-3.1:' \ - -e 's:^TKPATH=\:lib-tk:#TKPATH:' \ - Setup.in > Setup - echo "fchksum fchksum.c md5_2.c" >> Setup - - cd ${S}/Modules - - #patch the dbmmodule to use db3's dbm compatibility code. That way, we're depending on db3 rather than - #old db1. We'll link with db3, of course. - cp dbmmodule.c dbmmodule.c.orig - sed -e '10,25d' -e '26i\' -e '#define DB_DBM_HSEARCH 1\' -e 'static char *which_dbm = "BSD db";\' -e '#include <db3/db.h>' dbmmodule.c.orig > dbmmodule.c - - cp ${FILESDIR}/pfconfig.h . - unpack python-fchksum-1.1.tar.gz - - cd python-fchksum-1.1 - mv md5.h ../md5_2.h - sed -e 's:"md5.h":"md5_2.h":' md5.c > ../md5_2.c - sed -e 's:"md5.h":"md5_2.h":' fchksum.c > ../fchksum.c - - #for some reason, python 2.0 can't find /usr/lib/python2.0 without this fix to the source code. - cd ${S}/Python - cp pythonrun.c pythonrun.c.orig - sed -e 's:static char \*default_home = NULL:static char \*default_home = "/usr":' pythonrun.c.orig > pythonrun.c -} - - -src_compile() { - cd ${S} - try ./configure --prefix=/usr --without-libdb - #libdb3 support is available from http://pybsddb.sourceforge.net/; the one - #included with python is for db 1.85 only. - cp Makefile Makefile.orig - sed -e "s/-g -O2/${CFLAGS}/" Makefile.orig > Makefile - cd ${S}/Modules - cp Makefile.pre Makefile.orig - sed -e "s:MODOBJS=:MODOBJS=fchksum.o md5_2.o:" \ - Makefile.orig > Makefile.pre - - # Parallel make does not work - cd ${S} - try make -} - -src_install() { - dodir /usr - try make install prefix=${D}/usr - rm ${D}/usr/bin/python - dosym python2.0 /usr/bin/python -# mv ${D}/bin/python1.5 ${D}/bin/spython1.5 - # for i in lib-dynload lib-stdwin lib-tk test - # do - # rm -r ${D}/lib/python1.5/${i} - # done - # rm -r ${D}/include - dodoc README -} - diff --git a/dev-lang/ruby/files/digest-ruby-1.6.1 b/dev-lang/ruby/files/digest-ruby-1.6.1 deleted file mode 100644 index caa8e87bf59c..000000000000 --- a/dev-lang/ruby/files/digest-ruby-1.6.1 +++ /dev/null @@ -1 +0,0 @@ -MD5 59e5b9ab8dfe65214e1b72eec4219dff ruby-1.6.1.tar.gz diff --git a/dev-lang/ruby/ruby-1.6.1.ebuild b/dev-lang/ruby/ruby-1.6.1.ebuild deleted file mode 100644 index 9999a25e7fc1..000000000000 --- a/dev-lang/ruby/ruby-1.6.1.ebuild +++ /dev/null @@ -1,25 +0,0 @@ -# Copyright 1999-2000 Gentoo Technologies, Inc. -# Distributed under the terms of the GNU General Public License, v2 or later -# Author Jerry Alexandratos <jerry@gentoo.org> -# $Header: /var/cvsroot/gentoo-x86/dev-lang/ruby/ruby-1.6.1.ebuild,v 1.1 2000/11/17 08:03:26 jerry Exp $ - -A=${P}.tar.gz -S=${WORKDIR}/${P} -DESCRIPTION="An object-oriented scripting language" -SRC_URI="ftp://ftp.netlab.co.jp/pub/lang/ruby/${A}" -HOMEPAGE="http://www.ruby-lang.org/" - -DEPEND=">=sys-libs/glibc-2.1.3 - >=sys-libs/gdbm-1.8.0 - >=sys-libs/readline-4.1" - -src_compile() { - cd ${S} - try ./configure --prefix=/usr --host=${CHOST} - try make -} - -src_install () { - cd ${S} - try make DESTDIR=${D} install -} diff --git a/dev-lang/swig/files/digest-swig-1.3_alpha5-r1 b/dev-lang/swig/files/digest-swig-1.3_alpha5-r1 deleted file mode 100644 index 2a99f66b322b..000000000000 --- a/dev-lang/swig/files/digest-swig-1.3_alpha5-r1 +++ /dev/null @@ -1 +0,0 @@ -MD5 96249f9614ae31d328661d0e3d9cd615 swig1.3a5.tar.gz diff --git a/dev-lang/swig/swig-1.3_alpha5-r1.ebuild b/dev-lang/swig/swig-1.3_alpha5-r1.ebuild deleted file mode 100644 index cb256235bc13..000000000000 --- a/dev-lang/swig/swig-1.3_alpha5-r1.ebuild +++ /dev/null @@ -1,38 +0,0 @@ -# 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-lang/swig/swig-1.3_alpha5-r1.ebuild,v 1.1 2000/12/01 19:46:12 drobbins Exp $ - -P=swig1.3a5 -A=${P}.tar.gz -S=${WORKDIR}/SWIG1.3a5 -DESCRIPTION="Simplified wrapper and interface generator" -SRC_URI="http://download.sourceforge.net/swig/${A}" -HOMEPAGE="http://www.swig.org" - -DEPEND=">=sys-devel/gcc-2.95.2 - >=sys-libs/glibc-2.1.3 - >=virtual/python-1.5.2 - >=dev-lang/jdk-1.2.2 - >=dev-lang/ruby-1.6.1 - >=dev-util/guile-1.4 - >=dev-lang/tcl-tk-8.1.1" - -src_compile() { - - cd ${S} - unset CXXFLAGS - unset CFLAGS - try ./configure --prefix=/usr --host=${CHOST} \ - --with-doc=html --with-tcllib=/usr/lib/tcl8.1 - try make - -} - -src_install () { - - cd ${S} - try make prefix=${D}/usr install - -} - diff --git a/dev-lang/tcl-tk/files/digest-tcl-tk-8.0.5-r1 b/dev-lang/tcl-tk/files/digest-tcl-tk-8.0.5-r1 deleted file mode 100644 index 508dd8405b40..000000000000 --- a/dev-lang/tcl-tk/files/digest-tcl-tk-8.0.5-r1 +++ /dev/null @@ -1,2 +0,0 @@ -MD5 4247975c801510fb378b76237b2abaaf tcl8.0.5.tar.gz -MD5 3ae92b86c01ec99a1872697294839e64 tk8.0.5.tar.gz diff --git a/dev-lang/tcl-tk/tcl-tk-8.0.5-r1.ebuild b/dev-lang/tcl-tk/tcl-tk-8.0.5-r1.ebuild deleted file mode 100644 index aa26f384ebdd..000000000000 --- a/dev-lang/tcl-tk/tcl-tk-8.0.5-r1.ebuild +++ /dev/null @@ -1,64 +0,0 @@ -# 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-lang/tcl-tk/tcl-tk-8.0.5-r1.ebuild,v 1.1 2000/12/11 17:52:00 achim Exp $ -# - -P=tcl-tk-8.0.5 - -R1=tcl8.0.5 -A1=${R1}.tar.gz -S1=${WORKDIR}/${R1} -SRC_URI1="ftp://ftp.scriptics.com/pub/tcl/tcl8_0/tcl8.0.5.tar.gz" - -R2=tk8.0.5 -A2=${R2}.tar.gz -S2=${WORKDIR}/${R2} - -SRC_URI2="ftp://ftp.scriptics.com/pub/tcl/tcl8_0/tk8.0.5.tar.gz" - -A="${A1} ${A2}" -SRC_URI="${SRC_URI1} ${SRC_URI2}" -HOMEPAGE="http:/dev.scriptics.com/software/tcltk/" - -DESCRIPTION="Tool Command Language" - -DEPEND=">=sys-apps/bash-2.04 - >=sys-libs/glibc-2.1.3 - >=x11-base/xfree-4.0.1" - -# hyper-optimizations untested... -# -src_unpack() { - unpack ${A1} - unpack ${A2} - cp ${S1}/unix/configure ${S1}/unix/configure.orig - sed -e "s/^CFLAGS_OPTIMIZE=-O$/CFLAGS_OPTIMIZE=\$CFLAGS/" \ - ${S1}/unix/configure.orig > ${S1}/unix/configure -} - -src_compile() { - cd ${S1}/unix - try ./configure --host=${CHOST} --prefix=/usr --enable-shared - try make - cd ${S2}/unix - try ./configure --host=${CHOST} --prefix=/usr --with-tcl=${S1}/unix --enable-shared - try make -} - -src_install() { - cd ${S1}/unix - try make INSTALL_ROOT=${D} install - cd ${S2}/unix - try make INSTALL_ROOT=${D} install - strip ${D}/usr/bin/* -# ln -sf wish8.1 ${D}/usr/bin/wish -# ln -sf tclsh8.1 ${D}/usr/bin/tclsh - cd ${S1} - dodoc README changes license.terms - - prepman -} - - - diff --git a/dev-libs/dietlibc/dietlibc-0.6.11.ebuild b/dev-libs/dietlibc/dietlibc-0.6.11.ebuild deleted file mode 100644 index a5055c833175..000000000000 --- a/dev-libs/dietlibc/dietlibc-0.6.11.ebuild +++ /dev/null @@ -1,35 +0,0 @@ -# Copyright 1999-2000 Gentoo Technologies, Inc. -# Distributed under the terms of the GNU General Public License, v2 or later -# Author Your Name <your email> -# $Header: /var/cvsroot/gentoo-x86/dev-libs/dietlibc/dietlibc-0.6.11.ebuild,v 1.1 2000/12/28 11:16:32 achim Exp $ - -S=${WORKDIR}/${PN} -DESCRIPTION="A minimal libc" -SRC_URI="http://www.fefe.de/dietlibc/dietlibc-0.6.11.tar.bz2" -HOMEPAGE="http://www.fefe.de/dietlibc" - - -src_unpack() { - unpack ${A} - mkdir ${S}/include/asm - cp /usr/src/linux/include/asm/posix_types.h ${S}/include/asm -} - -src_compile() { - - try make - -} - -src_install () { - - cd ${S} - dodir /usr/include/dietlibc - cp -a include/* ${D}/usr/include/dietlibc - dolib.a dietlibc.a - - dodoc AUTHOR BUGS CAVEAT CHANGES README THANKS TODO - - -} - diff --git a/dev-libs/dietlibc/files/digest-dietlibc-0.6.11 b/dev-libs/dietlibc/files/digest-dietlibc-0.6.11 deleted file mode 100644 index 71f67f91f52c..000000000000 --- a/dev-libs/dietlibc/files/digest-dietlibc-0.6.11 +++ /dev/null @@ -1 +0,0 @@ -MD5 93b31ad261a6af997b27bcab7216025f dietlibc-0.6.11.tar.bz2 diff --git a/dev-libs/expat/expat-1.95.1.ebuild b/dev-libs/expat/expat-1.95.1.ebuild deleted file mode 100644 index 5370e62723ca..000000000000 --- a/dev-libs/expat/expat-1.95.1.ebuild +++ /dev/null @@ -1,27 +0,0 @@ -# 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-libs/expat/expat-1.95.1.ebuild,v 1.2 2001/02/08 19:21:33 achim Exp $ - -A=${P}.tar.gz -S=${WORKDIR}/${P} -DESCRIPTION="XML parsing libraries" -SRC_URI="http://download.sourceforge.net/expat/${A}" -HOMEPAGE="http://expat.sourceforge.net" - -DEPEND="virtual/glibc" - -src_compile() { - - try ./configure --prefix=/usr - try pmake -} - -src_install() { - - try make prefix=${D}/usr install - dodoc ${S}/README -} - - - diff --git a/dev-libs/expat/files/digest-expat-1.95.1 b/dev-libs/expat/files/digest-expat-1.95.1 deleted file mode 100644 index b3fd29b662b1..000000000000 --- a/dev-libs/expat/files/digest-expat-1.95.1 +++ /dev/null @@ -1 +0,0 @@ -MD5 113ebbf7efaf7179d869341cbb2879f7 expat-1.95.1.tar.gz diff --git a/dev-libs/glib/files/digest-glib-1.2.8-r1 b/dev-libs/glib/files/digest-glib-1.2.8-r1 deleted file mode 100644 index 2d90f0086678..000000000000 --- a/dev-libs/glib/files/digest-glib-1.2.8-r1 +++ /dev/null @@ -1 +0,0 @@ -MD5 5965aeb7894f3ab3b9b7c5833418bfe9 glib-1.2.8.tar.gz diff --git a/dev-libs/glib/glib-1.2.8-r1.ebuild b/dev-libs/glib/glib-1.2.8-r1.ebuild deleted file mode 100644 index 342473ceadf9..000000000000 --- a/dev-libs/glib/glib-1.2.8-r1.ebuild +++ /dev/null @@ -1,39 +0,0 @@ -# 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-libs/glib/glib-1.2.8-r1.ebuild,v 1.8 2001/01/14 05:36:51 drobbins Exp $ - -# also, this script now has pre/post inst/rm support - -P=glib-1.2.8 -A=${P}.tar.gz -S=${WORKDIR}/${P} -DESCRIPTION="The GLib library of C routines" -SRC_URI="ftp://ftp.gtk.org/pub/gtk/v1.2/"${A} -HOMEPAGE="http://www.gtk.org/" - -DEPEND=">=sys-apps/bash-2.04 - >=sys-libs/glibc-2.1.3" - -src_compile() { - cd ${S} - try ./configure --host=${CHOST} --prefix=/usr --infodir=/usr/info --with-threads=posix - try make -} - -src_install() { - cd ${S} - try make install prefix=${D}/usr infodir=${D}/usr/info - dodoc AUTHORS ChangeLog COPYING README* INSTALL NEWS - cd docs - docinto html - dodoc glib.html glib_toc.html -} - -pkg_postinst() { - /usr/sbin/env-update -} - - - - diff --git a/dev-libs/glib/glib-1.2.9.ebuild b/dev-libs/glib/glib-1.2.9.ebuild deleted file mode 100644 index 12e1f797d3b0..000000000000 --- a/dev-libs/glib/glib-1.2.9.ebuild +++ /dev/null @@ -1,50 +0,0 @@ -# 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-libs/glib/glib-1.2.9.ebuild,v 1.1 2001/03/06 06:20:41 achim Exp $ - -# also, this script now has pre/post inst/rm support - -A=${P}.tar.gz -S=${WORKDIR}/${P} -DESCRIPTION="The GLib library of C routines" -SRC_URI="ftp://ftp.gtk.org/pub/gtk/v1.2/"${A} -HOMEPAGE="http://www.gtk.org/" - -DEPEND="virtual/glibc" - -src_compile() { - - local myconf - - if [ "${DEBUG}" ] - then - myconf="--enable-debug=yes" - else - myconf="--enable-debug=no" - fi - - try ./configure --host=${CHOST} --prefix=/usr \ - --infodir=/usr/share/info \ - --mandir=/usr/share/man \ - --with-threads=posix ${myconf} - try make - -} - -src_install() { - - try make install prefix=${D}/usr infodir=${D}/usr/share/info \ - mandir=${D}/usr/share/man - - dodoc AUTHORS ChangeLog COPYING README* INSTALL NEWS - cd docs - docinto html - dodoc glib.html glib_toc.html - -} - - - - - diff --git a/dev-libs/gmp/files/digest-gmp-3.1 b/dev-libs/gmp/files/digest-gmp-3.1 deleted file mode 100644 index a4e7c5d25e16..000000000000 --- a/dev-libs/gmp/files/digest-gmp-3.1 +++ /dev/null @@ -1 +0,0 @@ -MD5 482928f0a2a1bb95455c5907dc3ca2b0 gmp-3.1.tar.gz diff --git a/dev-libs/gmp/files/digest-gmp-3.1.1 b/dev-libs/gmp/files/digest-gmp-3.1.1 deleted file mode 100644 index 66dd507bf0e7..000000000000 --- a/dev-libs/gmp/files/digest-gmp-3.1.1 +++ /dev/null @@ -1 +0,0 @@ -MD5 7c25f129df145fd6f72455926e911791 gmp-3.1.1.tar.gz diff --git a/dev-libs/gmp/gmp-3.1.1.ebuild b/dev-libs/gmp/gmp-3.1.1.ebuild deleted file mode 100644 index 4799483898f7..000000000000 --- a/dev-libs/gmp/gmp-3.1.1.ebuild +++ /dev/null @@ -1,40 +0,0 @@ -# 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-libs/gmp/gmp-3.1.1.ebuild,v 1.1 2001/01/09 20:30:28 drobbins Exp $ - -A=${P}.tar.gz -S=${WORKDIR}/${P} -DESCRIPTION="Library for arithmetic on arbitrary precision integers, rational numbers, and floating-point numbers" -SRC_URI="ftp://gatekeeper.dec.com/pub/GNU/gmp/${A} - ftp://prep.ai.mit.edu/gnu/gmp/${A}" -HOMEPAGE="http://www.gnu.org/software/gmp/gmp.html" -DEPEND=">=sys-libs/glibc-2.1.3" - -src_unpack() { - unpack ${A} -} - -src_compile() { - cd ${S} - try ./configure --prefix=/usr --host=${CHOST} \ - --enable-mpfr --enable-mpbsd - try make -} - -src_install() { - cd ${S} - try make prefix=${D}/usr install - prepinfo - dodoc AUTHORS ChangeLog COPYING* NEWS README - dodoc doc/assembly_code doc/configuration - dodoc doc/isa_abi_headache doc/multiplication - docinto html - dodoc doc/*.html -} - -pkg_postinst() { - /usr/sbin/env-update -} - - diff --git a/dev-libs/libpcre/files/digest-libpcre-3.4 b/dev-libs/libpcre/files/digest-libpcre-3.4 deleted file mode 100644 index 9d7869b2e06c..000000000000 --- a/dev-libs/libpcre/files/digest-libpcre-3.4 +++ /dev/null @@ -1 +0,0 @@ -MD5 75918d0111f592097939a7b8c490dcd0 pcre-3.4.tar.gz diff --git a/dev-libs/libpcre/libpcre-3.4.ebuild b/dev-libs/libpcre/libpcre-3.4.ebuild deleted file mode 100644 index eb7e08c82ba5..000000000000 --- a/dev-libs/libpcre/libpcre-3.4.ebuild +++ /dev/null @@ -1,37 +0,0 @@ -# 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-libs/libpcre/libpcre-3.4.ebuild,v 1.1 2000/11/26 20:54:17 achim Exp $ - -A=pcre-${PV}.tar.gz -S=${WORKDIR}/pcre-${PV} -DESCRIPTION="Perl compatible regular expressions" -SRC_URI="ftp://ftp.csx.cam.ac.uk/pub/software/programming/pcre/"${A} - -DEPEND=">=sys-apps/bash-2.04 - >=sys-libs/glibc-2.1.3" - -src_unpack() { - unpack ${A} -} - -src_compile() { - cd ${S} - try ./configure --host=${CHOST} --prefix=/usr - try make -} - -src_install() { - cd ${S} - try make prefix=${D}/usr install - - dodoc AUTHORS COPYING ChangeLog LICENCE NEWS NON-UNIX-USE README - dodoc doc/*.txt doc/Tech.Notes - docinto html - dodoc doc/*.html - -} - - - - diff --git a/dev-libs/librep/files/digest-librep-0.13.2 b/dev-libs/librep/files/digest-librep-0.13.2 deleted file mode 100644 index d72b5b770d48..000000000000 --- a/dev-libs/librep/files/digest-librep-0.13.2 +++ /dev/null @@ -1 +0,0 @@ -MD5 b2a0590111be2bd339cc5c98806e4223 librep-0.13.2.tar.gz diff --git a/dev-libs/librep/files/digest-librep-0.13.4 b/dev-libs/librep/files/digest-librep-0.13.4 deleted file mode 100644 index 62870515eb23..000000000000 --- a/dev-libs/librep/files/digest-librep-0.13.4 +++ /dev/null @@ -1 +0,0 @@ -MD5 92703636d670c8effe132ba995fa9237 librep-0.13.4.tar.gz diff --git a/dev-libs/librep/files/digest-librep-0.13.4-r1 b/dev-libs/librep/files/digest-librep-0.13.4-r1 deleted file mode 100644 index 62870515eb23..000000000000 --- a/dev-libs/librep/files/digest-librep-0.13.4-r1 +++ /dev/null @@ -1 +0,0 @@ -MD5 92703636d670c8effe132ba995fa9237 librep-0.13.4.tar.gz diff --git a/dev-libs/librep/librep-0.13.4-r1.ebuild b/dev-libs/librep/librep-0.13.4-r1.ebuild deleted file mode 100644 index ca772896b5b6..000000000000 --- a/dev-libs/librep/librep-0.13.4-r1.ebuild +++ /dev/null @@ -1,44 +0,0 @@ -# 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-libs/librep/librep-0.13.4-r1.ebuild,v 1.1 2001/03/06 06:20:41 achim Exp $ - -A=${P}.tar.gz -S=${WORKDIR}/${P} -DESCRIPTION="Shared library implementing a Lisp dialect" -SRC_URI="ftp://librep.sourceforge.net/pub/librep/"${A} -HOMEPAGE="http://librep.sourceforge.net/" - -DEPEND="virtual/glibc - >=sys-libs/gdbm-1.8.0 - >=dev-libs/gmp-3.1.1 - readline? ( >=sys-libs/readline-4.1 )" - -src_compile() { - - local myconf - - if [ "`use readline`" ] - then - myconf="--with-readline" - else - myconf="--without-readline" - fi - - try ./configure --host=${CHOST} --prefix=/usr --libexecdir=/usr/lib \ - --infodir=/usr/share/info - try make -} - -src_install() { - cd ${S} - try make prefix=${D}/usr aclocaldir=/${D}/usr/share/aclocal \ - libexecdir=${D}/usr/lib infodir=${D}/usr/share/info install - - insinto /usr/include - doins src/rep_config.h - dodoc AUTHORS BUGS COPYING ChangeLog NEWS README THANKS TODO DOC - docinto doc - dodoc doc/* -} - diff --git a/dev-libs/librep/librep-0.13.4.ebuild b/dev-libs/librep/librep-0.13.4.ebuild deleted file mode 100644 index 5763e1b7496f..000000000000 --- a/dev-libs/librep/librep-0.13.4.ebuild +++ /dev/null @@ -1,43 +0,0 @@ -# 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-libs/librep/librep-0.13.4.ebuild,v 1.2 2001/01/20 01:13:36 achim Exp $ - -A=${P}.tar.gz -S=${WORKDIR}/${P} -DESCRIPTION="Shared library implementing a Lisp dialect" -SRC_URI="ftp://librep.sourceforge.net/pub/librep/"${A} -HOMEPAGE="http://librep.sourceforge.net/" - -DEPEND=">=sys-apps/bash-2.04 - >=sys-libs/gdbm-1.8.0 - >=sys-libs/glibc-2.1.3 - >=sys-libs/gpm-1.19.3 - >=sys-libs/ncurses-5.1 - >=dev-libs/gmp-3.1.1" - -src_unpack() { - unpack ${A} -} - -src_compile() { - cd ${S} - try ./configure --host=${CHOST} --prefix=/usr --libexecdir=/usr/lib - try make -} - -src_install() { - cd ${S} - try make prefix=${D}/usr aclocaldir=/${D}/usr/share/aclocal \ - libexecdir=${D}/usr/lib install - prepinfo - insinto /usr/include - doins src/rep_config.h - dodoc AUTHORS BUGS COPYING ChangeLog NEWS README THANKS TODO DOC - docinto doc - dodoc doc/* -} - -pkg_postinst() { - /usr/sbin/env-update -} diff --git a/dev-libs/openssl/files/digest-openssl-0.9.6 b/dev-libs/openssl/files/digest-openssl-0.9.6 deleted file mode 100644 index a0335e6b89dd..000000000000 --- a/dev-libs/openssl/files/digest-openssl-0.9.6 +++ /dev/null @@ -1 +0,0 @@ -MD5 4b407ab005b3846ec542eb8305823bca openssl-0.9.6.tar.gz diff --git a/dev-libs/openssl/files/digest-openssl-0.9.6-r1 b/dev-libs/openssl/files/digest-openssl-0.9.6-r1 deleted file mode 100644 index a0335e6b89dd..000000000000 --- a/dev-libs/openssl/files/digest-openssl-0.9.6-r1 +++ /dev/null @@ -1 +0,0 @@ -MD5 4b407ab005b3846ec542eb8305823bca openssl-0.9.6.tar.gz diff --git a/dev-libs/openssl/openssl-0.9.6-r1.ebuild b/dev-libs/openssl/openssl-0.9.6-r1.ebuild deleted file mode 100644 index 9a053c4be21d..000000000000 --- a/dev-libs/openssl/openssl-0.9.6-r1.ebuild +++ /dev/null @@ -1,49 +0,0 @@ -# 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-libs/openssl/openssl-0.9.6-r1.ebuild,v 1.1 2001/03/09 10:26:59 achim Exp $ - -A=${P}.tar.gz -S=${WORKDIR}/${P} -DESCRIPTION="Toolkit for SSL v2/v3 and TLS v1" -SRC_URI="http://www.openssl.org/source/${A}" -HOMEPAGE="http://www.opensl.org/" - -DEPEND="virtual/glibc >=sys-devel/perl-5" - - -RDEPEND="virtual/glibc " -src_unpack() { - - unpack ${A} - cd ${S} - patch -p0 < ${FILESDIR}/${P}-Makefile.org-gentoo.diff - cp Configure Configure.orig - sed -e "s/-O3/$CFLAGS/" -e "s/-m486//" \ - Configure.orig > Configure - -} - -src_compile() { - - ./config --prefix=/usr --openssldir=/usr/ssl threads - try make shlib -} - -src_install() { - dodir /usr/ssl - try make INSTALL_PREFIX=${D} install - - dolib.so shlib_dir/libcrypto.so.0.9.4 - dolib.so shlib_dir/libssl.so.0.9.4 - preplib /usr - dodoc CHANGES* FAQ LICENSE NEWS README - dodoc doc/*.txt - docinto html - dodoc doc/*.gif doc/*.html - insinto /usr/share/emacs/site-lisp - doins doc/c-indentation.el -} - - - diff --git a/dev-libs/openssl/openssl-0.9.6.ebuild b/dev-libs/openssl/openssl-0.9.6.ebuild deleted file mode 100644 index c8b9dd95ef35..000000000000 --- a/dev-libs/openssl/openssl-0.9.6.ebuild +++ /dev/null @@ -1,40 +0,0 @@ -# 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-libs/openssl/openssl-0.9.6.ebuild,v 1.5 2000/11/12 21:35:07 achim Exp $ - -A=${P}.tar.gz -S=${WORKDIR}/${P} -DESCRIPTION="Toolkit for SSL v2/v3 and TLS v1" -SRC_URI="http://www.openssl.org/source/${A}" -HOMEPAGE="http://www.opensl.org/" - -DEPEND=">=sys-apps/bash-2.04 - >=sys-devel/perl-5 - >=sys-libs/glibc-2.1.3" - -src_compile() { - ./config --prefix=/usr --openssldir=/usr/ssl threads - cp Makefile Makefile.orig - sed -e "s/-O3/$CFLAGS/" -e "s/-m486//" \ - -e "s:/usr/local/bin/perl:/usr/bin/perl:" Makefile.orig > Makefile - try make shlib -} - -src_install() { - try make INSTALL_PREFIX=${D} install - - dolib.so shlib_dir/libcrypto.so.0.9.4 - dolib.so shlib_dir/libssl.so.0.9.4 - preplib /usr - mv ${D}/usr/ssl/man ${D}/usr - dodoc CHANGES* FAQ LICENSE NEWS README - dodoc doc/*.txt - docinto html - dodoc doc/*.gif doc/*.html - insinto /usr/share/emacs/site-lisp - doins doc/c-indentation.el -} - - - diff --git a/dev-libs/rep-gtk/files/digest-rep-gtk-0.14 b/dev-libs/rep-gtk/files/digest-rep-gtk-0.14 deleted file mode 100644 index 6f613e433dfd..000000000000 --- a/dev-libs/rep-gtk/files/digest-rep-gtk-0.14 +++ /dev/null @@ -1 +0,0 @@ -MD5 ea1eb8f3128177b2df0cf06ba594aae4 rep-gtk-0.14.tar.gz diff --git a/dev-libs/rep-gtk/files/digest-rep-gtk-0.15 b/dev-libs/rep-gtk/files/digest-rep-gtk-0.15 deleted file mode 100644 index 1ce59d0afc40..000000000000 --- a/dev-libs/rep-gtk/files/digest-rep-gtk-0.15 +++ /dev/null @@ -1 +0,0 @@ -MD5 e351980234c3220ed2ad031c9ad9448f rep-gtk-0.15.tar.gz diff --git a/dev-libs/rep-gtk/rep-gtk-0.15.ebuild b/dev-libs/rep-gtk/rep-gtk-0.15.ebuild deleted file mode 100644 index 31eb8b7628b2..000000000000 --- a/dev-libs/rep-gtk/rep-gtk-0.15.ebuild +++ /dev/null @@ -1,39 +0,0 @@ -# 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-libs/rep-gtk/rep-gtk-0.15.ebuild,v 1.1 2001/01/09 20:30:28 drobbins Exp $ - -A=${P}.tar.gz -S=${WORKDIR}/${P} -DESCRIPTION="GTK/GDK bindings for the librep Lisp environment" -SRC_URI="ftp://rep-gtk.sourceforge.net/pub/rep-gtk/"${A} -HOMEPAGE="http://rep-gtk.sourceforge.net/" - -DEPEND=" - >=x11-libs/gtk+-1.2.8 - >=dev-libs/librep-0.13.4 - gnome? ( >=gnome-base/libglade-0.14 - >=gnome-base/gdk-pixbuf-0.9.0 )" -src_unpack() { - unpack ${A} -} - -src_compile() { - cd ${S} - if [ -n "`use gnome`" ] - then - try ./configure --host=${CHOST} --with-gnome --with-libglade - else - try ./configure --host=${CHOST} --without-gnome --without-libglade \ - --without-gdk-pixbuf --without-gnome-canvas-pixbuf - fi - try make -} - -src_install() { - cd ${S} - try make DESTDIR=${D} install - dodoc AUTHORS BUGS COPYING ChangeLog README* TODO - docinto examples - dodoc examples/* -} |