Commit bb4987f1 authored by unknown's avatar unknown
Browse files

my_memmem.c: 

  Back port of include change and copyright from 5.1
Makefile.am, zlib.m4:
  Use separate libtool convenience library for the bundled
  zlib to embed into executables and shared libraries created,
  and one to install into the pkglib directory


zlib/Makefile.am:
  Use separate libtool convenience library for the bundled
  zlib to embed into executables and shared libraries created,
  and one to install into the pkglib directory
config/ac-macros/zlib.m4:
  Use separate libtool convenience library for the bundled
  zlib to embed into executables and shared libraries created,
  and one to install into the pkglib directory
mysys/my_memmem.c:
  Back port of include change and copyright from 5.1
parent 38a12cc8

config/ac-macros/zlib.m4

+1 −1
Original line number Diff line number Diff line
@@ -2,7 +2,7 @@ dnl Define zlib paths to point at bundled zlib 


AC_DEFUN([MYSQL_USE_BUNDLED_ZLIB], [

ZLIB_INCLUDES="-I\$(top_srcdir)/zlib"

ZLIB_LIBS="\$(top_builddir)/zlib/libz.la"

ZLIB_LIBS="\$(top_builddir)/zlib/libzlt.la"

dnl Omit -L$pkglibdir as it's always in the list of mysql_config deps.

ZLIB_DEPS="-lz"

zlib_dir="zlib"

mysys/my_memmem.c

+17 −1
Original line number Diff line number Diff line 
#include "my_base.h"

/* Copyright (C) 2000 MySQL 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; version 2 of the License.



   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 */



#include <my_global.h>

#include <m_string.h>



/*

  my_memmem, port of a GNU extension.

zlib/Makefile.am

+9 −8
Original line number Diff line number Diff line
@@ -20,8 +20,8 @@ INCLUDES= -I$(top_builddir)/include -I$(top_srcdir)/include 
LIBS= $(NON_THREADED_LIBS)



pkglib_LTLIBRARIES = libz.la

noinst_LTLIBRARIES = libzlt.la



# We are never interested in a shared version

libz_la_LDFLAGS    = -static



noinst_HEADERS     = crc32.h deflate.h inffast.h inffixed.h inflate.h \
@@ -30,6 +30,7 @@ noinst_HEADERS= crc32.h deflate.h inffast.h inffixed.h inflate.h \ 
libz_la_SOURCES    = adler32.c compress.c crc32.c deflate.c gzio.c \

		     infback.c inffast.c inflate.c inftrees.c trees.c \

		     uncompr.c zutil.c

libzlt_la_SOURCES  = $(libz_la_SOURCES)



EXTRA_DIST= README FAQ INDEX ChangeLog algorithm.txt zlib.3 CMakeLists.txt