From e3c39f5cbcc681b10633f3e5fc777e5f11139f69 Mon Sep 17 00:00:00 2001 From: Glenn Strauss Date: Sat, 29 Sep 2018 22:53:39 -0400 Subject: [PATCH] [meson] build fixes for libmariadb and libsasl2 (commented out test for libmysqlclient in favor of libmariadb) --- src/meson.build | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/src/meson.build b/src/meson.build index 52a422b7..cf49b430 100644 --- a/src/meson.build +++ b/src/meson.build @@ -378,8 +378,10 @@ libmysqlclient = [] if get_option('with_mysql') # manual search: extend include path with 'mysql/' # header: mysql.h - # function: mysql_real_connect (-lmysqlclient) - libmysqlclient = [ dependency('mysqlclient') ] + # function: mysql_real_connect (-lmariadb) + libmysqlclient = [ dependency('mariadb') ] + #-# function: mysql_real_connect (-lmysqlclient) + #-libmysqlclient = [ dependency('mysqlclient') ] conf_data.set('HAVE_MYSQL', true) endif @@ -869,7 +871,7 @@ endif if get_option('with_sasl') modules += [ - [ 'mod_authn_sasl', [ 'mod_authn_sasl.c' ], libsasl2 ], + [ 'mod_authn_sasl', [ 'mod_authn_sasl.c' ], libsasl ], ] endif