1berry/MariaDB-server
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Many files:

Browse Source 
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
This commit is contained in:
kent@mysql.com/kent-amd64.(none) 2006-11-29 18:36:51 +01:00
parent 3749d77c8c
commit ea5c7f9756
7 changed files with 9 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
config/ac-macros/ssl.m4
View File

@ -28,10 +28,9 @@ AC_DEFUN([MYSQL_USE_BUNDLED_YASSL], [
yassl_dir="yassl" yassl_dir="yassl"
AC_SUBST([yassl_dir]) 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) 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_OPENSSL], [1], [Defined by configure. Using yaSSL for SSL.])
AC_DEFINE([HAVE_YASSL], [1], [Defined by configure. Using yaSSL for SSL.]) AC_DEFINE([HAVE_YASSL], [1], [Defined by configure. Using yaSSL for SSL.])

4
libmysqld/Makefile.am
View File

@ -94,8 +94,8 @@ INC_LIB= $(top_builddir)/regex/libregex.a \
$(yassl_inc_libs) $(yassl_inc_libs)
if HAVE_YASSL if HAVE_YASSL
yassl_inc_libs= $(top_srcdir)/extra/yassl/src/.libs/libyassl.a \ yassl_inc_libs= $(top_builddir)/extra/yassl/src/.libs/libyassl.a \
$(top_srcdir)/extra/yassl/taocrypt/src/.libs/libtaocrypt.a $(top_builddir)/extra/yassl/taocrypt/src/.libs/libtaocrypt.a
endif endif
# Storage engine specific compilation options # Storage engine specific compilation options

2
storage/ndb/config/type_kernel.mk.am
View File

@ -2,7 +2,7 @@
INCLUDES += \ INCLUDES += \
-I$(srcdir) \ -I$(srcdir) \
-I$(top_builddir)/include \ -I$(top_builddir)/include \
-I$(top_builddir)/ndb/include \ -I$(top_builddir)/storage/ndb/include \
-I$(top_srcdir)/include \ -I$(top_srcdir)/include \
-I$(top_srcdir)/storage/ndb/include \ -I$(top_srcdir)/storage/ndb/include \
-I$(top_srcdir)/storage/ndb/src/kernel/vm \ -I$(top_srcdir)/storage/ndb/src/kernel/vm \

2
storage/ndb/config/type_ndbapi.mk.am
View File

@ -2,7 +2,7 @@
INCLUDES += \ INCLUDES += \
-I$(srcdir) \ -I$(srcdir) \
-I$(top_builddir)/include \ -I$(top_builddir)/include \
-I$(top_builddir)/ndb/include \ -I$(top_builddir)/storage/ndb/include \
-I$(top_srcdir)/include \ -I$(top_srcdir)/include \
-I$(top_srcdir)/mysys \ -I$(top_srcdir)/mysys \
-I$(top_srcdir)/storage/ndb/include \ -I$(top_srcdir)/storage/ndb/include \

2
storage/ndb/config/type_ndbapitest.mk.am
View File

@ -7,7 +7,7 @@ LDADD += $(top_builddir)/storage/ndb/test/src/libNDBT.a \
INCLUDES += -I$(top_srcdir) \ INCLUDES += -I$(top_srcdir) \
-I$(top_builddir)/include \ -I$(top_builddir)/include \
-I$(top_builddir)/ndb/include \ -I$(top_builddir)/storage/ndb/include \
-I$(top_srcdir)/include \ -I$(top_srcdir)/include \
-I$(top_srcdir)/storage/ndb/include \ -I$(top_srcdir)/storage/ndb/include \
-I$(top_srcdir)/storage/ndb/include/ndbapi \ -I$(top_srcdir)/storage/ndb/include/ndbapi \

2
storage/ndb/config/type_ndbapitools.mk.am
View File

@ -7,7 +7,7 @@ LDADD += \
INCLUDES += -I$(srcdir) \ INCLUDES += -I$(srcdir) \
-I$(top_builddir)/include \ -I$(top_builddir)/include \
-I$(top_builddir)/ndb/include \ -I$(top_builddir)/storage/ndb/include \
-I$(top_srcdir)/include \ -I$(top_srcdir)/include \
-I$(top_srcdir)/storage/ndb/include \ -I$(top_srcdir)/storage/ndb/include \
-I$(top_srcdir)/storage/ndb/include/ndbapi \ -I$(top_srcdir)/storage/ndb/include/ndbapi \

2
storage/ndb/config/type_util.mk.am
View File

@ -1,7 +1,7 @@
INCLUDES += -I$(srcdir) \ INCLUDES += -I$(srcdir) \
-I$(top_builddir)/include \ -I$(top_builddir)/include \
-I$(top_builddir)/ndb/include \ -I$(top_builddir)/storage/ndb/include \
-I$(top_srcdir)/include \ -I$(top_srcdir)/include \
-I$(top_srcdir)/mysys \ -I$(top_srcdir)/mysys \
-I$(top_srcdir)/storage/ndb/include \ -I$(top_srcdir)/storage/ndb/include \