Fix some MQTT issues and a silly error.

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;

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])

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();