A number of third-party libraries have added pkg-config support over the
years. This patch-set updates configure to make use of it where it is
available. It also fixes some conflicting option definitions and adds
checks that cause configure to fail if a plugin has been explicitly
requested, but the related third-party library is not available.
Patch 1: switch from `--with-XXX` to `--enable-XXX` for output
plugins.
Patches 2-5: use pkg-config for libdbi, libmysqlclient, libpcap and
libpq if available.
Patches 6-10: abort configure when an output plugin has been explicitly
enabled, but the related library is not available.
Changes since v1
* Better commit messages.
* Simpler mysql patch: remove the upstream m4 macro calls, and look
for `mysql_config` the same way we do `pg_config` and `pcap-config`.
* `AM_CPPFLAGS` fixes for mysql, pcap, and postgresql.
* `LIBADD` fix for mysql.
Jeremy Sowden (10):
build: use `--enable-XXX` options for output plugins
build: use pkg-config for libdbi
build: use pkg-config or mysql_config for libmysqlclient
build: use pkg-config or pcap-config for libpcap
build: use pkg-config or pg_config for libpq
build: if `--enable-dbi` is `yes`, abort if libdbi is not found
build: if `--enable-mysql` is `yes`, abort if libmysqlclient is not
found
build: if `--enable-pcap` is `yes`, abort if libpcap is not found
build: if `--enable-pgsql` is `yes`, abort if libpq is not found
build: if `--enable-sqlite3` is `yes`, abort if libsqlite3 is not
found
acinclude.m4 | 351 ---------------------------------------
configure.ac | 192 +++++++++++++++++----
output/dbi/Makefile.am | 4 +-
output/mysql/Makefile.am | 4 +-
output/pcap/Makefile.am | 2 +
output/pgsql/Makefile.am | 4 +-
6 files changed, 165 insertions(+), 392 deletions(-)
delete mode 100644 acinclude.m4
--
2.34.1
