Skip to content

Commit ed93534

Browse files
committed
configure.ac, src/Makefile.am: Add mqtt to the build system.
1 parent f0c03d9 commit ed93534

File tree

6 files changed

+61
-44
lines changed

6 files changed

+61
-44
lines changed

README

+3
Original file line numberDiff line numberDiff line change
@@ -191,6 +191,9 @@ Features
191191
Reads values from Modbus/TCP enabled devices. Supports reading values
192192
from multiple "slaves" so gateway devices can be used.
193193

194+
- mqtt
195+
Publishes and subscribes to MQTT topics.
196+
194197
- multimeter
195198
Information provided by serial multimeters, such as the `Metex
196199
M-4650CR'.

README.md

-38
This file was deleted.

configure.ac

+50
Original file line numberDiff line numberDiff line change
@@ -2653,6 +2653,53 @@ fi
26532653
AM_CONDITIONAL(BUILD_WITH_LIBMONGOC, test "x$with_libmongoc" = "xyes")
26542654
# }}}
26552655

2656+
# --with-libmosquitto {{{
2657+
with_libmosquitto_cppflags=""
2658+
with_libmosquitto_libs="-lmosquitto"
2659+
AC_ARG_WITH(libmosquitto, [AS_HELP_STRING([--with-libmosquitto@<:@=PREFIX@:>@], [Path to libmosquitto.])],
2660+
[
2661+
if test "x$withval" != "xno" && test "x$withval" != "xyes"
2662+
then
2663+
with_libmosquitto_cppflags="-I$withval/include"
2664+
with_libmosquitto_libs="-L$withval/lib -lmosquitto"
2665+
with_libmosquitto="yes"
2666+
else
2667+
with_libmosquitto="$withval"
2668+
fi
2669+
],
2670+
[
2671+
with_libmosquitto="yes"
2672+
])
2673+
if test "x$with_libmosquitto" = "xyes"
2674+
then
2675+
SAVE_CPPFLAGS="$CPPFLAGS"
2676+
CPPFLAGS="$with_libmosquitto_cppflags"
2677+
2678+
AC_CHECK_HEADERS(mosquitto.h, [with_libmosquitto="yes"], [with_libmosquitto="no (mosquitto.h not found)"])
2679+
2680+
CPPFLAGS="$SAVE_CPPFLAGS"
2681+
fi
2682+
if test "x$with_libmosquitto" = "xyes"
2683+
then
2684+
SAVE_LDFLAGS="$LDFLAGS"
2685+
SAVE_CPPFLAGS="$CPPFLAGS"
2686+
LDFLAGS="$with_libmosquitto_libs"
2687+
CPPFLAGS="$with_libmosquitto_cppflags"
2688+
2689+
AC_CHECK_LIB(mosquitto, mosquitto_connect, [with_libmosquitto="yes"], [with_libmosquitto="no (libmosquitto not found)"])
2690+
2691+
LDFLAGS="$SAVE_LDFLAGS"
2692+
CPPFLAGS="$SAVE_CPPFLAGS"
2693+
fi
2694+
if test "x$with_libmosquitto" = "xyes"
2695+
then
2696+
BUILD_WITH_LIBMOSQUITTO_CPPFLAGS="$with_libmosquitto_cppflags"
2697+
BUILD_WITH_LIBMOSQUITTO_LIBS="$with_libmosquitto_libs"
2698+
AC_SUBST(BUILD_WITH_LIBMOSQUITTO_CPPFLAGS)
2699+
AC_SUBST(BUILD_WITH_LIBMOSQUITTO_LIBS)
2700+
fi
2701+
# }}}
2702+
26562703
# --with-libmysql {{{
26572704
with_mysql_config="mysql_config"
26582705
with_mysql_cflags=""
@@ -5632,6 +5679,7 @@ AC_PLUGIN([memcached], [yes], [memcached statistics])
56325679
AC_PLUGIN([memory], [$plugin_memory], [Memory usage])
56335680
AC_PLUGIN([mic], [$with_mic], [Intel Many Integrated Core stats])
56345681
AC_PLUGIN([modbus], [$with_libmodbus], [Modbus plugin])
5682+
AC_PLUGIN([mqtt], [$with_libmosquitto], [MQTT output plugin])
56355683
AC_PLUGIN([multimeter], [$plugin_multimeter], [Read multimeter values])
56365684
AC_PLUGIN([mysql], [$with_libmysql], [MySQL statistics])
56375685
AC_PLUGIN([netapp], [$with_libnetapp], [NetApp plugin])
@@ -5912,6 +5960,7 @@ Configuration:
59125960
libmnl . . . . . . . $with_libmnl
59135961
libmodbus . . . . . . $with_libmodbus
59145962
libmongoc . . . . . . $with_libmongoc
5963+
libmosquitto . . . . $with_libmosquitto
59155964
libmysql . . . . . . $with_libmysql
59165965
libnetapp . . . . . . $with_libnetapp
59175966
libnetsnmp . . . . . $with_libnetsnmp
@@ -6011,6 +6060,7 @@ Configuration:
60116060
memory . . . . . . . $enable_memory
60126061
mic . . . . . . . . . $enable_mic
60136062
modbus . . . . . . . $enable_modbus
6063+
mqtt . . . . . . . . $enable_mqtt
60146064
multimeter . . . . . $enable_multimeter
60156065
mysql . . . . . . . . $enable_mysql
60166066
netapp . . . . . . . $enable_netapp

mqtt.conf

-6
This file was deleted.

src/Makefile.am

+8
Original file line numberDiff line numberDiff line change
@@ -637,6 +637,14 @@ modbus_la_CFLAGS = $(AM_CFLAGS) $(BUILD_WITH_LIBMODBUS_CFLAGS)
637637
modbus_la_LIBADD = $(BUILD_WITH_LIBMODBUS_LIBS)
638638
endif
639639

640+
if BUILD_PLUGIN_MQTT
641+
pkglib_LTLIBRARIES += mqtt.la
642+
mqtt_la_SOURCES = mqtt.c
643+
mqtt_la_LDFLAGS = $(PLUGIN_LDFLAGS)
644+
mqtt_la_CFLAGS = $(AM_CFLAGS) $(BUILD_WITH_LIBMOSQUITTO_CFLAGS)
645+
mqtt_la_LIBADD = $(BUILD_WITH_LIBMOSQUITTO_LIBS)
646+
endif
647+
640648
if BUILD_PLUGIN_MULTIMETER
641649
pkglib_LTLIBRARIES += multimeter.la
642650
multimeter_la_SOURCES = multimeter.c

mqtt.c renamed to src/mqtt.c

File renamed without changes.

0 commit comments

Comments
 (0)