package/ulogd: add optional support for jansson

When jansson was compiled before, ulogd will use it as optional dependency:

$ output/host/usr/bin/i586-buildroot-linux-uclibc-readelf -a output/target/usr/lib/ulogd/ulogd_output_JSON.so | grep NEEDED
 0x00000001 (NEEDED)                     Shared library: [libjansson.so.4]
 0x00000001 (NEEDED)                     Shared library: [libc.so.1]

---
 package/ulogd/ulogd.mk | 7 +++++++
 1 file changed, 7 insertions(+)

index 7730198..363b8c8 100644
@@ -29,4 +29,11 @@ else
 ULOGD_CONF_OPTS += --with-mysql=no --without-sqlite
 endif
 
+ifeq ($(BR2_PACKAGE_JANSSON),y)
+ULOGD_CONF_OPTS += --with-jansson
+ULOGD_DEPENDENCIES += jansson
+else
+ULOGD_CONF_OPTS += --without-jansson
+endif
+
 $(eval $(autotools-package))

2.7.0

When libpcap was compiled before, ulogd will use it as optional dependency:

$ output/host/usr/bin/i586-buildroot-linux-uclibc-readelf -a output/target/usr/lib/ulogd/ulogd_output_PCAP.so | grep NEEDED
 0x00000001 (NEEDED)                     Shared library: [libpcap.so.1]
 0x00000001 (NEEDED)                     Shared library: [libc.so.1]

---
 package/ulogd/ulogd.mk | 7 +++++++
 1 file changed, 7 insertions(+)

index 363b8c8..4017edc 100644
@@ -29,6 +29,13 @@ else
 ULOGD_CONF_OPTS += --with-mysql=no --without-sqlite
 endif
 
+ifeq ($(BR2_PACKAGE_LIBPCAP),y)
+ULOGD_CONF_OPTS += --with-pcap
+ULOGD_DEPENDENCIES += libpcap
+else
+ULOGD_CONF_OPTS += --without-pcap
+endif
+
 ifeq ($(BR2_PACKAGE_JANSSON),y)
 ULOGD_CONF_OPTS += --with-jansson
 ULOGD_DEPENDENCIES += jansson

2.7.0

Dear Bernd Kuhls,

Both patches applied to master, thanks!

Thomas

Thomas Petazzoni, CTO, Free Electrons
Embedded Linux, Kernel and Android engineering
http://free-electrons.com