Commit 5710aae8 authored by Joerg Bruehe's avatar Joerg Bruehe

Fix Bug #47957

  A build "--without-server" fails if using "--with-ssl" (YaSSL)

The problem was the lack of directory "extra" in a build
which did not include the server.

configure.in:
  1) Ensure "extra" is in the list of client directories.
  2) Always handle the client directories first, as they will
     be contained in every build (we have client-only, but not
     server-only).
parent 1d5acddf
...@@ -2769,7 +2769,7 @@ server_scripts= ...@@ -2769,7 +2769,7 @@ server_scripts=
dnl This probably should be cleaned up more - for now the threaded dnl This probably should be cleaned up more - for now the threaded
dnl client is just using plain-old libs. dnl client is just using plain-old libs.
sql_client_dirs="strings regex mysys dbug libmysql" sql_client_dirs="strings mysys dbug extra regex libmysql"
AM_CONDITIONAL(THREAD_SAFE_CLIENT, test "$THREAD_SAFE_CLIENT" != "no") AM_CONDITIONAL(THREAD_SAFE_CLIENT, test "$THREAD_SAFE_CLIENT" != "no")
...@@ -2835,9 +2835,10 @@ AC_SUBST(mysql_plugin_defs) ...@@ -2835,9 +2835,10 @@ AC_SUBST(mysql_plugin_defs)
# Now that sql_client_dirs and sql_server_dirs are stable, determine the union. # Now that sql_client_dirs and sql_server_dirs are stable, determine the union.
# Start with the (longer) server list, add each client item not yet present. # We support client-only builds by "--without-server", but not vice versa,
sql_union_dirs=" $sql_server_dirs " # so we start with the client list, then add each server item not yet present.
for DIR in $sql_client_dirs sql_union_dirs=" $sql_client_dirs "
for DIR in $sql_server_dirs
do do
if echo " $sql_union_dirs " | grep " $DIR " >/dev/null if echo " $sql_union_dirs " | grep " $DIR " >/dev/null
then then
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment