Commit e31358ae authored by unknown's avatar unknown
Browse files

Merge 


configure.in:
  SCCS merged
parents b890d3f5 e28bf9ef

BUILD/Makefile.am

+1 −0
Original line number Diff line number Diff line
@@ -29,6 +29,7 @@ EXTRA_DIST = FINISH.sh \ 
			compile-pentium-debug-max \

			compile-pentium-debug-no-bdb \

			compile-pentium-debug-openssl \

			compile-pentium-debug-yassl \

			compile-pentium-gcov \

			compile-pentium-gprof \

			compile-pentium-max \

BUILD/compile-pentium-debug-yassl

0 → 100755
+13 −0
Original line number Diff line number Diff line 
#! /bin/sh



path=`dirname $0`

. "$path/SETUP.sh"



extra_flags="$pentium_cflags $debug_cflags"

c_warnings="$c_warnings $debug_extra_warnings"

cxx_warnings="$cxx_warnings $debug_extra_warnings"

extra_configs="$pentium_configs $debug_configs"



extra_configs="$extra_configs  --with-debug=full --with-yassl"



. "$path/FINISH.sh"

Makefile.am

+1 −1
Original line number Diff line number Diff line
@@ -20,7 +20,7 @@ AUTOMAKE_OPTIONS = foreign 


# These are built from source in the Docs directory

EXTRA_DIST =		INSTALL-SOURCE README COPYING EXCEPTIONS-CLIENT

SUBDIRS =		. include @docs_dirs@ @zlib_dir@ \

SUBDIRS =		. include @docs_dirs@ @zlib_dir@ @yassl_dir@ \

			@readline_topdir@ sql-common \

			@thread_dirs@ pstack \

			@sql_union_dirs@ scripts man tests \

config/ac-macros/yassl.m4

0 → 100644
+33 −0
Original line number Diff line number Diff line 
AC_CONFIG_FILES(extra/yassl/Makefile dnl

extra/yassl/taocrypt/Makefile dnl

extra/yassl/taocrypt/src/Makefile dnl

extra/yassl/src/Makefile)



AC_DEFUN([MYSQL_CHECK_YASSL], [

  AC_MSG_CHECKING(for yaSSL)

  AC_ARG_WITH([yassl],

              [  --with-yassl          Include the yaSSL support],

              [yassl=yes],

              [yassl=no])



  if test "$yassl" = "yes"

  then

    if test "$openssl" != "no"

    then

      AC_MSG_ERROR([Cannot configure MySQL to use yaSSL and OpenSSL simultaneously.])

    fi

    AC_MSG_RESULT([using bundled yaSSL])

    yassl_dir="extra/yassl"

    openssl_libs="\

    \$(top_builddir)/extra/yassl/src/libyassl.a\

    \$(top_builddir)/extra/yassl/taocrypt/src/libtaocrypt.a"

    openssl_includes="-I\$(top_srcdir)/extra/yassl/include"

    AC_DEFINE([HAVE_OPENSSL], [1], [Defined by configure. Using yaSSL for OpenSSL emulation.])

  else

    yassl_dir=""

    AC_MSG_RESULT(no)

  fi

  AC_SUBST(openssl_libs)

  AC_SUBST(openssl_includes)

  AC_SUBST(yassl_dir)

])

configure.in

+2 −0
Original line number Diff line number Diff line
@@ -47,6 +47,7 @@ sinclude(config/ac-macros/large_file.m4) 
sinclude(config/ac-macros/misc.m4)

sinclude(config/ac-macros/openssl.m4)

sinclude(config/ac-macros/readline.m4)

sinclude(config/ac-macros/yassl.m4)

sinclude(config/ac-macros/zlib.m4)



# Remember to add a directory sql/share/LANGUAGE
@@ -2280,6 +2281,7 @@ AC_SUBST(tools_dirs) 
#MYSQL_CHECK_CPU

MYSQL_CHECK_VIO

MYSQL_CHECK_OPENSSL

MYSQL_CHECK_YASSL



libmysqld_dirs=

if test "$with_embedded_server" = "yes"