Skip to content
Snippets Groups Projects
Commit ae230d71 authored by Henrik (Grubba) Grubbström's avatar Henrik (Grubba) Grubbström
Browse files

Mysql: Link to the MariaDB libs twice.

This is an attempt to work around MariaDB having symbols (like
'hash_insert') that clash with the same symbols in Pike.

Potential fix for crash on Solaris 10.
parent 6804ca2d
Branches
Tags
No related merge requests found
...@@ -378,18 +378,20 @@ fi ...@@ -378,18 +378,20 @@ fi
if test "x${MARIADB_CONFIG}" = "xno"; then :; else if test "x${MARIADB_CONFIG}" = "xno"; then :; else
# Try the MariaDB client libraries. # Try the MariaDB client libraries.
# NB: These are distributed separately from the MariaDB server. # NB: These are distributed separately from the MariaDB server.
# NB: We link with them twice to make sure that symbols in them
# (like 'hash_insert') aren't resolved against Pike...
TRY_MYSQLCLIENT="no" TRY_MYSQLCLIENT="no"
AC_CHECK_SQLLIB(mariadbclient_r, [ AC_CHECK_SQLLIB(mariadbclient_r, [
LIBS="-lmariadbclient_r $LIBS" LIBS="-lmariadbclient_r -lmariadbclient_r $LIBS"
], [ ], [
AC_CHECK_SQLLIB(mariadbclient, [ AC_CHECK_SQLLIB(mariadbclient, [
LIBS="-lmariadbclient $LIBS" LIBS="-lmariadbclient -lmariadbclient $LIBS"
], [ ], [
AC_CHECK_SQLLIB(mariadb_r, [ AC_CHECK_SQLLIB(mariadb_r, [
LIBS="-lmariadb_r $LIBS" LIBS="-lmariadb_r -lmariadb_r $LIBS"
], [ ], [
AC_CHECK_SQLLIB(mariadb, [ AC_CHECK_SQLLIB(mariadb, [
LIBS="-lmariadb $LIBS" LIBS="-lmariadb -lmariadb $LIBS"
], [ ], [
# Fallback to using the MySQL client libraries. # Fallback to using the MySQL client libraries.
# NB: These are distributed together with the MariaDB server. # NB: These are distributed together with the MariaDB server.
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment