Commit c6aa76a5 authored by lenz@mysql.com's avatar lenz@mysql.com
Browse files

Merge mysql.com:/my/mysql-4.0 into mysql.com:/my/mysql-4.0.spec

parents 6e2fe429 818af46d

BUILD/compile-pentium-max

+2 −1
Original line number Diff line number Diff line
@@ -8,6 +8,7 @@ extra_configs="$pentium_configs" 
strip=yes



extra_configs="$extra_configs --with-innodb --with-berkeley-db \

 --enable-thread-safe-client --with-openssl --with-vio"

	--with-embedded-server --enable-thread-safe-client \

	--with-openssl --with-vio"



. "$path/FINISH.sh"

Build-tools/Do-linux-build

+9 −1
Original line number Diff line number Diff line 
#! /bin/sh



set -e -x



# Only use the "--with-other-libc" parameter, if another libc actually

# exists, since this will also force static linking, which does not work

# together with OpenSSL

OTHER_LIBC_DIR=/usr/local/mysql-glibc

OTHER_LIBC=""

if [ -d OTHER_LIBC_DIR ] ; then

	OTHER_LIBC="--with-other-libc=$OTHER_LIBC_DIR"

fi



BUILD/compile-pentium-max --with-other-libc=$OTHER_LIBC_DIR \

BUILD/compile-pentium-max $OTHER_LIBC \

  --with-comment="Official MySQL Binary"  \

  --prefix=/usr/local/mysql --with-extra-charset=complex \

  --enable-thread-safe-client --enable-local-infile \

Makefile.am

+1 −1
Original line number Diff line number Diff line
@@ -17,7 +17,7 @@ 
# 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

configure.in

+3 −0
Original line number Diff line number Diff line
@@ -364,6 +364,9 @@ AC_PATH_PROG(SED, sed, sed) 
AC_PATH_PROG(CMP, cmp, cmp)

AC_PATH_PROG(CHMOD, chmod, chmod)

AC_PATH_PROG(HOSTNAME, hostname, hostname)

# Check for a GNU tar named 'gtar', fall back to 'tar' otherwise

# and hope that it's a GNU tar as well

AC_CHECK_PROGS(TAR, gtar tar)

dnl We use a path for perl so the script startup works

dnl We make sure to use perl, not perl5, in hopes that the RPMs will

dnl not depend on the perl5 binary being installed (probably a bug in RPM)

include/Makefile.am

+1 −1
Original line number Diff line number Diff line
@@ -18,7 +18,7 @@ 
BUILT_SOURCES =		mysql_version.h m_ctype.h my_config.h

pkginclude_HEADERS =	dbug.h m_string.h my_sys.h my_list.h \

			mysql.h mysql_com.h mysqld_error.h mysql_embed.h \

		        my_pthread.h my_no_pthread.h raid.h errmsg.h \

		  my_semaphore.h my_pthread.h my_no_pthread.h raid.h errmsg.h \

			my_global.h my_net.h my_alloc.h\

			sslopt-case.h sslopt-longopts.h sslopt-usage.h \

			sslopt-vars.h $(BUILT_SOURCES)