Commit 8f71610f authored by unknown's avatar unknown
Browse files

Many files: 

  Changed paths to ndb include directory to include "storage"
Makefile.am:
  Adjusted path to yaSSL libtool libraries
ssl.m4:
  Use libtool way of specifying yaSSL libraries


config/ac-macros/ssl.m4:
  Use libtool way of specifying yaSSL libraries
libmysqld/Makefile.am:
  Adjusted path to yaSSL libtool libraries
storage/ndb/config/type_kernel.mk.am:
  Changed paths to ndb include directory to include "storage"
storage/ndb/config/type_ndbapi.mk.am:
  Changed paths to ndb include directory to include "storage"
storage/ndb/config/type_ndbapitest.mk.am:
  Changed paths to ndb include directory to include "storage"
storage/ndb/config/type_ndbapitools.mk.am:
  Changed paths to ndb include directory to include "storage"
storage/ndb/config/type_util.mk.am:
  Changed paths to ndb include directory to include "storage"
parent d6eb3627

config/ac-macros/ssl.m4

+2 −3
Original line number Diff line number Diff line
@@ -28,10 +28,9 @@ AC_DEFUN([MYSQL_USE_BUNDLED_YASSL], [ 
  yassl_dir="yassl"

  AC_SUBST([yassl_dir])



  yassl_libs="-L\$(top_srcdir)/extra/yassl/src -lyassl -L\$(top_srcdir)/extra/yassl/taocrypt/src -ltaocrypt"

  yassl_libs="\$(top_builddir)/extra/yassl/src/libyassl.la \

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

  AC_SUBST(yassl_libs)

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

  AC_SUBST(yassl_includes)



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

  AC_DEFINE([HAVE_YASSL], [1], [Defined by configure. Using yaSSL for SSL.])

libmysqld/Makefile.am

+2 −2
Original line number Diff line number Diff line
@@ -94,8 +94,8 @@ INC_LIB= $(top_builddir)/regex/libregex.a \ 
		$(yassl_inc_libs)



if HAVE_YASSL

yassl_inc_libs=	$(top_srcdir)/extra/yassl/src/.libs/libyassl.a \

		$(top_srcdir)/extra/yassl/taocrypt/src/.libs/libtaocrypt.a

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

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

endif



# Storage engine specific compilation options

storage/ndb/config/type_kernel.mk.am

+1 −1
Original line number Diff line number Diff line
@@ -2,7 +2,7 @@ 
INCLUDES += \

        -I$(srcdir) \

	-I$(top_builddir)/include \

	-I$(top_builddir)/ndb/include \

	-I$(top_builddir)/storage/ndb/include \

	-I$(top_srcdir)/include \

	-I$(top_srcdir)/storage/ndb/include \

        -I$(top_srcdir)/storage/ndb/src/kernel/vm \

storage/ndb/config/type_ndbapi.mk.am

+1 −1
Original line number Diff line number Diff line
@@ -2,7 +2,7 @@ 
INCLUDES += \

        -I$(srcdir) \

	-I$(top_builddir)/include \

	-I$(top_builddir)/ndb/include \

	-I$(top_builddir)/storage/ndb/include \

	-I$(top_srcdir)/include \

	-I$(top_srcdir)/mysys \

	-I$(top_srcdir)/storage/ndb/include \

storage/ndb/config/type_ndbapitest.mk.am

+1 −1
Original line number Diff line number Diff line
@@ -7,7 +7,7 @@ LDADD += $(top_builddir)/storage/ndb/test/src/libNDBT.a \ 


INCLUDES += -I$(top_srcdir) \

	-I$(top_builddir)/include \

	-I$(top_builddir)/ndb/include \

	-I$(top_builddir)/storage/ndb/include \

	-I$(top_srcdir)/include \

	-I$(top_srcdir)/storage/ndb/include \

        -I$(top_srcdir)/storage/ndb/include/ndbapi \