+++ /dev/null
---- mysql-3.23.48/acinclude.m4.orig Thu Feb 7 21:46:47 2002
-+++ mysql-3.23.48/acinclude.m4 Wed Feb 13 20:07:10 2002
-@@ -2,7 +2,7 @@
-
- # A local version of AC_CHECK_SIZEOF that includes sys/types.h
- dnl MYSQL_CHECK_SIZEOF(TYPE [, CROSS-SIZE])
--AC_DEFUN(MYSQL_CHECK_SIZEOF,
-+AC_DEFUN([MYSQL_CHECK_SIZEOF],
- [changequote(<<, >>)dnl
- dnl The name to #define.
- define(<<AC_TYPE_NAME>>, translit(sizeof_$1, [a-z *], [A-Z_P]))dnl
-@@ -31,7 +31,7 @@
- ])
-
- #---START: Used in for client configure
--AC_DEFUN(MYSQL_TYPE_ACCEPT,
-+AC_DEFUN([MYSQL_TYPE_ACCEPT],
- [ac_save_CXXFLAGS="$CXXFLAGS"
- AC_CACHE_CHECK([base type of last arg to accept], mysql_cv_btype_last_arg_accept,
- AC_LANG_SAVE
-@@ -71,7 +71,7 @@
- #---END:
-
- dnl Find type of qsort
--AC_DEFUN(MYSQL_TYPE_QSORT,
-+AC_DEFUN([MYSQL_TYPE_QSORT],
- [AC_CACHE_CHECK([return type of qsort], mysql_cv_type_qsort,
- [AC_TRY_COMPILE([#include <stdlib.h>
- #ifdef __cplusplus
-@@ -88,7 +88,7 @@
- fi
- ])
-
--AC_DEFUN(MYSQL_TIMESPEC_TS,
-+AC_DEFUN([MYSQL_TIMESPEC_TS],
- [AC_CACHE_CHECK([if struct timespec has a ts_sec member], mysql_cv_timespec_ts,
- [AC_TRY_COMPILE([#include <pthread.h>
- #ifdef __cplusplus
-@@ -106,7 +106,7 @@
- fi
- ])
-
--AC_DEFUN(MYSQL_TZNAME,
-+AC_DEFUN([MYSQL_TZNAME],
- [AC_CACHE_CHECK([if we have tzname variable], mysql_cv_tzname,
- [AC_TRY_COMPILE([#include <time.h>
- #ifdef __cplusplus
-@@ -122,7 +122,7 @@
- fi
- ])
-
--AC_DEFUN(MYSQL_CHECK_ZLIB_WITH_COMPRESS, [
-+AC_DEFUN([MYSQL_CHECK_ZLIB_WITH_COMPRESS], [
- save_LIBS="$LIBS"
- LIBS="-l$1 $LIBS"
- AC_CACHE_CHECK([if libz with compress], mysql_cv_compress,
-@@ -142,7 +142,7 @@
- ])
-
- #---START: Used in for client configure
--AC_DEFUN(MYSQL_CHECK_ULONG,
-+AC_DEFUN([MYSQL_CHECK_ULONG],
- [AC_MSG_CHECKING(for type ulong)
- AC_CACHE_VAL(ac_cv_ulong,
- [AC_TRY_RUN([#include <stdio.h>
-@@ -160,7 +160,7 @@
- fi
- ])
-
--AC_DEFUN(MYSQL_CHECK_UCHAR,
-+AC_DEFUN([MYSQL_CHECK_UCHAR],
- [AC_MSG_CHECKING(for type uchar)
- AC_CACHE_VAL(ac_cv_uchar,
- [AC_TRY_RUN([#include <stdio.h>
-@@ -178,7 +178,7 @@
- fi
- ])
-
--AC_DEFUN(MYSQL_CHECK_UINT,
-+AC_DEFUN([MYSQL_CHECK_UINT],
- [AC_MSG_CHECKING(for type uint)
- AC_CACHE_VAL(ac_cv_uint,
- [AC_TRY_RUN([#include <stdio.h>
-@@ -197,7 +197,7 @@
- ])
-
-
--AC_DEFUN(MYSQL_PTHREAD_YIELD,
-+AC_DEFUN([MYSQL_PTHREAD_YIELD],
- [AC_CACHE_CHECK([if pthread_yield takes zero arguments], ac_cv_pthread_yield_zero_arg,
- [AC_TRY_LINK([#define _GNU_SOURCE
- #include <pthread.h>
-@@ -234,7 +234,7 @@
-
- #---END:
-
--AC_DEFUN(MYSQL_CHECK_FP_EXCEPT,
-+AC_DEFUN([MYSQL_CHECK_FP_EXCEPT],
- [AC_MSG_CHECKING(for type fp_except)
- AC_CACHE_VAL(ac_cv_fp_except,
- [AC_TRY_RUN([#include <stdio.h>
-@@ -253,92 +253,9 @@
- fi
- ])
-
--# From fileutils-3.14/aclocal.m4
--
--# @defmac AC_PROG_CC_STDC
--# @maindex PROG_CC_STDC
--# @ovindex CC
--# If the C compiler in not in ANSI C mode by default, try to add an option
--# to output variable @code{CC} to make it so. This macro tries various
--# options that select ANSI C on some system or another. It considers the
--# compiler to be in ANSI C mode if it defines @code{__STDC__} to 1 and
--# handles function prototypes correctly.
--#
--# Patched by monty to only check if __STDC__ is defined. With the original
--# check it's impossible to get things to work with the Sunpro compiler from
--# Workshop 4.2
--#
--# If you use this macro, you should check after calling it whether the C
--# compiler has been set to accept ANSI C; if not, the shell variable
--# @code{am_cv_prog_cc_stdc} is set to @samp{no}. If you wrote your source
--# code in ANSI C, you can make an un-ANSIfied copy of it by using the
--# program @code{ansi2knr}, which comes with Ghostscript.
--# @end defmac
--
--AC_DEFUN(AM_PROG_CC_STDC,
--[AC_REQUIRE([AC_PROG_CC])
--AC_MSG_CHECKING(for ${CC-cc} option to accept ANSI C)
--AC_CACHE_VAL(am_cv_prog_cc_stdc,
--[am_cv_prog_cc_stdc=no
--ac_save_CC="$CC"
--# Don't try gcc -ansi; that turns off useful extensions and
--# breaks some systems' header files.
--# AIX -qlanglvl=ansi
--# Ultrix and OSF/1 -std1
--# HP-UX -Aa -D_HPUX_SOURCE
--# SVR4 -Xc -D__EXTENSIONS__
--# removed "-Xc -D__EXTENSIONS__" beacause sun c++ does not like it.
--for ac_arg in "" -qlanglvl=ansi -std1 "-Aa -D_HPUX_SOURCE"
--do
-- CC="$ac_save_CC $ac_arg"
-- AC_TRY_COMPILE(
--[#if !defined(__STDC__)
--choke me
--#endif
--/* DYNIX/ptx V4.1.3 can't compile sys/stat.h with -Xc -D__EXTENSIONS__. */
--#ifdef _SEQUENT_
--# include <sys/types.h>
--# include <sys/stat.h>
--#endif
--], [
--int test (int i, double x);
--struct s1 {int (*f) (int a);};
--struct s2 {int (*f) (double a);};],
--[am_cv_prog_cc_stdc="$ac_arg"; break])
--done
--CC="$ac_save_CC"
--])
--AC_MSG_RESULT($am_cv_prog_cc_stdc)
--case "x$am_cv_prog_cc_stdc" in
-- x|xno) ;;
-- *) CC="$CC $am_cv_prog_cc_stdc" ;;
--esac
--])
--
--#
--# Check to make sure that the build environment is sane.
--#
--
--AC_DEFUN(AM_SANITY_CHECK,
--[AC_MSG_CHECKING([whether build environment is sane])
--sleep 1
--echo timestamp > conftestfile
--# Do this in a subshell so we don't clobber the current shell's
--# arguments. FIXME: maybe try `-L' hack like GETLOADAVG test?
--if (set X `ls -t $srcdir/configure conftestfile`; test "[$]2" = conftestfile)
--then
-- # Ok.
-- :
--else
-- AC_MSG_ERROR([newly created file is older than distributed files!
--Check your system clock])
--fi
--rm -f conftest*
--AC_MSG_RESULT(yes)])
--
- # Orginal from bash-2.0 aclocal.m4, Changed to use termcap last by monty.
-
--AC_DEFUN(MYSQL_CHECK_LIB_TERMCAP,
-+AC_DEFUN([MYSQL_CHECK_LIB_TERMCAP],
- [
- AC_CACHE_VAL(mysql_cv_termcap_lib,
- [AC_CHECK_LIB(ncurses, tgetent, mysql_cv_termcap_lib=libncurses,
-@@ -359,7 +276,7 @@
- ])
-
- dnl Check type of signal routines (posix, 4.2bsd, 4.1bsd or v7)
--AC_DEFUN(MYSQL_SIGNAL_CHECK,
-+AC_DEFUN([MYSQL_SIGNAL_CHECK],
- [AC_REQUIRE([AC_TYPE_SIGNAL])
- AC_MSG_CHECKING(for type of signal functions)
- AC_CACHE_VAL(mysql_cv_signal_vintage,
-@@ -398,7 +315,7 @@
- fi
- ])
-
--AC_DEFUN(MYSQL_CHECK_GETPW_FUNCS,
-+AC_DEFUN([MYSQL_CHECK_GETPW_FUNCS],
- [AC_MSG_CHECKING(whether programs are able to redeclare getpw functions)
- AC_CACHE_VAL(mysql_cv_can_redecl_getpw,
- [AC_TRY_COMPILE([#include <sys/types.h>
-@@ -411,7 +328,7 @@
- fi
- ])
-
--AC_DEFUN(MYSQL_HAVE_TIOCGWINSZ,
-+AC_DEFUN([MYSQL_HAVE_TIOCGWINSZ],
- [AC_MSG_CHECKING(for TIOCGWINSZ in sys/ioctl.h)
- AC_CACHE_VAL(mysql_cv_tiocgwinsz_in_ioctl,
- [AC_TRY_COMPILE([#include <sys/types.h>
-@@ -423,7 +340,7 @@
- fi
- ])
-
--AC_DEFUN(MYSQL_HAVE_FIONREAD,
-+AC_DEFUN([MYSQL_HAVE_FIONREAD],
- [AC_MSG_CHECKING(for FIONREAD in sys/ioctl.h)
- AC_CACHE_VAL(mysql_cv_fionread_in_ioctl,
- [AC_TRY_COMPILE([#include <sys/types.h>
-@@ -435,7 +352,7 @@
- fi
- ])
-
--AC_DEFUN(MYSQL_HAVE_TIOCSTAT,
-+AC_DEFUN([MYSQL_HAVE_TIOCSTAT],
- [AC_MSG_CHECKING(for TIOCSTAT in sys/ioctl.h)
- AC_CACHE_VAL(mysql_cv_tiocstat_in_ioctl,
- [AC_TRY_COMPILE([#include <sys/types.h>
-@@ -447,7 +364,7 @@
- fi
- ])
-
--AC_DEFUN(MYSQL_STRUCT_DIRENT_D_INO,
-+AC_DEFUN([MYSQL_STRUCT_DIRENT_D_INO],
- [AC_REQUIRE([AC_HEADER_DIRENT])
- AC_MSG_CHECKING(if struct dirent has a d_ino member)
- AC_CACHE_VAL(mysql_cv_dirent_has_dino,
-@@ -480,7 +397,7 @@
- fi
- ])
-
--AC_DEFUN(MYSQL_TYPE_SIGHANDLER,
-+AC_DEFUN([MYSQL_TYPE_SIGHANDLER],
- [AC_MSG_CHECKING([whether signal handlers are of type void])
- AC_CACHE_VAL(mysql_cv_void_sighandler,
- [AC_TRY_COMPILE([#include <sys/types.h>
-@@ -499,7 +416,7 @@
- fi
- ])
-
--AC_DEFUN(MYSQL_CXX_BOOL,
-+AC_DEFUN([MYSQL_CXX_BOOL],
- [
- AC_REQUIRE([AC_PROG_CXX])
- AC_MSG_CHECKING(if ${CXX} supports bool types)
-@@ -518,7 +435,7 @@
- fi
- ])dnl
-
--AC_DEFUN(MYSQL_STACK_DIRECTION,
-+AC_DEFUN([MYSQL_STACK_DIRECTION],
- [AC_CACHE_CHECK(stack direction for C alloca, ac_cv_c_stack_direction,
- [AC_TRY_RUN([find_stack_direction ()
- {
-@@ -540,7 +457,7 @@
- AC_DEFINE_UNQUOTED(STACK_DIRECTION, $ac_cv_c_stack_direction)
- ])dnl
-
--AC_DEFUN(MYSQL_FUNC_ALLOCA,
-+AC_DEFUN([MYSQL_FUNC_ALLOCA],
- [
- # Since we have heard that alloca fails on IRIX never define it on a
- # SGI machine
-@@ -609,7 +526,7 @@
- fi
- ])
-
--AC_DEFUN(MYSQL_CHECK_LONGLONG_TO_FLOAT,
-+AC_DEFUN([MYSQL_CHECK_LONGLONG_TO_FLOAT],
- [
- AC_MSG_CHECKING(if conversion of longlong to float works)
- AC_CACHE_VAL(ac_cv_conv_longlong_to_float,
-@@ -1019,568 +936,3 @@
- dnl ---------------------------------------------------------------------------
- dnl END OF MYSQL_CHECK_GEMINI SECTION
- dnl ---------------------------------------------------------------------------
--
--dnl ---------------------------------------------------------------------------
--dnl Got this from the GNU tar 1.13.11 distribution
--dnl by Paul Eggert <eggert@twinsun.com>
--dnl ---------------------------------------------------------------------------
--
--dnl By default, many hosts won't let programs access large files;
--dnl one must use special compiler options to get large-file access to work.
--dnl For more details about this brain damage please see:
--dnl http://www.sas.com/standards/large.file/x_open.20Mar96.html
--
--dnl Written by Paul Eggert <eggert@twinsun.com>.
--
--dnl Internal subroutine of AC_SYS_LARGEFILE.
--dnl AC_SYS_LARGEFILE_FLAGS(FLAGSNAME)
--AC_DEFUN(AC_SYS_LARGEFILE_FLAGS,
-- [AC_CACHE_CHECK([for $1 value to request large file support],
-- ac_cv_sys_largefile_$1,
-- [if ($GETCONF LFS_$1) >conftest.1 2>conftest.2 && test ! -s conftest.2
-- then
-- ac_cv_sys_largefile_$1=`cat conftest.1`
-- else
-- ac_cv_sys_largefile_$1=no
-- ifelse($1, CFLAGS,
-- [case "$host_os" in
-- # HP-UX 10.20 requires -D__STDC_EXT__ with gcc 2.95.1.
--changequote(, )dnl
-- hpux10.[2-9][0-9]* | hpux1[1-9]* | hpux[2-9][0-9]*)
--changequote([, ])dnl
-- if test "$GCC" = yes; then
-- ac_cv_sys_largefile_CFLAGS=-D__STDC_EXT__
-- fi
-- ;;
-- # IRIX 6.2 and later require cc -n32.
--changequote(, )dnl
-- irix6.[2-9]* | irix6.1[0-9]* | irix[7-9].* | irix[1-9][0-9]*)
--changequote([, ])dnl
-- if test "$GCC" != yes; then
-- ac_cv_sys_largefile_CFLAGS=-n32
-- fi
-- esac
-- if test "$ac_cv_sys_largefile_CFLAGS" != no; then
-- ac_save_CC="$CC"
-- CC="$CC $ac_cv_sys_largefile_CFLAGS"
-- AC_TRY_LINK(, , , ac_cv_sys_largefile_CFLAGS=no)
-- CC="$ac_save_CC"
-- fi])
-- fi
-- rm -f conftest*])])
--
--dnl Internal subroutine of AC_SYS_LARGEFILE.
--dnl AC_SYS_LARGEFILE_SPACE_APPEND(VAR, VAL)
--AC_DEFUN(AC_SYS_LARGEFILE_SPACE_APPEND,
-- [case $2 in
-- no) ;;
-- ?*)
-- case "[$]$1" in
-- '') $1=$2 ;;
-- *) $1=[$]$1' '$2 ;;
-- esac ;;
-- esac])
--
--dnl Internal subroutine of AC_SYS_LARGEFILE.
--dnl AC_SYS_LARGEFILE_MACRO_VALUE(C-MACRO, CACHE-VAR, COMMENT, CODE-TO-SET-DEFAULT)
--AC_DEFUN(AC_SYS_LARGEFILE_MACRO_VALUE,
-- [AC_CACHE_CHECK([for $1], $2,
-- [$2=no
--changequote(, )dnl
-- $4
-- for ac_flag in $ac_cv_sys_largefile_CFLAGS no; do
-- case "$ac_flag" in
-- -D$1)
-- $2=1 ;;
-- -D$1=*)
-- $2=`expr " $ac_flag" : '[^=]*=\(.*\)'` ;;
-- esac
-- done
--changequote([, ])dnl
-- ])
-- if test "[$]$2" != no; then
-- AC_DEFINE_UNQUOTED([$1], [$]$2, [$3])
-- fi])
--
--AC_DEFUN(MYSQL_SYS_LARGEFILE,
-- [AC_REQUIRE([AC_CANONICAL_HOST])
-- AC_ARG_ENABLE(largefile,
-- [ --disable-largefile Omit support for large files])
-- if test "$enable_largefile" != no; then
-- AC_CHECK_TOOL(GETCONF, getconf)
-- AC_SYS_LARGEFILE_FLAGS(CFLAGS)
-- AC_SYS_LARGEFILE_FLAGS(LDFLAGS)
-- AC_SYS_LARGEFILE_FLAGS(LIBS)
--
-- for ac_flag in $ac_cv_sys_largefile_CFLAGS no; do
-- case "$ac_flag" in
-- no) ;;
-- -D_FILE_OFFSET_BITS=*) ;;
-- -D_LARGEFILE_SOURCE | -D_LARGEFILE_SOURCE=*) ;;
-- -D_LARGE_FILES | -D_LARGE_FILES=*) ;;
-- -D?* | -I?*)
-- AC_SYS_LARGEFILE_SPACE_APPEND(CPPFLAGS, "$ac_flag") ;;
-- *)
-- AC_SYS_LARGEFILE_SPACE_APPEND(CFLAGS, "$ac_flag") ;;
-- esac
-- done
-- AC_SYS_LARGEFILE_SPACE_APPEND(LDFLAGS, "$ac_cv_sys_largefile_LDFLAGS")
-- AC_SYS_LARGEFILE_SPACE_APPEND(LIBS, "$ac_cv_sys_largefile_LIBS")
-- AC_SYS_LARGEFILE_MACRO_VALUE(_FILE_OFFSET_BITS,
-- ac_cv_sys_file_offset_bits,
-- [Number of bits in a file offset, on hosts where this is settable.],
-- [case "$host_os" in
-- # HP-UX 10.20 and later
-- hpux10.[2-9][0-9]* | hpux1[1-9]* | hpux[2-9][0-9]*)
-- ac_cv_sys_file_offset_bits=64 ;;
-- esac])
-- AC_SYS_LARGEFILE_MACRO_VALUE(_LARGEFILE_SOURCE,
-- ac_cv_sys_largefile_source,
-- [Define to make fseeko etc. visible, on some hosts.],
-- [case "$host_os" in
-- # HP-UX 10.20 and later
-- hpux10.[2-9][0-9]* | hpux1[1-9]* | hpux[2-9][0-9]*)
-- ac_cv_sys_largefile_source=1 ;;
-- esac])
-- AC_SYS_LARGEFILE_MACRO_VALUE(_LARGE_FILES,
-- ac_cv_sys_large_files,
-- [Define for large files, on AIX-style hosts.],
-- [case "$host_os" in
-- # AIX 4.2 and later
-- aix4.[2-9]* | aix4.1[0-9]* | aix[5-9].* | aix[1-9][0-9]*)
-- ac_cv_sys_large_files=1 ;;
-- esac])
-- fi
-- ])
--
--
--## libtool.m4 - Configure libtool for the target system. -*-Shell-script-*-
--## Copyright (C) 1996-1999 Free Software Foundation, Inc.
--## Originally by Gordon Matzigkeit <gord@gnu.ai.mit.edu>, 1996
--##
--## 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.
--##
--## As a special exception to the GNU General Public License, if you
--## distribute this file as part of a program that contains a
--## configuration script generated by Autoconf, you may include it under
--## the same distribution terms that you use for the rest of that program.
--
--# serial 40 AC_PROG_LIBTOOL
--AC_DEFUN(AC_PROG_LIBTOOL,
--[AC_REQUIRE([AC_LIBTOOL_SETUP])dnl
--
--# Save cache, so that ltconfig can load it
--AC_CACHE_SAVE
--
--# Actually configure libtool. ac_aux_dir is where install-sh is found.
--CC="$CC" CFLAGS="$CFLAGS" CPPFLAGS="$CPPFLAGS" \
--LD="$LD" LDFLAGS="$LDFLAGS" LIBS="$LIBS" \
--LN_S="$LN_S" NM="$NM" RANLIB="$RANLIB" \
--DLLTOOL="$DLLTOOL" AS="$AS" OBJDUMP="$OBJDUMP" \
--${CONFIG_SHELL-/bin/sh} $ac_aux_dir/ltconfig --no-reexec \
--$libtool_flags --no-verify $ac_aux_dir/ltmain.sh $lt_target \
--|| AC_MSG_ERROR([libtool configure failed])
--
--# Reload cache, that may have been modified by ltconfig
--AC_CACHE_LOAD
--
--# This can be used to rebuild libtool when needed
--LIBTOOL_DEPS="$ac_aux_dir/ltconfig $ac_aux_dir/ltmain.sh"
--
--# Always use our own libtool.
--LIBTOOL='$(SHELL) $(top_builddir)/libtool'
--AC_SUBST(LIBTOOL)dnl
--
--# Redirect the config.log output again, so that the ltconfig log is not
--# clobbered by the next message.
--exec 5>>./config.log
--])
--
--AC_DEFUN(AC_LIBTOOL_SETUP,
--[AC_PREREQ(2.13)dnl
--AC_REQUIRE([AC_ENABLE_SHARED])dnl
--AC_REQUIRE([AC_ENABLE_STATIC])dnl
--AC_REQUIRE([AC_ENABLE_FAST_INSTALL])dnl
--AC_REQUIRE([AC_CANONICAL_HOST])dnl
--AC_REQUIRE([AC_CANONICAL_BUILD])dnl
--AC_REQUIRE([AC_PROG_RANLIB])dnl
--AC_REQUIRE([AC_PROG_CC])dnl
--AC_REQUIRE([AC_PROG_LD])dnl
--AC_REQUIRE([AC_PROG_NM])dnl
--AC_REQUIRE([AC_PROG_LN_S])dnl
--dnl
--
--case "$target" in
--NONE) lt_target="$host" ;;
--*) lt_target="$target" ;;
--esac
--
--# Check for any special flags to pass to ltconfig.
--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"
--test "$ac_cv_prog_gcc" = yes && libtool_flags="$libtool_flags --with-gcc"
--test "$ac_cv_prog_gnu_ld" = yes && libtool_flags="$libtool_flags --with-gnu-ld"
--ifdef([AC_PROVIDE_AC_LIBTOOL_DLOPEN],
--[libtool_flags="$libtool_flags --enable-dlopen"])
--ifdef([AC_PROVIDE_AC_LIBTOOL_WIN32_DLL],
--[libtool_flags="$libtool_flags --enable-win32-dll"])
--AC_ARG_ENABLE(libtool-lock,
-- [ --disable-libtool-lock avoid locking (might break parallel builds)])
--test "x$enable_libtool_lock" = xno && libtool_flags="$libtool_flags --disable-lock"
--test x"$silent" = xyes && libtool_flags="$libtool_flags --silent"
--
--# Some flags need to be propagated to the compiler or linker for good
--# libtool support.
--case "$lt_target" in
--*-*-irix6*)
-- # Find out which ABI we are using.
-- echo '[#]line __oline__ "configure"' > conftest.$ac_ext
-- if AC_TRY_EVAL(ac_compile); then
-- case "`/usr/bin/file conftest.o`" in
-- *32-bit*)
-- LD="${LD-ld} -32"
-- ;;
-- *N32*)
-- LD="${LD-ld} -n32"
-- ;;
-- *64-bit*)
-- LD="${LD-ld} -64"
-- ;;
-- esac
-- fi
-- rm -rf conftest*
-- ;;
--
--*-*-sco3.2v5*)
-- # On SCO OpenServer 5, we need -belf to get full-featured binaries.
-- SAVE_CFLAGS="$CFLAGS"
-- CFLAGS="$CFLAGS -belf"
-- AC_CACHE_CHECK([whether the C compiler needs -belf], lt_cv_cc_needs_belf,
-- [AC_TRY_LINK([],[],[lt_cv_cc_needs_belf=yes],[lt_cv_cc_needs_belf=no])])
-- if test x"$lt_cv_cc_needs_belf" != x"yes"; then
-- # this is probably gcc 2.8.0, egcs 1.0 or newer; no need for -belf
-- CFLAGS="$SAVE_CFLAGS"
-- fi
-- ;;
--
--ifdef([AC_PROVIDE_AC_LIBTOOL_WIN32_DLL],
--[*-*-cygwin* | *-*-mingw*)
-- AC_CHECK_TOOL(DLLTOOL, dlltool, false)
-- AC_CHECK_TOOL(AS, as, false)
-- AC_CHECK_TOOL(OBJDUMP, objdump, false)
-- ;;
--])
--esac
--])
--
--# AC_LIBTOOL_DLOPEN - enable checks for dlopen support
--AC_DEFUN(AC_LIBTOOL_DLOPEN, [AC_BEFORE([$0],[AC_LIBTOOL_SETUP])])
--
--# AC_LIBTOOL_WIN32_DLL - declare package support for building win32 dll's
--AC_DEFUN(AC_LIBTOOL_WIN32_DLL, [AC_BEFORE([$0], [AC_LIBTOOL_SETUP])])
--
--# AC_ENABLE_SHARED - implement the --enable-shared flag
--# Usage: AC_ENABLE_SHARED[(DEFAULT)]
--# Where DEFAULT is either `yes' or `no'. If omitted, it defaults to
--# `yes'.
--AC_DEFUN(AC_ENABLE_SHARED, [dnl
--define([AC_ENABLE_SHARED_DEFAULT], ifelse($1, no, no, yes))dnl
--AC_ARG_ENABLE(shared,
--changequote(<<, >>)dnl
--<< --enable-shared[=PKGS] build shared libraries [default=>>AC_ENABLE_SHARED_DEFAULT],
--changequote([, ])dnl
--[p=${PACKAGE-default}
--case "$enableval" in
--yes) enable_shared=yes ;;
--no) enable_shared=no ;;
--*)
-- enable_shared=no
-- # Look at the argument we got. We use all the common list separators.
-- IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS="${IFS}:,"
-- for pkg in $enableval; do
-- if test "X$pkg" = "X$p"; then
-- enable_shared=yes
-- fi
-- done
-- IFS="$ac_save_ifs"
-- ;;
--esac],
--enable_shared=AC_ENABLE_SHARED_DEFAULT)dnl
--])
--
--# AC_DISABLE_SHARED - set the default shared flag to --disable-shared
--AC_DEFUN(AC_DISABLE_SHARED, [AC_BEFORE([$0],[AC_LIBTOOL_SETUP])dnl
--AC_ENABLE_SHARED(no)])
--
--# AC_ENABLE_STATIC - implement the --enable-static flag
--# Usage: AC_ENABLE_STATIC[(DEFAULT)]
--# Where DEFAULT is either `yes' or `no'. If omitted, it defaults to
--# `yes'.
--AC_DEFUN(AC_ENABLE_STATIC, [dnl
--define([AC_ENABLE_STATIC_DEFAULT], ifelse($1, no, no, yes))dnl
--AC_ARG_ENABLE(static,
--changequote(<<, >>)dnl
--<< --enable-static[=PKGS] build static libraries [default=>>AC_ENABLE_STATIC_DEFAULT],
--changequote([, ])dnl
--[p=${PACKAGE-default}
--case "$enableval" in
--yes) enable_static=yes ;;
--no) enable_static=no ;;
--*)
-- enable_static=no
-- # Look at the argument we got. We use all the common list separators.
-- IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS="${IFS}:,"
-- for pkg in $enableval; do
-- if test "X$pkg" = "X$p"; then
-- enable_static=yes
-- fi
-- done
-- IFS="$ac_save_ifs"
-- ;;
--esac],
--enable_static=AC_ENABLE_STATIC_DEFAULT)dnl
--])
--
--# AC_DISABLE_STATIC - set the default static flag to --disable-static
--AC_DEFUN(AC_DISABLE_STATIC, [AC_BEFORE([$0],[AC_LIBTOOL_SETUP])dnl
--AC_ENABLE_STATIC(no)])
--
--
--# AC_ENABLE_FAST_INSTALL - implement the --enable-fast-install flag
--# Usage: AC_ENABLE_FAST_INSTALL[(DEFAULT)]
--# Where DEFAULT is either `yes' or `no'. If omitted, it defaults to
--# `yes'.
--AC_DEFUN(AC_ENABLE_FAST_INSTALL, [dnl
--define([AC_ENABLE_FAST_INSTALL_DEFAULT], ifelse($1, no, no, yes))dnl
--AC_ARG_ENABLE(fast-install,
--changequote(<<, >>)dnl
--<< --enable-fast-install[=PKGS] optimize for fast installation [default=>>AC_ENABLE_FAST_INSTALL_DEFAULT],
--changequote([, ])dnl
--[p=${PACKAGE-default}
--case "$enableval" in
--yes) enable_fast_install=yes ;;
--no) enable_fast_install=no ;;
--*)
-- enable_fast_install=no
-- # Look at the argument we got. We use all the common list separators.
-- IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS="${IFS}:,"
-- for pkg in $enableval; do
-- if test "X$pkg" = "X$p"; then
-- enable_fast_install=yes
-- fi
-- done
-- IFS="$ac_save_ifs"
-- ;;
--esac],
--enable_fast_install=AC_ENABLE_FAST_INSTALL_DEFAULT)dnl
--])
--
--# AC_ENABLE_FAST_INSTALL - set the default to --disable-fast-install
--AC_DEFUN(AC_DISABLE_FAST_INSTALL, [AC_BEFORE([$0],[AC_LIBTOOL_SETUP])dnl
--AC_ENABLE_FAST_INSTALL(no)])
--
--# AC_PROG_LD - find the path to the GNU or non-GNU linker
--AC_DEFUN(AC_PROG_LD,
--[AC_ARG_WITH(gnu-ld,
--[ --with-gnu-ld assume the C compiler uses GNU ld [default=no]],
--test "$withval" = no || with_gnu_ld=yes, with_gnu_ld=no)
--AC_REQUIRE([AC_PROG_CC])dnl
--AC_REQUIRE([AC_CANONICAL_HOST])dnl
--AC_REQUIRE([AC_CANONICAL_BUILD])dnl
--ac_prog=ld
--if test "$ac_cv_prog_gcc" = yes; then
-- # Check if gcc -print-prog-name=ld gives a path.
-- AC_MSG_CHECKING([for ld used by GCC])
-- ac_prog=`($CC -print-prog-name=ld) 2>&5`
-- case "$ac_prog" in
-- # Accept absolute paths.
--changequote(,)dnl
-- [\\/]* | [A-Za-z]:[\\/]*)
-- re_direlt='/[^/][^/]*/\.\./'
--changequote([,])dnl
-- # Canonicalize the path of ld
-- ac_prog=`echo $ac_prog| sed 's%\\\\%/%g'`
-- while echo $ac_prog | grep "$re_direlt" > /dev/null 2>&1; do
-- ac_prog=`echo $ac_prog| sed "s%$re_direlt%/%"`
-- done
-- test -z "$LD" && LD="$ac_prog"
-- ;;
-- "")
-- # If it fails, then pretend we aren't using GCC.
-- ac_prog=ld
-- ;;
-- *)
-- # If it is relative, then search for the first ld in PATH.
-- with_gnu_ld=unknown
-- ;;
-- esac
--elif test "$with_gnu_ld" = yes; then
-- AC_MSG_CHECKING([for GNU ld])
--else
-- AC_MSG_CHECKING([for non-GNU ld])
--fi
--AC_CACHE_VAL(ac_cv_path_LD,
--[if test -z "$LD"; then
-- IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS="${IFS}${PATH_SEPARATOR-:}"
-- for ac_dir in $PATH; do
-- test -z "$ac_dir" && ac_dir=.
-- if test -f "$ac_dir/$ac_prog" || test -f "$ac_dir/$ac_prog$ac_exeext"; then
-- ac_cv_path_LD="$ac_dir/$ac_prog"
-- # Check to see if the program is GNU ld. I'd rather use --version,
-- # but apparently some GNU ld's only accept -v.
-- # Break only if it was the GNU/non-GNU ld that we prefer.
-- if "$ac_cv_path_LD" -v 2>&1 < /dev/null | egrep '(GNU|with BFD)' > /dev/null; then
-- test "$with_gnu_ld" != no && break
-- else
-- test "$with_gnu_ld" != yes && break
-- fi
-- fi
-- done
-- IFS="$ac_save_ifs"
--else
-- ac_cv_path_LD="$LD" # Let the user override the test with a path.
--fi])
--LD="$ac_cv_path_LD"
--if test -n "$LD"; then
-- AC_MSG_RESULT($LD)
--else
-- AC_MSG_RESULT(no)
--fi
--test -z "$LD" && AC_MSG_ERROR([no acceptable ld found in \$PATH])
--AC_PROG_LD_GNU
--])
--
--AC_DEFUN(AC_PROG_LD_GNU,
--[AC_CACHE_CHECK([if the linker ($LD) is GNU ld], ac_cv_prog_gnu_ld,
--[# I'd rather use --version here, but apparently some GNU ld's only accept -v.
--if $LD -v 2>&1 </dev/null | egrep '(GNU|with BFD)' 1>&5; then
-- ac_cv_prog_gnu_ld=yes
--else
-- ac_cv_prog_gnu_ld=no
--fi])
--])
--
--# AC_PROG_NM - find the path to a BSD-compatible name lister
--AC_DEFUN(AC_PROG_NM,
--[AC_MSG_CHECKING([for BSD-compatible nm])
--AC_CACHE_VAL(ac_cv_path_NM,
--[if test -n "$NM"; then
-- # Let the user override the test.
-- ac_cv_path_NM="$NM"
--else
-- IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS="${IFS}${PATH_SEPARATOR-:}"
-- for ac_dir in $PATH /usr/ccs/bin /usr/ucb /bin; do
-- test -z "$ac_dir" && ac_dir=.
-- if test -f $ac_dir/nm || test -f $ac_dir/nm$ac_exeext ; then
-- # Check to see if the nm accepts a BSD-compat flag.
-- # Adding the `sed 1q' prevents false positives on HP-UX, which says:
-- # nm: unknown option "B" ignored
-- if ($ac_dir/nm -B /dev/null 2>&1 | sed '1q'; exit 0) | egrep /dev/null >/dev/null; then
-- ac_cv_path_NM="$ac_dir/nm -B"
-- break
-- elif ($ac_dir/nm -p /dev/null 2>&1 | sed '1q'; exit 0) | egrep /dev/null >/dev/null; then
-- ac_cv_path_NM="$ac_dir/nm -p"
-- break
-- else
-- ac_cv_path_NM=${ac_cv_path_NM="$ac_dir/nm"} # keep the first match, but
-- continue # so that we can try to find one that supports BSD flags
-- fi
-- fi
-- done
-- IFS="$ac_save_ifs"
-- test -z "$ac_cv_path_NM" && ac_cv_path_NM=nm
--fi])
--NM="$ac_cv_path_NM"
--AC_MSG_RESULT([$NM])
--])
--
--# AC_CHECK_LIBM - check for math library
--AC_DEFUN(AC_CHECK_LIBM,
--[AC_REQUIRE([AC_CANONICAL_HOST])dnl
--LIBM=
--case "$lt_target" in
--*-*-beos* | *-*-cygwin*)
-- # These system don't have libm
-- ;;
--*-ncr-sysv4.3*)
-- AC_CHECK_LIB(mw, _mwvalidcheckl, LIBM="-lmw")
-- AC_CHECK_LIB(m, main, LIBM="$LIBM -lm")
-- ;;
--*)
-- AC_CHECK_LIB(m, main, LIBM="-lm")
-- ;;
--esac
--])
--
--# 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.
--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'])
--])
--
--# 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.
--# 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,
-- [test x"$enable_ltdl_install" != xyes && enable_ltdl_install=no],
-- [if test x"$enable_ltdl_install" = xno; then
-- AC_MSG_WARN([libltdl not installed, but installation disabled])
-- else
-- enable_ltdl_install=yes
-- fi
-- ])
-- 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'])
-- else
-- ac_configure_args="$ac_configure_args --enable-ltdl-install=no"
-- LIBLTDL="-lltdl"
-- INCLTDL=
-- fi
--])
--
--dnl old names
--AC_DEFUN(AM_PROG_LIBTOOL, [indir([AC_PROG_LIBTOOL])])dnl
--AC_DEFUN(AM_ENABLE_SHARED, [indir([AC_ENABLE_SHARED], $@)])dnl
--AC_DEFUN(AM_ENABLE_STATIC, [indir([AC_ENABLE_STATIC], $@)])dnl
--AC_DEFUN(AM_DISABLE_SHARED, [indir([AC_DISABLE_SHARED], $@)])dnl
--AC_DEFUN(AM_DISABLE_STATIC, [indir([AC_DISABLE_STATIC], $@)])dnl
--AC_DEFUN(AM_PROG_LD, [indir([AC_PROG_LD])])dnl
--AC_DEFUN(AM_PROG_NM, [indir([AC_PROG_NM])])dnl
--
--dnl This is just to silence aclocal about the macro not being used
--ifelse([AC_DISABLE_FAST_INSTALL])dnl
+++ /dev/null
-diff -Nru mysql-3.23.49/Docs/Makefile.am mysql-3.23.49.new/Docs/Makefile.am
---- mysql-3.23.49/Docs/Makefile.am Tue Sep 11 14:28:23 2001
-+++ mysql-3.23.49.new/Docs/Makefile.am Tue Sep 11 14:19:11 2001
-@@ -11,7 +11,6 @@
-
- TEXI2HTML_FLAGS = -iso -number
- DVIPS = dvips
--MAKEINFO = @MAKEINFO@
- TEXINFO_TEX = Support/texinfo.tex
-
- noinst_SCRIPTS = Support/texi2html Support/generate-text-files.pl \
-@@ -55,7 +55,7 @@
- $(MAKEINFO) -I $(srcdir) --no-headers --no-split --output $@ $<
-
- manual.html: manual.texi include.texi $(srcdir)/Support/texi2html
-- cd $(srcdir) && @PERL@ $(srcdir)/Support/texi2html $(TEXI2HTML_FLAGS) $<
-+ cd $(srcdir) && $(PERL) $(srcdir)/Support/texi2html $(TEXI2HTML_FLAGS) $<
-
- manual_toc.html: manual.html
-
---- mysql-3.23.51/Makefile.am.orig Mon Jun 3 12:39:02 2002
-+++ mysql-3.23.51/Makefile.am Thu Jun 13 00:38:01 2002
-@@ -21,10 +21,10 @@
- # These are built from source in the Docs directory
- 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 os2
-+SUBDIRS = include $(docs_dirs) $(readline_dir) \
-+ $(thread_dirs) $(sql_client_dirs) \
-+ $(sql_server_dirs) scripts tests man \
-+ $(bench_dirs) support-files os2
-
- # Relink after clean
- CLEANFILES = linked_client_sources linked_server_sources linked_libmysql_sources linked_libmysql_r_sources linked_include_sources
-@@ -36,7 +36,7 @@
- cd include; $(MAKE) link_sources
- echo timestamp > linked_include_sources
-
--linked_client_sources: @linked_client_targets@
-+linked_client_sources: $(linked_client_targets)
- cd client; $(MAKE) link_sources
- echo timestamp > linked_client_sources
-
-@@ -50,7 +50,7 @@
-
- #avoid recursive make calls in sql directory
- linked_server_sources:
-- cd sql; rm -f mini_client_errors.c;@LN_CP_F@ ../libmysql/errmsg.c mini_client_errors.c
-+ cd sql; rm -f mini_client_errors.c;$(LN_CP_F) ../libmysql/errmsg.c mini_client_errors.c
- echo timestamp > linked_server_sources
-
- # Create permission databases
---- mysql-3.23.48/client/Makefile.am.orig Thu Feb 7 21:46:47 2002
-+++ mysql-3.23.48/client/Makefile.am Wed Feb 13 20:19:00 2002
-@@ -19,28 +19,18 @@
- INCLUDES = -I$(srcdir)/../include \
- -I../include -I$(srcdir)/.. -I$(top_srcdir) \
- -I..
--LIBS = @CLIENT_LIBS@
--LDADD = @CLIENT_EXTRA_LDFLAGS@ ../libmysql/libmysqlclient.la
-+LIBS = $(CLIENT_LIBS)
-+LDADD = $(CLIENT_EXTRA_LDFLAGS) ../libmysql/libmysqlclient.la
- bin_PROGRAMS = mysql mysqladmin mysqlcheck mysqlshow \
- mysqldump mysqlimport mysqltest mysqlbinlog
- noinst_PROGRAMS = insert_test select_test thread_test
- noinst_HEADERS = sql_string.h completion_hash.h my_readline.h \
- client_priv.h
- mysql_SOURCES = mysql.cc readline.cc sql_string.cc completion_hash.cc
--mysql_LDADD = @readline_link@ @TERMCAP_LIB@ $(LDADD) $(CXXLDFLAGS)
-+mysql_LDADD = $(readline_link) $(TERMCAP_LIB) $(LDADD) $(CXXLDFLAGS)
- mysqlbinlog_LDADD = $(LDADD) $(CXXLDFLAGS)
--mysql_DEPENDENCIES= $(LIBRARIES) $(pkglib_LTLIBRARIES)
--mysqladmin_DEPENDENCIES= $(LIBRARIES) $(pkglib_LTLIBRARIES)
--mysqlcheck_DEPENDENCIES= $(LIBRARIES) $(pkglib_LTLIBRARIES)
--mysqlshow_DEPENDENCIES= $(LIBRARIES) $(pkglib_LTLIBRARIES)
--mysqldump_DEPENDENCIES= $(LIBRARIES) $(pkglib_LTLIBRARIES)
--mysqlimport_DEPENDENCIES= $(LIBRARIES) $(pkglib_LTLIBRARIES)
--insert_test_DEPENDENCIES= $(LIBRARIES) $(pkglib_LTLIBRARIES)
--select_test_DEPENDENCIES= $(LIBRARIES) $(pkglib_LTLIBRARIES)
- mysqltest_SOURCES= mysqltest.c
--mysqltest_DEPENDENCIES= $(LIBRARIES) $(pkglib_LTLIBRARIES)
- mysqlbinlog_SOURCES = mysqlbinlog.cc
--mysqlbinlog_DEPENDENCIES= $(LIBRARIES) $(pkglib_LTLIBRARIES)
- sql_src=log_event.h log_event.cc
-
- # Fix for mit-threads
-@@ -49,11 +39,11 @@
- link_sources:
- for f in $(sql_src) ; do \
- rm -f $(srcdir)/$$f; \
-- @LN_CP_F@ $(top_srcdir)/sql/$$f $(srcdir)/$$f; \
-+ $(LN_CP_F) $(top_srcdir)/sql/$$f $(srcdir)/$$f; \
- done;
-
- thread_test.o: thread_test.c
-- $(COMPILE) -c @MT_INCLUDES@ $(INCLUDES) $<
-+ $(COMPILE) -c $(MT_INCLUDES) $(INCLUDES) $<
-
- # Don't update the files from bitkeeper
- %::SCCS/s.%
-diff -Nru mysql-3.23.49/configure.in mysql-3.23.49.new/configure.in
---- mysql-3.23.49/configure.in Tue Sep 11 14:28:24 2001
-+++ mysql-3.23.49.new/configure.in Tue Sep 11 14:19:11 2001
-@@ -83,6 +83,7 @@
- AC_SUBST(SAVE_LDFLAGS)
- AC_SUBST(SAVE_CXXLDFLAGS)
- AC_SUBST(CXXLDFLAGS)
-+AM_PROG_AS
-
- AC_PREREQ(2.12)dnl Minimum Autoconf version required.
-
-diff -Nru mysql-3.23.49/dbug/Makefile.am mysql-3.23.49.new/dbug/Makefile.am
---- mysql-3.23.49/dbug/Makefile.am Tue Sep 11 14:28:24 2001
-+++ mysql-3.23.49.new/dbug/Makefile.am Tue Sep 11 14:19:11 2001
-@@ -15,8 +15,8 @@
- # 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
-+INCLUDES = $(MT_INCLUDES) -I$(srcdir)/../include -I../include
-+LDADD = libdbug.a $(top_builddir)/strings/libmystrings.a
- pkglib_LIBRARIES = libdbug.a
- noinst_HEADERS = dbug_long.h
- libdbug_a_SOURCES = dbug.c sanity.c
-diff -Nru mysql-3.23.49/extra/Makefile.am mysql-3.23.49.new/extra/Makefile.am
---- mysql-3.23.49/extra/Makefile.am Tue Sep 11 14:28:24 2001
-+++ mysql-3.23.49.new/extra/Makefile.am Tue Sep 11 14:19:11 2001
-@@ -14,9 +14,11 @@
- # 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
-+INCLUDES = $(MT_INCLUDES) -I$(srcdir)/../include -I../include -I..
-+LDADD = $(CLIENT_EXTRA_LDFLAGS) \
-+ $(top_builddir)/mysys/libmysys.a \
-+ $(top_builddir)/dbug/libdbug.a \
-+ $(top_builddir)/strings/libmystrings.a
- bin_PROGRAMS = replace comp_err perror resolveip my_print_defaults \
- resolve_stack_dump
-
-diff -Nru mysql-3.23.49/heap/Makefile.am mysql-3.23.49.new/heap/Makefile.am
---- mysql-3.23.49/heap/Makefile.am Tue Sep 11 14:28:24 2001
-+++ mysql-3.23.49.new/heap/Makefile.am Tue Sep 11 14:19:11 2001
-@@ -14,13 +14,14 @@
- # 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
-+INCLUDES = $(MT_INCLUDES) -I$(srcdir)/../include -I../include
-+LDADD = libheap.a $(top_builddir)/mysys/libmysys.a \
-+ $(top_builddir)/dbug/libdbug.a \
-+ $(top_builddir)/strings/libmystrings.a
- pkglib_LIBRARIES = libheap.a
- noinst_PROGRAMS = hp_test1 hp_test2
--hp_test1_LDFLAGS = @NOINST_LDFLAGS@
--hp_test2_LDFLAGS = @NOINST_LDFLAGS@
-+hp_test1_LDFLAGS = $(NOINST_LDFLAGS)
-+hp_test2_LDFLAGS = $(NOINST_LDFLAGS)
- 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 \
-diff -Nru mysql-3.23.49/isam/Makefile.am mysql-3.23.49.new/isam/Makefile.am
---- mysql-3.23.49/isam/Makefile.am Tue Sep 11 14:28:24 2001
-+++ mysql-3.23.49.new/isam/Makefile.am Tue Sep 11 14:19:11 2001
-@@ -14,9 +14,11 @@
- # 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
-+INCLUDES = $(MT_INCLUDES) -I$(srcdir)/../include -I../include
-+LDADD = $(CLIENT_EXTRA_LDFLAGS) libnisam.a \
-+ $(top_builddir)/mysys/libmysys.a \
-+ $(top_builddir)/dbug/libdbug.a \
-+ $(top_builddir)/strings/libmystrings.a
- pkglib_LIBRARIES = libnisam.a
- bin_PROGRAMS = isamchk isamlog pack_isam
- isamchk_DEPENDENCIES= $(LIBRARIES)
---- mysql-3.23.52/libmysql/Makefile.am.orig Wed Aug 14 00:08:14 2002
-+++ mysql-3.23.52/libmysql/Makefile.am Sat Aug 17 09:20:46 2002
-@@ -18,8 +18,8 @@
- # This file is public domain and comes with NO WARRANTY of any kind
-
- target = libmysqlclient.la
--target_defs = -DUNDEF_THREADS_HACK -DDONT_USE_RAID @LIB_EXTRA_CCFLAGS@
--LIBS = @CLIENT_LIBS@
-+target_defs = -DUNDEF_THREADS_HACK -DDONT_USE_RAID $(LIB_EXTRA_CCFLAGS)
-+LIBS = $(CLIENT_LIBS)
- INCLUDES = -I$(srcdir)/../include -I../include \
- -I$(srcdir)/.. -I$(top_srcdir) -I..
-
-@@ -38,23 +38,23 @@
- ms=`echo $(mysysobjects) | sed "s;\.lo;.c;g"`; \
- for f in $$ss; do \
- rm -f $(srcdir)/$$f; \
-- @LN_CP_F@ $(srcdir)/../strings/$$f $(srcdir)/$$f; \
-+ $(LN_CP_F) $(srcdir)/../strings/$$f $(srcdir)/$$f; \
- done; \
- for f in $(mystringsextra); do \
- rm -f $(srcdir)/$$f; \
-- @LN_CP_F@ $(srcdir)/../strings/$$f $(srcdir)/$$f; \
-+ $(LN_CP_F) $(srcdir)/../strings/$$f $(srcdir)/$$f; \
- done; \
- for f in $(mystringsgen); do \
- rm -f $(srcdir)/$$f; \
-- @LN_CP_F@ ../strings/$$f $(srcdir)/$$f; \
-+ $(LN_CP_F) ../strings/$$f $(srcdir)/$$f; \
- done; \
- for f in $$ds; do \
- rm -f $(srcdir)/$$f; \
-- @LN_CP_F@ $(srcdir)/../dbug/$$f $(srcdir)/$$f; \
-+ $(LN_CP_F) $(srcdir)/../dbug/$$f $(srcdir)/$$f; \
- done; \
- for f in $$ms $(mysysheaders); do \
- rm -f $(srcdir)/$$f; \
-- @LN_CP_F@ $(srcdir)/../mysys/$$f $(srcdir)/$$f; \
-+ $(LN_CP_F) $(srcdir)/../mysys/$$f $(srcdir)/$$f; \
- done;
-
- # This part requires GNUmake
---- mysql-3.23.49/libmysql_r/Makefile.am Tue Sep 11 14:28:24 2001
-+++ mysql-3.23.49.new/libmysql_r/Makefile.am Tue Sep 11 14:19:11 2001
-@@ -19,9 +19,8 @@
-
- target = libmysqlclient_r.la
- target_defs = -DDONT_USE_RAID @LIB_EXTRA_CCFLAGS@
--## LIBS = @LIBS@
-
--INCLUDES = @MT_INCLUDES@ -I$(srcdir)/../include -I../include \
-+INCLUDES = $(MT_INCLUDES) -I$(srcdir)/../include -I../include \
- -I$(srcdir)/.. -I$(top_srcdir) -I..
-
- ## automake barfs if you don't use $(srcdir) or $(top_srcdir) in include
-@@ -38,5 +37,5 @@
- set -x; \
- for f in `cd $(libmysql_dir) && echo *.[ch]`; do \
- rm -f $(srcdir)/$$f; \
-- @LN_CP_F@ $(libmysql_dir)/$$f $(srcdir)/$$f; \
-+ $(LN_CP_F) $(libmysql_dir)/$$f $(srcdir)/$$f; \
- done
-diff -Nru mysql-3.23.49/merge/Makefile.am mysql-3.23.49.new/merge/Makefile.am
---- mysql-3.23.49/merge/Makefile.am Tue Sep 11 14:28:24 2001
-+++ mysql-3.23.49.new/merge/Makefile.am Tue Sep 11 14:19:11 2001
-@@ -14,7 +14,7 @@
- # 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
-+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 \
-diff -Nru mysql-3.23.49/myisam/Makefile.am mysql-3.23.49.new/myisam/Makefile.am
---- mysql-3.23.49/myisam/Makefile.am Tue Sep 11 14:28:24 2001
-+++ mysql-3.23.49.new/myisam/Makefile.am Tue Sep 11 14:19:11 2001
-@@ -17,9 +17,11 @@
- 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
-+INCLUDES = $(MT_INCLUDES) -I$(srcdir)/../include -I../include
-+LDADD = $(CLIENT_EXTRA_LDFLAGS) libmyisam.a \
-+ $(top_builddir)/mysys/libmysys.a \
-+ $(top_builddir)/dbug/libdbug.a \
-+ $(top_builddir)/strings/libmystrings.a
- pkglib_LIBRARIES = libmyisam.a
- bin_PROGRAMS = myisamchk myisamlog myisampack
- myisamchk_DEPENDENCIES= $(LIBRARIES)
-@@ -56,46 +58,46 @@
- SUFFIXES = .sh
-
- .sh:
-- @RM@ -f $@ $@-t
-- @SED@ \
-+ $(RM) -f $@ $@-t
-+ $(SED) \
- -e 's!@''bindir''@!$(bindir)!g' \
- -e 's!@''scriptdir''@!$(bindir)!g' \
- -e 's!@''prefix''@!$(prefix)!g' \
- -e 's!@''datadir''@!$(datadir)!g' \
- -e 's!@''localstatedir''@!$(localstatedir)!g' \
- -e 's!@''libexecdir''@!$(libexecdir)!g' \
-- -e 's!@''CC''@!@CC@!'\
-- -e 's!@''CXX''@!@CXX@!'\
-- -e 's!@''GXX''@!@GXX@!'\
-- -e 's!@''PERL''@!@PERL@!' \
-- -e 's!@''CFLAGS''@!@SAVE_CFLAGS@!'\
-- -e 's!@''CXXFLAGS''@!@SAVE_CXXFLAGS@!'\
-- -e 's!@''LDFLAGS''@!@SAVE_LDFLAGS@!'\
-- -e 's!@''VERSION''@!@VERSION@!' \
-- -e 's!@''MYSQL_SERVER_SUFFIX''@!@MYSQL_SERVER_SUFFIX@!' \
-- -e 's!@''COMPILATION_COMMENT''@!@COMPILATION_COMMENT@!' \
-- -e 's!@''MACHINE_TYPE''@!@MACHINE_TYPE@!' \
-- -e 's!@''HOSTNAME''@!@HOSTNAME@!' \
-- -e 's!@''SYSTEM_TYPE''@!@SYSTEM_TYPE@!' \
-- -e 's!@''CHECK_PID''@!@CHECK_PID@!' \
-- -e 's!@''FIND_PROC''@!@FIND_PROC@!' \
-- -e 's!@''MYSQLD_DEFAULT_SWITCHES''@!@MYSQLD_DEFAULT_SWITCHES@!' \
-- -e 's!@''MYSQL_UNIX_ADDR''@!@MYSQL_UNIX_ADDR@!' \
-- -e 's!@''IS_LINUX''@!@IS_LINUX@!' \
-- -e "s!@""CONF_COMMAND""@!@CONF_COMMAND@!" \
-- -e 's!@''MYSQLD_USER''@!@MYSQLD_USER@!' \
-- -e 's!@''sysconfdir''@!@sysconfdir@!' \
-- -e 's!@''SHORT_MYSQL_INTRO''@!@SHORT_MYSQL_INTRO@!' \
-- -e 's!@''SHARED_LIB_VERSION''@!@SHARED_LIB_VERSION@!' \
-- -e 's!@''MYSQL_BASE_VERSION''@!@MYSQL_BASE_VERSION@!' \
-- -e 's!@''MYSQL_NO_DASH_VERSION''@!@MYSQL_NO_DASH_VERSION@!' \
-- -e 's!@''MYSQL_TCP_PORT''@!@MYSQL_TCP_PORT@!' \
-- -e 's!@''PERL_DBI_VERSION''@!@PERL_DBI_VERSION@!' \
-- -e 's!@''PERL_DBD_VERSION''@!@PERL_DBD_VERSION@!' \
-- -e 's!@''PERL_DATA_DUMPER''@!@PERL_DATA_DUMPER@!' \
-+ -e 's!@''CC''@!$(CC)!'\
-+ -e 's!@''CXX''@!$(CXX)!'\
-+ -e 's!@''GXX''@!$(GXX)!'\
-+ -e 's!@''PERL''@!$(PERL)!' \
-+ -e 's!@''CFLAGS''@!$(SAVE_CFLAGS)!'\
-+ -e 's!@''CXXFLAGS''@!$(SAVE_CXXFLAGS)!'\
-+ -e 's!@''LDFLAGS''@!$(SAVE_LDFLAGS)!'\
-+ -e 's!@''VERSION''@!$(VERSION)!' \
-+ -e 's!@''MYSQL_SERVER_SUFFIX''@!$(MYSQL_SERVER_SUFFIX)!' \
-+ -e 's!@''COMPILATION_COMMENT''@!$(COMPILATION_COMMENT)!' \
-+ -e 's!@''MACHINE_TYPE''@!$(MACHINE_TYPE)!' \
-+ -e 's!@''HOSTNAME''@!$(HOSTNAME)!' \
-+ -e 's!@''SYSTEM_TYPE''@!$(SYSTEM_TYPE)!' \
-+ -e 's!@''CHECK_PID''@!$(CHECK_PID)!' \
-+ -e 's!@''FIND_PROC''@!$(FIND_PROC)!' \
-+ -e 's!@''MYSQLD_DEFAULT_SWITCHES''@!$(MYSQLD_DEFAULT_SWITCHES)!' \
-+ -e 's!@''MYSQL_UNIX_ADDR''@!$(MYSQL_UNIX_ADDR)!' \
-+ -e 's!@''IS_LINUX''@!$(IS_LINUX)!' \
-+ -e "s!@""CONF_COMMAND""@!$(CONF_COMMAND)!" \
-+ -e 's!@''MYSQLD_USER''@!$(MYSQLD_USER)!' \
-+ -e 's!@''sysconfdir''@!$(sysconfdir)!' \
-+ -e 's!@''SHORT_MYSQL_INTRO''@!$(SHORT_MYSQL_INTRO)!' \
-+ -e 's!@''SHARED_LIB_VERSION''@!$(SHARED_LIB_VERSION)!' \
-+ -e 's!@''MYSQL_BASE_VERSION''@!$(MYSQL_BASE_VERSION)!' \
-+ -e 's!@''MYSQL_NO_DASH_VERSION''@!$(MYSQL_NO_DASH_VERSION)!' \
-+ -e 's!@''MYSQL_TCP_PORT''@!$(MYSQL_TCP_PORT)!' \
-+ -e 's!@''PERL_DBI_VERSION''@!$(PERL_DBI_VERSION)!' \
-+ -e 's!@''PERL_DBD_VERSION''@!$(PERL_DBD_VERSION)!' \
-+ -e 's!@''PERL_DATA_DUMPER''@!$(PERL_DATA_DUMPER)!' \
- $< > $@-t
-- @CHMOD@ +x $@-t
-- @MV@ $@-t $@
-+ $(CHMOD) +x $@-t
-+ $(MV) $@-t $@
-
- # Don't update the files from bitkeeper
- %::SCCS/s.%
-diff -Nru mysql-3.23.49/myisammrg/Makefile.am mysql-3.23.49.new/myisammrg/Makefile.am
---- mysql-3.23.49/myisammrg/Makefile.am Tue Sep 11 14:28:24 2001
-+++ mysql-3.23.49.new/myisammrg/Makefile.am Tue Sep 11 14:19:11 2001
-@@ -14,7 +14,7 @@
- # 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
-+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 \
-diff -Nru mysql-3.23.49/mysql-test/Makefile.am mysql-3.23.49.new/mysql-test/Makefile.am
---- mysql-3.23.49/mysql-test/Makefile.am Tue Sep 11 14:28:24 2001
-+++ mysql-3.23.49.new/mysql-test/Makefile.am Tue Sep 11 14:19:11 2001
-@@ -48,8 +48,8 @@
- SUFFIXES = .sh
-
- .sh:
-- @RM@ -f $@ $@-t
-- @SED@ \
-+ $(RM) -f $@ $@-t
-+ $(SED) \
- -e 's!@''testdir''@!$(testdir)!g' \
- -e 's!@''bindir''@!$(bindir)!g' \
- -e 's!@''scriptdir''@!$(bindir)!g' \
-@@ -57,12 +57,12 @@
- -e 's!@''datadir''@!$(datadir)!g' \
- -e 's!@''localstatedir''@!$(localstatedir)!g' \
- -e 's!@''libexecdir''@!$(libexecdir)!g' \
-- -e 's!@''PERL''@!@PERL@!' \
-- -e 's!@''VERSION''@!@VERSION@!' \
-- -e 's!@''MYSQL_SERVER_SUFFIX''@!@MYSQL_SERVER_SUFFIX@!' \
-+ -e 's!@''PERL''@!$(PERL)!' \
-+ -e 's!@''VERSION''@!$(VERSION)!' \
-+ -e 's!@''MYSQL_SERVER_SUFFIX''@!$(MYSQL_SERVER_SUFFIX)!' \
- $< > $@-t
-- @CHMOD@ +x $@-t
-- @MV@ $@-t $@
-+ $(CHMOD) +x $@-t
-+ $(MV) $@-t $@
-
- # Don't update the files from bitkeeper
- %::SCCS/s.%
---- mysql-3.23.52/mysys/Makefile.am.orig Sat Aug 17 09:18:46 2002
-+++ mysql-3.23.52/mysys/Makefile.am Sat Aug 17 09:23:28 2002
-@@ -14,13 +14,10 @@
- # 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)
-+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 $(top_builddir)/dbug/libdbug.a \
-+ $(top_builddir)/strings/libmystrings.a
- noinst_HEADERS = mysys_priv.h my_static.h \
- my_os2cond.c my_os2dirsrch.c my_os2dirsrch.h \
- my_os2dlfcn.c my_os2file64.c my_os2mutex.c \
-@@ -53,53 +50,50 @@
- my_vsnprintf.c charset.c my_bitmap.c my_gethostbyname.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@
-+libmysys_a_LIBADD = $(THREAD_LOBJECTS)
- # test_fn removed 980815 since it not upp to date test_dir
--noinst_PROGRAMS = test_charset @THREAD_LPROGRAMS@
-+noinst_PROGRAMS = test_charset $(THREAD_LPROGRAMS)
- # test_dir_DEPENDENCIES= $(LIBRARIES)
- # testhash_DEPENDENCIES= $(LIBRARIES)
- test_charset_DEPENDENCIES= $(LIBRARIES)
- EXTRA_PROGRAMS =
- DEFS = -DDEFAULT_BASEDIR=\"$(prefix)\" \
-- -DDATADIR="\"$(MYSQLDATAdir)\"" \
-- -DDEFAULT_CHARSET_HOME="\"$(MYSQLBASEdir)\"" \
-- -DDATADIR="\"$(MYSQLDATAdir)\"" \
-- -DSHAREDIR="\"$(MYSQLSHAREdir)\"" \
-+ -DDEFAULT_CHARSET_HOME="\"$(prefix)\"" \
-+ -DSHAREDIR="\"$(pkgdatadir)\"" \
- @DEFS@
-
- libmysys_a_DEPENDENCIES= @THREAD_LOBJECTS@
-
--
- # I hope this always does the right thing. Otherwise this is only test programs
--FLAGS=$(DEFS) $(INCLUDES) $(CPPFLAGS) $(CFLAGS) @NOINST_LDFLAGS@
-+FLAGS=$(DEFS) $(INCLUDES) $(CPPFLAGS) $(CFLAGS) $(NOINST_LDFLAGS)
-
- #
- # The CP .. RM stuff is to avoid problems with some compilers (like alpha ccc)
- # which automaticly removes the object files you use to compile a final program
- #
-
--test_thr_alarm: thr_alarm.c $(LIBRARIES)
-+test_thr_alarm$(EXEEXT): thr_alarm.c $(LIBRARIES)
- $(CP) $(srcdir)/thr_alarm.c ./test_thr_alarm.c
- $(LINK) $(FLAGS) -DMAIN ./test_thr_alarm.c $(LDADD) $(LIBS)
- $(RM) -f ./test_thr_alarm.*
-
--test_thr_lock: thr_lock.c $(LIBRARIES)
-+test_thr_lock$(EXEEXT): thr_lock.c $(LIBRARIES)
- $(CP) $(srcdir)/thr_lock.c test_thr_lock.c
- $(LINK) $(FLAGS) -DMAIN ./test_thr_lock.c $(LDADD) $(LIBS)
- $(RM) -f ./test_thr_lock.*
-
--test_vsnprintf: my_vsnprintf.c $(LIBRARIES)
-+test_vsnprintf$(EXEEXT): my_vsnprintf.c $(LIBRARIES)
- $(CP) $(srcdir)/my_vsnprintf.c test_vsnprintf.c
- $(LINK) $(FLAGS) -DMAIN ./test_vsnprintf.c $(LDADD) $(LIBS)
- $(RM) -f test_vsnprintf.*
-
--test_dir: test_dir.c $(LIBRARIES)
-+test_dir$(EXEEXT): test_dir.c $(LIBRARIES)
- $(LINK) $(FLAGS) -DMAIN $(srcdir)/test_dir.c $(LDADD) $(LIBS)
-
--test_charset: test_charset.c $(LIBRARIES)
-+test_charset$(EXEEXT): test_charset.c $(LIBRARIES)
- $(LINK) $(FLAGS) -DMAIN $(srcdir)/test_charset.c $(LDADD) $(LIBS)
-
--testhash: testhash.c $(LIBRARIES)
-+testhash$(EXEEXT): testhash.c $(LIBRARIES)
- $(LINK) $(FLAGS) -DMAIN $(srcdir)/testhash.c $(LDADD) $(LIBS)
-
- # Don't update the files from bitkeeper
---- mysql-3.23.49/regex/Makefile.am Tue Sep 11 14:28:24 2001
-+++ mysql-3.23.49.new/regex/Makefile.am Tue Sep 11 14:19:11 2001
-@@ -15,7 +15,7 @@
- # Software Foundation, Inc., 59 Temple Place - Suite 330, Boston,
- # MA 02111-1307, USA
-
--INCLUDES = @MT_INCLUDES@ -I$(srcdir)/../include -I../include
-+INCLUDES = $(MT_INCLUDES) -I$(srcdir)/../include -I../include
- noinst_LIBRARIES = libregex.a
- LDADD = libregex.a ../strings/libmystrings.a
- noinst_HEADERS = cclass.h cname.h regex2.h utils.h engine.c regex.h
-diff -Nru mysql-3.23.49/scripts/Makefile.am mysql-3.23.49.new/scripts/Makefile.am
---- mysql-3.23.49/scripts/Makefile.am Tue Sep 11 14:28:24 2001
-+++ mysql-3.23.49.new/scripts/Makefile.am Tue Sep 11 14:19:11 2001
-@@ -76,8 +76,8 @@
- SUFFIXES = .sh
-
- .sh:
-- @RM@ -f $@ $@-t
-- @SED@ \
-+ $(RM) -f $@ $@-t
-+ $(SED) \
- -e 's!@''bindir''@!$(bindir)!g' \
- -e 's!@''sbindir''@!$(sbindir)!g' \
- -e 's!@''scriptdir''@!$(bindir)!g' \
-@@ -87,31 +87,31 @@
- -e 's!@''libexecdir''@!$(libexecdir)!g' \
- -e 's!@''pkglibdir''@!$(pkglibdir)!g' \
- -e 's!@''pkgincludedir''@!$(pkgincludedir)!g' \
-- -e 's!@''CC''@!@CC@!'\
-- -e 's!@''CXX''@!@CXX@!'\
-- -e 's!@''GXX''@!@GXX@!'\
-- -e 's!@''PERL''@!@PERL@!' \
-- -e 's!@''CFLAGS''@!@SAVE_CFLAGS@!'\
-- -e 's!@''CXXFLAGS''@!@SAVE_CXXFLAGS@!'\
-- -e 's!@''LDFLAGS''@!@SAVE_LDFLAGS@!'\
-- -e 's!@''CLIENT_LIBS''@!@CLIENT_LIBS@!' \
-- -e 's!@''VERSION''@!@VERSION@!' \
-- -e 's!@''MYSQL_SERVER_SUFFIX''@!@MYSQL_SERVER_SUFFIX@!' \
-- -e 's!@''COMPILATION_COMMENT''@!@COMPILATION_COMMENT@!' \
-- -e 's!@''MACHINE_TYPE''@!@MACHINE_TYPE@!' \
-- -e 's!@''HOSTNAME''@!@HOSTNAME@!' \
-- -e 's!@''SYSTEM_TYPE''@!@SYSTEM_TYPE@!' \
-- -e 's!@''CHECK_PID''@!@CHECK_PID@!' \
-- -e 's!@''FIND_PROC''@!@FIND_PROC@!' \
-- -e 's!@''MYSQLD_DEFAULT_SWITCHES''@!@MYSQLD_DEFAULT_SWITCHES@!' \
-- -e 's!@''MYSQL_UNIX_ADDR''@!@MYSQL_UNIX_ADDR@!' \
-- -e 's!@''MYSQL_TCP_PORT''@!@MYSQL_TCP_PORT@!' \
-- -e 's!@''IS_LINUX''@!@IS_LINUX@!' \
-- -e "s!@""CONF_COMMAND""@!@CONF_COMMAND@!" \
-- -e 's!@''MYSQLD_USER''@!@MYSQLD_USER@!' \
-+ -e 's!@''CC''@!$(CC)!'\
-+ -e 's!@''CXX''@!$(CXX)!'\
-+ -e 's!@''GXX''@!$(GXX)!'\
-+ -e 's!@''PERL''@!$(PERL)!' \
-+ -e 's!@''CFLAGS''@!$(SAVE_CFLAGS)!'\
-+ -e 's!@''CXXFLAGS''@!$(SAVE_CXXFLAGS)!'\
-+ -e 's!@''LDFLAGS''@!$(SAVE_LDFLAGS)!'\
-+ -e 's!@''CLIENT_LIBS''@!$(CLIENT_LIBS)!' \
-+ -e 's!@''VERSION''@!$(VERSION)!' \
-+ -e 's!@''MYSQL_SERVER_SUFFIX''@!$(MYSQL_SERVER_SUFFIX)!' \
-+ -e 's!@''COMPILATION_COMMENT''@!$(COMPILATION_COMMENT)!' \
-+ -e 's!@''MACHINE_TYPE''@!$(MACHINE_TYPE)!' \
-+ -e 's!@''HOSTNAME''@!$(HOSTNAME)!' \
-+ -e 's!@''SYSTEM_TYPE''@!$(SYSTEM_TYPE)!' \
-+ -e 's!@''CHECK_PID''@!$(CHECK_PID)!' \
-+ -e 's!@''FIND_PROC''@!$(FIND_PROC)!' \
-+ -e 's!@''MYSQLD_DEFAULT_SWITCHES''@!$(MYSQLD_DEFAULT_SWITCHES)!' \
-+ -e 's!@''MYSQL_UNIX_ADDR''@!$(MYSQL_UNIX_ADDR)!' \
-+ -e 's!@''MYSQL_TCP_PORT''@!$(MYSQL_TCP_PORT)!' \
-+ -e 's!@''IS_LINUX''@!$(IS_LINUX)!' \
-+ -e "s!@""CONF_COMMAND""@!$(CONF_COMMAND)!" \
-+ -e 's!@''MYSQLD_USER''@!$(MYSQLD_USER)!' \
- $< > $@-t
-- @CHMOD@ +x $@-t
-- @MV@ $@-t $@
-+ $(CHMOD) +x $@-t
-+ $(MV) $@-t $@
-
- # Don't update the files from bitkeeper
- %::SCCS/s.%
-diff -Nru mysql-3.23.49/sql/Makefile.am mysql-3.23.49.new/sql/Makefile.am
---- mysql-3.23.49/sql/Makefile.am Tue Sep 11 14:28:24 2001
-+++ mysql-3.23.49.new/sql/Makefile.am Tue Sep 11 14:19:11 2001
-@@ -20,16 +20,15 @@
- MYSQLDATAdir = $(localstatedir)
- MYSQLSHAREdir = $(pkgdatadir)
- MYSQLBASEdir= $(prefix)
--INCLUDES = @MT_INCLUDES@ \
-- @bdb_includes@ @innodb_includes@ @gemini_includes@ \
-+INCLUDES = $(MT_INCLUDES) \
-+ $(bdb_includes) $(innodb_includes) $(gemini_includes) \
- -I$(srcdir)/../include \
- -I$(srcdir)/../regex \
- -I$(srcdir) -I../include -I.. -I.
--WRAPLIBS= @WRAPLIBS@
- SUBDIRS = share
- libexec_PROGRAMS = mysqld
- noinst_PROGRAMS = gen_lex_hash
--gen_lex_hash_LDFLAGS = @NOINST_LDFLAGS@
-+gen_lex_hash_LDFLAGS = $(NOINST_LDFLAGS)
- LDADD = ../isam/libnisam.a \
- ../merge/libmerge.a \
- ../myisam/libmyisam.a \
-@@ -39,9 +38,9 @@
- ../dbug/libdbug.a \
- ../regex/libregex.a \
- ../strings/libmystrings.a
--mysqld_LDADD = @MYSQLD_EXTRA_LDFLAGS@ \
-- @bdb_libs@ @innodb_libs@ @gemini_libs@ \
-- $(LDADD) $(CXXLDFLAGS) $(WRAPLIBS) @LIBDL@
-+mysqld_LDADD = $(MYSQLD_EXTRA_LDFLAGS) \
-+ $(bdb_libs) $(innodb_libs) $(gemini_libs) \
-+ $(LDADD) $(CXXLDFLAGS) $(WRAPLIBS) $(LIBDL)
- 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 \
-@@ -95,7 +94,7 @@
-
- link_sources:
- rm -f mini_client_errors.c
-- @LN_CP_F@ ../libmysql/errmsg.c mini_client_errors.c
-+ $(LN_CP_F) ../libmysql/errmsg.c mini_client_errors.c
-
- gen_lex_hash.o: gen_lex_hash.cc lex.h
- $(CXXCOMPILE) -c $(INCLUDES) $<
---- mysql-3.23.51/sql/share/Makefile.am.orig Mon Jun 3 12:39:02 2002
-+++ mysql-3.23.51/sql/share/Makefile.am Thu Jun 13 00:39:27 2002
-@@ -1,7 +1,7 @@
- ## Process this file with automake to create Makefile.in
-
- dist-hook:
-- for dir in charsets @AVAILABLE_LANGUAGES@; do \
-+ for dir in charsets $(AVAILABLE_LANGUAGES); do \
- test -d $(distdir)/$$dir || mkdir $(distdir)/$$dir; \
- $(INSTALL_DATA) $(srcdir)/$$dir/*.* $(distdir)/$$dir; \
- done; \
-@@ -9,13 +9,13 @@
- $(INSTALL_DATA) $(srcdir)/charsets/README $(distdir)/charsets
- $(INSTALL_DATA) $(srcdir)/charsets/Index $(distdir)/charsets
-
--all: @AVAILABLE_LANGUAGES_ERRORS@
-+all: $(AVAILABLE_LANGUAGES_ERRORS)
-
- # this is ugly, but portable
--@AVAILABLE_LANGUAGES_ERRORS_RULES@
-+$(AVAILABLE_LANGUAGES_ERRORS_RULES)
-
- install-data-local:
-- for lang in @AVAILABLE_LANGUAGES@; \
-+ for lang in $(AVAILABLE_LANGUAGES); \
- do \
- $(mkinstalldirs) $(DESTDIR)$(pkgdatadir)/$$lang; \
- $(INSTALL_DATA) $(srcdir)/$$lang/errmsg.sys \
---- mysql-3.23.49/sql-bench/Makefile.am Tue Sep 11 14:28:24 2001
-+++ mysql-3.23.49.new/sql-bench/Makefile.am Tue Sep 11 14:19:11 2001
-@@ -65,8 +65,8 @@
- SUFFIXES = .sh
-
- .sh:
-- @RM@ -f $@ $@-t
-- @SED@ \
-+ $(RM) -f $@ $@-t
-+ $(SED) \
- -e 's!@''benchdir''@!$(benchdir)!g' \
- -e 's!@''bindir''@!$(bindir)!g' \
- -e 's!@''scriptdir''@!$(bindir)!g' \
-@@ -74,12 +74,12 @@
- -e 's!@''datadir''@!$(datadir)!g' \
- -e 's!@''localstatedir''@!$(localstatedir)!g' \
- -e 's!@''libexecdir''@!$(libexecdir)!g' \
-- -e 's!@''PERL''@!@PERL@!' \
-- -e 's!@''VERSION''@!@VERSION@!' \
-- -e 's!@''MYSQL_SERVER_SUFFIX''@!@MYSQL_SERVER_SUFFIX@!' \
-+ -e 's!@''PERL''@!$(PERL)!' \
-+ -e 's!@''VERSION''@!$(VERSION)!' \
-+ -e 's!@''MYSQL_SERVER_SUFFIX''@!$(MYSQL_SERVER_SUFFIX)!' \
- $< > $@-t
-- @CHMOD@ +x $@-t
-- @MV@ $@-t $@
-+ $(CHMOD) +x $@-t
-+ $(MV) $@-t $@
-
- # Don't update the files from bitkeeper
- %::SCCS/s.%
-diff -Nru mysql-3.23.49/strings/Makefile.am mysql-3.23.49.new/strings/Makefile.am
---- mysql-3.23.49/strings/Makefile.am Tue Sep 11 14:28:24 2001
-+++ mysql-3.23.49.new/strings/Makefile.am Tue Sep 11 14:19:11 2001
-@@ -16,7 +16,7 @@
-
- # This file is public domain and comes with NO WARRANTY of any kind
-
--INCLUDES = @MT_INCLUDES@ -I$(srcdir)/../include -I../include
-+INCLUDES = $(MT_INCLUDES) -I$(srcdir)/../include -I../include
- pkglib_LIBRARIES = libmystrings.a
-
- # Exact one of ASSEMBLER_X
-@@ -53,20 +53,20 @@
- strinstr-sparc.s strmake-sparc.s strmov-sparc.s \
- strnmov-sparc.s strstr-sparc.s strxmov-sparc.s
-
--libmystrings_a_LIBADD= @CHARSET_OBJS@
-+libmystrings_a_LIBADD= $(CHARSET_OBJS)
- ctype.o: ctype_extra_sources.c
-
- ctype_extra_sources.c: conf_to_src
-- ./conf_to_src $(top_srcdir) @CHARSETS_NEED_SOURCE@ > \
-+ ./conf_to_src $(top_srcdir) $(CHARSETS_NEED_SOURCE) > \
- $(srcdir)/ctype_extra_sources.c
- conf_to_src_SOURCES = conf_to_src.c
- conf_to_src_LDADD=
- #force static linking of conf_to_src - essential when linking against
- #custom installation of libc
--conf_to_src_LDFLAGS= @NOINST_LDFLAGS@
-+conf_to_src_LDFLAGS= $(NOINST_LDFLAGS)
-
--# This is because the dependency tracking misses @FOO@ vars in sources.
--strtoull.o: @CHARSET_OBJS@
-+# This is because the dependency tracking misses $(FOO) vars in sources.
-+strtoull.o: $(CHARSET_OBJS)
-
- clean-local:
- rm -f ctype_extra_sources.c
-diff -Nru mysql-3.23.49/support-files/Makefile.am mysql-3.23.49.new/support-files/Makefile.am
---- mysql-3.23.49/support-files/Makefile.am Tue Sep 11 14:28:24 2001
-+++ mysql-3.23.49.new/support-files/Makefile.am Tue Sep 11 14:19:11 2001
-@@ -32,7 +32,7 @@
- my-large.cnf \
- my-huge.cnf \
- mysql-log-rotate \
-- mysql-@VERSION@.spec \
-+ mysql-$(VERSION).spec \
- binary-configure
-
- pkgdata_SCRIPTS = mysql.server
-@@ -42,21 +42,21 @@
- my-large.cnf \
- my-huge.cnf \
- mysql.spec \
-- mysql-@VERSION@.spec \
-+ mysql-$(VERSION).spec \
- mysql-log-rotate \
- mysql.server \
- binary-configure
-
-
--mysql-@VERSION@.spec: mysql.spec
-+mysql-$(VERSION).spec: mysql.spec
- rm -f $@
- cp mysql.spec $@
-
- SUFFIXES = .sh
-
- .sh:
-- @RM@ -f $@ $@-t
-- @SED@ \
-+ $(RM) -f $@ $@-t
-+ $(SED) \
- -e 's!@''bindir''@!$(bindir)!g' \
- -e 's!@''sbindir''@!$(sbindir)!g' \
- -e 's!@''scriptdir''@!$(bindir)!g' \
-@@ -64,37 +64,37 @@
- -e 's!@''datadir''@!$(datadir)!g' \
- -e 's!@''localstatedir''@!$(localstatedir)!g' \
- -e 's!@''libexecdir''@!$(libexecdir)!g' \
-- -e 's!@''CC''@!@CC@!'\
-- -e 's!@''CXX''@!@CXX@!'\
-- -e 's!@''GXX''@!@GXX@!'\
-- -e 's!@''PERL''@!@PERL@!' \
-- -e 's!@''CFLAGS''@!@SAVE_CFLAGS@!'\
-- -e 's!@''CXXFLAGS''@!@SAVE_CXXFLAGS@!'\
-- -e 's!@''LDFLAGS''@!@SAVE_LDFLAGS@!'\
-- -e 's!@''VERSION''@!@VERSION@!' \
-- -e 's!@''MYSQL_SERVER_SUFFIX''@!@MYSQL_SERVER_SUFFIX@!' \
-- -e 's!@''COMPILATION_COMMENT''@!@COMPILATION_COMMENT@!' \
-- -e 's!@''MACHINE_TYPE''@!@MACHINE_TYPE@!' \
-- -e 's!@''HOSTNAME''@!@HOSTNAME@!' \
-- -e 's!@''SYSTEM_TYPE''@!@SYSTEM_TYPE@!' \
-- -e 's!@''CHECK_PID''@!@CHECK_PID@!' \
-- -e 's!@''FIND_PROC''@!@FIND_PROC@!' \
-- -e 's!@''MYSQLD_DEFAULT_SWITCHES''@!@MYSQLD_DEFAULT_SWITCHES@!' \
-- -e 's!@''MYSQL_UNIX_ADDR''@!@MYSQL_UNIX_ADDR@!' \
-- -e 's!@''IS_LINUX''@!@IS_LINUX@!' \
-- -e "s!@""CONF_COMMAND""@!@CONF_COMMAND@!" \
-- -e 's!@''MYSQLD_USER''@!@MYSQLD_USER@!' \
-- -e 's!@''sysconfdir''@!@sysconfdir@!' \
-- -e 's!@''SHORT_MYSQL_INTRO''@!@SHORT_MYSQL_INTRO@!' \
-- -e 's!@''SHARED_LIB_VERSION''@!@SHARED_LIB_VERSION@!' \
-- -e 's!@''MYSQL_BASE_VERSION''@!@MYSQL_BASE_VERSION@!' \
-- -e 's!@''MYSQL_NO_DASH_VERSION''@!@MYSQL_NO_DASH_VERSION@!' \
-- -e 's!@''MYSQL_TCP_PORT''@!@MYSQL_TCP_PORT@!' \
-- -e 's!@''PERL_DBI_VERSION''@!@PERL_DBI_VERSION@!' \
-- -e 's!@''PERL_DBD_VERSION''@!@PERL_DBD_VERSION@!' \
-- -e 's!@''PERL_DATA_DUMPER''@!@PERL_DATA_DUMPER@!' \
-+ -e 's!@''CC''@!$(CC)!'\
-+ -e 's!@''CXX''@!$(CXX)!'\
-+ -e 's!@''GXX''@!$(GXX)!'\
-+ -e 's!@''PERL''@!$(PERL)!' \
-+ -e 's!@''CFLAGS''@!$(SAVE_CFLAGS)!'\
-+ -e 's!@''CXXFLAGS''@!$(SAVE_CXXFLAGS)!'\
-+ -e 's!@''LDFLAGS''@!$(SAVE_LDFLAGS)!'\
-+ -e 's!@''VERSION''@!$(VERSION)!' \
-+ -e 's!@''MYSQL_SERVER_SUFFIX''@!$(MYSQL_SERVER_SUFFIX)!' \
-+ -e 's!@''COMPILATION_COMMENT''@!$(COMPILATION_COMMENT)!' \
-+ -e 's!@''MACHINE_TYPE''@!$(MACHINE_TYPE)!' \
-+ -e 's!@''HOSTNAME''@!$(HOSTNAME)!' \
-+ -e 's!@''SYSTEM_TYPE''@!$(SYSTEM_TYPE)!' \
-+ -e 's!@''CHECK_PID''@!$(CHECK_PID)!' \
-+ -e 's!@''FIND_PROC''@!$(FIND_PROC)!' \
-+ -e 's!@''MYSQLD_DEFAULT_SWITCHES''@!$(MYSQLD_DEFAULT_SWITCHES)!' \
-+ -e 's!@''MYSQL_UNIX_ADDR''@!$(MYSQL_UNIX_ADDR)!' \
-+ -e 's!@''IS_LINUX''@!$(IS_LINUX)!' \
-+ -e "s!@""CONF_COMMAND""@!$(CONF_COMMAND)!" \
-+ -e 's!@''MYSQLD_USER''@!$(MYSQLD_USER)!' \
-+ -e 's!@''sysconfdir''@!$(sysconfdir)!' \
-+ -e 's!@''SHORT_MYSQL_INTRO''@!$(SHORT_MYSQL_INTRO)!' \
-+ -e 's!@''SHARED_LIB_VERSION''@!$(SHARED_LIB_VERSION)!' \
-+ -e 's!@''MYSQL_BASE_VERSION''@!$(MYSQL_BASE_VERSION)!' \
-+ -e 's!@''MYSQL_NO_DASH_VERSION''@!$(MYSQL_NO_DASH_VERSION)!' \
-+ -e 's!@''MYSQL_TCP_PORT''@!$(MYSQL_TCP_PORT)!' \
-+ -e 's!@''PERL_DBI_VERSION''@!$(PERL_DBI_VERSION)!' \
-+ -e 's!@''PERL_DBD_VERSION''@!$(PERL_DBD_VERSION)!' \
-+ -e 's!@''PERL_DATA_DUMPER''@!$(PERL_DATA_DUMPER)!' \
- $< > $@-t
-- @MV@ $@-t $@
-+ $(MV) $@-t $@
-
- # Don't update the files from bitkeeper
- %::SCCS/s.%
+++ /dev/null
---- mysql-3.23.49/libmysql_r/Makefile.am.amfix Fri May 11 13:38:18 2001
-+++ mysql-3.23.49/libmysql_r/Makefile.am Fri May 11 13:38:41 2001
-@@ -27,17 +27,6 @@
- ## automake barfs if you don't use $(srcdir) or $(top_srcdir) in include
- include $(top_srcdir)/libmysql/Makefile.shared
-
--# 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
--
- libmysql_dir = $(top_srcdir)/libmysql
-
- libmysqlclient_r_la_SOURCES = $(target_sources)
---- mysql-3.23.51/strings/Makefile.am.orig Mon Jun 3 12:39:02 2002
-+++ mysql-3.23.51/strings/Makefile.am Thu Jun 13 00:32:58 2002
-@@ -38,7 +38,7 @@
- endif
- endif
-
--libmystrings_a_SOURCES = @CHARSET_SRCS@ $(ASRCS) $(CSRCS)
-+libmystrings_a_SOURCES = $(ASRCS) $(CSRCS)
- noinst_PROGRAMS = conf_to_src
- # Default charset definitions
- EXTRA_DIST = ctype-big5.c ctype-czech.c ctype-euc_kr.c \
-@@ -55,15 +55,6 @@
- strnmov-sparc.s strstr-sparc.s strxmov-sparc.s \
- t_ctype.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
--
- libmystrings_a_LIBADD= @CHARSET_OBJS@
- ctype.o: ctype_extra_sources.c
-
---- mysql-3.23.49/dbug/Makefile.am.amfix Fri May 11 13:37:18 2001
-+++ mysql-3.23.49/dbug/Makefile.am Fri May 11 13:37:30 2001
-@@ -23,14 +23,6 @@
- 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
-
- # Must be linked with libs thta are not compiled yet
- extra_progs: factorial dbug_analyze
---- mysql-3.23.49/mysys/Makefile.am.amfix Fri May 11 13:39:28 2001
-+++ mysql-3.23.49/mysys/Makefile.am Fri May 11 13:39:43 2001
-@@ -65,14 +65,6 @@
-
- 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
-
- # I hope this always does the right thing. Otherwise this is only test programs
- FLAGS=$(DEFS) $(INCLUDES) $(CPPFLAGS) $(CFLAGS) @NOINST_LDFLAGS@
---- mysql-3.23.49/extra/Makefile.am.amfix Fri May 11 13:37:32 2001
-+++ mysql-3.23.49/extra/Makefile.am Fri May 11 13:37:41 2001
-@@ -20,14 +20,5 @@
- 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
--
- # Don't update the files from bitkeeper
- %::SCCS/s.%
---- mysql-3.23.49/regex/Makefile.am.amfix Fri May 11 13:39:43 2001
-+++ mysql-3.23.49/regex/Makefile.am Fri May 11 13:39:51 2001
-@@ -28,15 +28,6 @@
- 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
--
- test: re tests
- ./re < tests
- ./re -el < tests
---- mysql-3.23.49/isam/Makefile.am.amfix Fri May 11 13:37:52 2001
-+++ mysql-3.23.49/isam/Makefile.am Fri May 11 13:38:18 2001
-@@ -36,15 +36,6 @@
- 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
-
- # Move to automake rules ?
- prolint:; plparse -b -u -hF1 "-width(0,0)" "-format=%f:%l:\s%t:%n\s%m" \
---- mysql-3.23.49/merge/Makefile.am.amfix Fri May 11 13:38:41 2001
-+++ mysql-3.23.49/merge/Makefile.am Fri May 11 13:38:50 2001
-@@ -21,14 +21,5 @@
- 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
--
- # Don't update the files from bitkeeper
- %::SCCS/s.%
---- mysql-3.23.49/myisam/Makefile.am.amfix Fri May 11 13:38:50 2001
-+++ mysql-3.23.49/myisam/Makefile.am Fri May 11 13:39:13 2001
-@@ -48,17 +48,6 @@
- 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
-
- # Move to automake rules ?
- prolint:; plparse -b -u -hF1 "-width(0,0)" "-format=%f:%l:\s%t:%n\s%m" \
---- mysql-3.23.49/myisammrg/Makefile.am.amfix Fri May 11 13:39:13 2001
-+++ mysql-3.23.49/myisammrg/Makefile.am Fri May 11 13:39:28 2001
-@@ -22,14 +22,5 @@
- 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
--
- # Don't update the files from bitkeeper
- %::SCCS/s.%
---- mysql-3.23.49/heap/Makefile.am.amfix Fri May 11 13:37:43 2001
-+++ mysql-3.23.49/heap/Makefile.am Fri May 11 13:37:52 2001
-@@ -29,14 +29,5 @@
- 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
--
- # Don't update the files from bitkeeper
- %::SCCS/s.%
---- mysql-3.23.49/sql/Makefile.am.amfix Fri May 11 13:39:51 2001
-+++ mysql-3.23.49/sql/Makefile.am Fri May 11 13:40:18 2001
-@@ -93,16 +93,6 @@
- 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
--
- link_sources:
- rm -f mini_client_errors.c
- @LN_CP_F@ ../libmysql/errmsg.c mini_client_errors.c
projects / packages / mysql.git / commitdiff