Commit 69585b21 authored by unknown's avatar unknown
Browse files

Bug #12985 Do-mysqlclient-test: Can't find -lyassl when linking 

 - Use yassl_includes and yassl_libs instead of openssl_includes and openssl_libs 
   to avoid that mysql_config returns that libyassl and libtaocrypt are needed for linking. 


client/Makefile.am:
  Add yassl_includes
config/ac-macros/yassl.m4:
  Use own variables for yassl, don't intrude on openssl
configure.in:
  Add yassl_libs to lib_DEPENDENCIES and CLIENT_LIBS
libmysql/Makefile.am:
  Add yassl_includes
libmysql_r/Makefile.am:
  Add yassl_libs and yassl_includes
libmysqld/Makefile.am:
  Add yassl_includes
server-tools/instance-manager/Makefile.am:
  Add yassl includes and lib
sql/Makefile.am:
  Add yassl includes and libe
vio/Makefile.am:
  Add yassl includes and libe
parent b50eb4cd

client/Makefile.am

+4 −2
Original line number Diff line number Diff line
@@ -22,8 +22,10 @@ else 
  yassl_dummy_link_fix=

endif

#AUTOMAKE_OPTIONS =              nostdinc

INCLUDES =			-I$(top_builddir)/include -I$(top_srcdir)/include \

				-I$(top_srcdir)/regex $(openssl_includes)

INCLUDES =			-I$(top_builddir)/include \

				-I$(top_srcdir)/include \

				-I$(top_srcdir)/regex \

                                $(openssl_includes) $(yassl_includes) 

LIBS =				@CLIENT_LIBS@

LDADD=				@CLIENT_EXTRA_LDFLAGS@ \

                                $(top_builddir)/libmysql/libmysqlclient.la

config/ac-macros/yassl.m4

+4 −6
Original line number Diff line number Diff line
@@ -15,17 +15,15 @@ AC_DEFUN([MYSQL_CHECK_YASSL], [ 
    fi

    AC_MSG_RESULT([using bundled yaSSL])

    yassl_dir="extra/yassl"

    openssl_libs="\

    -L\$(top_builddir)/extra/yassl/src -lyassl\

    -L\$(top_builddir)/extra/yassl/taocrypt/src -ltaocrypt"

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

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

    yassl_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_libs)

  AC_SUBST(yassl_includes)

  AC_SUBST(yassl_dir)

  AM_CONDITIONAL([HAVE_YASSL], [ test "with_yassl" = "yes" ])

])

configure.in

+2 −2
Original line number Diff line number Diff line
@@ -1139,7 +1139,7 @@ dnl Is this the right match for DEC OSF on alpha? 
        sql/Makefile.in)

          # Use gen_lex_hash.linux instead of gen_lex_hash

          # Add library dependencies to mysqld_DEPENDENCIES

          lib_DEPENDENCIES="\$(bdb_libs_with_path) \$(innodb_libs) \$(ndbcluster_libs) \$(pstack_libs) \$(innodb_system_libs) \$(openssl_libs)"

          lib_DEPENDENCIES="\$(bdb_libs_with_path) \$(innodb_libs) \$(ndbcluster_libs) \$(pstack_libs) \$(innodb_system_libs) \$(openssl_libs) \$(yassl_libs)"

          cat > $filesed << EOF

s,\(^.*\$(MAKE) gen_lex_hash\)\$(EXEEXT),#\1,

s,\(\./gen_lex_hash\)\$(EXEEXT),\1.linux,
@@ -2423,7 +2423,7 @@ then 
  AC_DEFINE([THREAD_SAFE_CLIENT], [1], [Should be client be thread safe])

fi



CLIENT_LIBS="$NON_THREADED_LIBS $openssl_libs $ZLIB_LIBS $STATIC_NSS_FLAGS"

CLIENT_LIBS="$NON_THREADED_LIBS $openssl_libs $yassl_libs $ZLIB_LIBS $STATIC_NSS_FLAGS"



AC_SUBST(CLIENT_LIBS)

AC_SUBST(NON_THREADED_LIBS)

libmysql/Makefile.am

+1 −1
Original line number Diff line number Diff line
@@ -24,7 +24,7 @@ target = libmysqlclient.la 
target_defs =	-DUNDEF_THREADS_HACK -DDONT_USE_RAID @LIB_EXTRA_CCFLAGS@

LIBS =		@CLIENT_LIBS@

INCLUDES =	-I$(top_builddir)/include -I$(top_srcdir)/include \

		$(openssl_includes) @ZLIB_INCLUDES@

		$(openssl_includes) $(yassl_includes) @ZLIB_INCLUDES@



include $(srcdir)/Makefile.shared

libmysql_r/Makefile.am

+2 −2
Original line number Diff line number Diff line
@@ -22,10 +22,10 @@ 


target = libmysqlclient_r.la

target_defs = -DDONT_USE_RAID -DMYSQL_CLIENT @LIB_EXTRA_CCFLAGS@

LIBS = @LIBS@ @ZLIB_LIBS@ @openssl_libs@

LIBS = @LIBS@ @ZLIB_LIBS@ @openssl_libs@ @yassl_libs@



INCLUDES =	-I$(top_builddir)/include -I$(top_srcdir)/include \

		$(openssl_includes) @ZLIB_INCLUDES@

		$(openssl_includes) $(yassl_includes) @ZLIB_INCLUDES@

## automake barfs if you don't use $(srcdir) or $(top_srcdir) in include

include $(top_srcdir)/libmysql/Makefile.shared