From: Mike Brady <mikebrady@eircom.net>
Date: Mon, 4 Mar 2019 13:21:24 +0000 (+0000)
Subject: Fix some MQTT issues and a silly error.
X-Git-Tag: 3.3RC0~2^2~1
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=bac658b3c8fe03a366a7b86d8ba29b529d77096a;p=thirdparty%2Fshairport-sync.git

Fix some MQTT issues and a silly error.
---

diff --git a/common.h b/common.h
index 70ca6219..9bc849e1 100644
--- a/common.h
+++ b/common.h
@@ -104,6 +104,22 @@ typedef struct {
   int metadata_sockport;
   size_t metadata_sockmsglength;
   int get_coverart;
+#endif
+#ifdef CONFIG_MQTT
+  int mqtt_enabled;
+  char *mqtt_hostname;
+  int mqtt_port;
+  char *mqtt_username;
+  char *mqtt_password;
+  char *mqtt_capath;
+  char *mqtt_cafile;
+  char *mqtt_certfile;
+  char *mqtt_keyfile;
+  char *mqtt_topic;
+  int mqtt_publish_raw;
+  int mqtt_publish_parsed;
+  int mqtt_publish_cover;
+  int mqtt_enable_remote;
 #endif
   uint8_t hw_addr[6];
   int port;
diff --git a/configure.ac b/configure.ac
index 446f62df..9d03e798 100644
--- a/configure.ac
+++ b/configure.ac
@@ -2,11 +2,7 @@
 # Process this file with autoconf to produce a configure script.
 
 AC_PREREQ([2.50])
-<<<<<<< HEAD
-AC_INIT([shairport-sync], [3.2.2], [mikebrady@eircom.net])
-=======
 AC_INIT([shairport-sync], [3.3rc0], [mikebrady@eircom.net])
->>>>>>> development
 AM_INIT_AUTOMAKE
 AC_CONFIG_SRCDIR([shairport.c])
 AC_CONFIG_HEADERS([config.h])
diff --git a/shairport.c b/shairport.c
index f87e7725..ca23867c 100644
--- a/shairport.c
+++ b/shairport.c
@@ -1692,10 +1692,10 @@ int main(int argc, char **argv) {
   if (config.mqtt_enabled) {
     initialise_mqtt();
   }
+#endif
 
   activity_monitor_start();
 
->>>>>>> development
   // daemon_log(LOG_INFO, "Successful Startup");
   rtsp_listen_loop();