mirror of https://github.com/sipwise/mediator.git
Instead of hardcoding -I/usr/include/mysql for CFLAGS and -lmysqlclient for LDFLAGS, let's use mariadb_config if available (e.g. on Debian/buster), try mysql_config otherwise (e.g. on Debian/stretch) or if neither of them is available, fallback to -I/usr/include/mysql + -lmysqlclient. No longer include `m_string.h`, it was moved towards /usr/include/mariadb/server/m_string.h and is no longer compatible when used as such: | /usr/include/mariadb/server/m_string.h:89:23: error: unknown type name 'uchar'; did you mean 'char'? | extern void bmove_upp(uchar *dst,const uchar *src,size_t len); Also no longer use libmysqlclient15-dev as alternative Build-Depend, it's not available in neither stretch nor buster. While at it drop include for my_global.h, since it shouldn't be included anymore (and it doesn't seem to be relevant for us, compiling fine as-is on Debian/stretch and Debian/buster): | /usr/include/mariadb/my_global.h:3:2: warning: #warning This file should not be included by clients, include only <mysql.h> [-Wcpp] Change-Id: I74a75ea24f72880adb8117ae5808095f03bc0edbchanges/33/28133/2
parent
f15a2924f8
commit
ba5da32f2a
Loading…
Reference in new issue