Update to be compatible with libplist version 2.3.0

Author: Sam Bingner

configure.ac

@@ -26,6 +26,14 @@ PKG_CHECK_MODULES(libplist, libplist >= 2.2.0,
     AC_DEFINE([HAVE_LIBPLIST_2_0], [1], [Use libplist-2.0])
   ])],
 )
+
+if test "x$LIBPLIST" != "x"; then
+  AC_CHECK_DECLS([plist_format_typedef], [], [], [
+  #include <plist/plist.h>
+  plist_format_t plist_format_typedef;
+])
+fi
+
 AC_CHECK_LIB(pthread, [pthread_create, pthread_mutex_lock], [AC_SUBST(libpthread_LIBS,[-lpthread])], [AC_MSG_ERROR([libpthread is required to build usbfluxd])])
 
 AC_SEARCH_LIBS([fmin], [m])

usbfluxd/utils.c

@@ -302,7 +302,7 @@ int plist_read_from_filename(plist_t *plist, const char *filename)
 	return 1;
 }
 
-int plist_write_to_filename(plist_t plist, const char *filename, enum plist_format_t format)
+int plist_write_to_filename(plist_t plist, const char *filename, plist_format_t format)
 {
 	char *buffer = NULL;
 	uint32_t length;

usbfluxd/utils.h

@@ -80,13 +80,15 @@ char *string_concat(const char *str, ...);
 int buffer_read_from_filename(const char *filename, char **buffer, uint64_t *length);
 int buffer_write_to_filename(const char *filename, const char *buffer, uint64_t length);
 
-enum plist_format_t {
+#if HAVE_DECL_PLIST_FORMAT_TYPEDEF != 1
+typedef enum {
 	PLIST_FORMAT_XML,
 	PLIST_FORMAT_BINARY
-};
+} plist_format_t;
+#endif
 
 int plist_read_from_filename(plist_t *plist, const char *filename);
-int plist_write_to_filename(plist_t plist, const char *filename, enum plist_format_t format);
+int plist_write_to_filename(plist_t plist, const char *filename, plist_format_t format);
 
 uint64_t mstime64(void);
 void get_tick_count(struct timeval * tv);