Branch: Tag:

2015-09-17

2015-09-17 17:24:42 by Henrik Grubbström (Grubba) <grubba@grubba.org>

Revert "Mysql: Link to the MariaDB libs twice."

This approach didn't work.

This reverts commit 02a2d4dbe9655d71c3fbf62be2fb5b77fadc49bc.

378:    if test "x${MARIADB_CONFIG}" = "xno"; then :; else    # Try the MariaDB client libraries.    # 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"    AC_CHECK_SQLLIB(mariadbclient_r, [ -  LIBS="-lmariadbclient_r -lmariadbclient_r $LIBS" +  LIBS="-lmariadbclient_r $LIBS"    ], [    AC_CHECK_SQLLIB(mariadbclient, [ -  LIBS="-lmariadbclient -lmariadbclient $LIBS" +  LIBS="-lmariadbclient $LIBS"    ], [    AC_CHECK_SQLLIB(mariadb_r, [ -  LIBS="-lmariadb_r -lmariadb_r $LIBS" +  LIBS="-lmariadb_r $LIBS"    ], [    AC_CHECK_SQLLIB(mariadb, [ -  LIBS="-lmariadb -lmariadb $LIBS" +  LIBS="-lmariadb $LIBS"    ], [    # Fallback to using the MySQL client libraries.    # NB: These are distributed together with the MariaDB server.