diff --git a/meson-config.h.in b/meson-config.h.in index 99c9b2421d..a1905d29e7 100644 --- a/meson-config.h.in +++ b/meson-config.h.in @@ -40,9 +40,6 @@ /* MySQL uses my_bool */ #mesondefine HAVE_MYSQL_MY_BOOL -/* MySQL has MYSQL_OPT_RECONNNECT */ -#mesondefine HAVE_MYSQL_OPT_RECONNECT - /* NETCONF capabilities enabled */ #mesondefine HAVE_NETCONF diff --git a/meson.build b/meson.build index 766eddbf94..a8ff64b6d2 100644 --- a/meson.build +++ b/meson.build @@ -47,9 +47,8 @@ conf_data = configuration_data( # 'HAVE_CREATE_UNIFIED_DIFF': false, # 'HAVE_GSS_STR_TO_OID': false, # 'HAVE_MYSQL_GET_OPTION': false, - # 'HAVE_MYSQL_OPT_RECONNECT': false, # 'HAVE_OPTRESET': false, - # 'HAVE_PGSQL_SSL': false, + 'HAVE_PGSQL_SSL': true, # 'HAVE_PGSQL_TCP_USER_TIMEOUT': false, # 'HAVE_SYS_FILIO_H': false, # 'HAVE_VALGRIND_HEADERS': false, @@ -799,7 +798,7 @@ if TARGETS_GEN_MESSAGES.length() > 0 alias_target('messages', TARGETS_GEN_MESSAGES) else error( - 'No messages to generate. This is probably an error in the ' + 'meson.build files.', + 'No messages to generate. This is probably an error in the meson.build files.', ) endif if TARGETS_GEN_PARSER.length() > 0