casa-mp-base

--- configure.ac.orig   2017-11-15 21:00:11.000000000 -0600

+++ configure.ac    2017-11-22 22:01:56.000000000 -0600

@@ -1716,6 +1716,31 @@

 ])

 AC_SUBST(XATTR_LIBS)

+dnl ***********************************************

+dnl *** Check for gappinfo implementation (GIO) ***

+dnl ***********************************************

+AC_ARG_WITH(appinfo-impl,

+           [AS_HELP_STRING([--appinfo-impl=@<:@native/generic@:>@],

+                           [use appinfo implementation [native]])],

+           [],

+           [with_appinfo_impl='native'])

+

+if test "$with_appinfo_impl" != "native" && test "$with_appinfo_impl" != "generic"; then

+  with_appinfo_impl="native"

+fi

+

+AM_CONDITIONAL(APPINFO_IMPL_NATIVE, [test "$with_appinfo_impl" = "native"])

+AM_CONDITIONAL(APPINFO_IMPL_GENERIC, [test "$with_appinfo_impl" = "generic"])

+

+case $with_appinfo_impl in

+  native)

+    AC_DEFINE(USE_APPINFO_NATIVE, 1, [Prefer the native application information implementation])

+    ;;

+  generic)

+    AC_DEFINE(USE_APPINFO_GENERIC, 1, [Prefer the generic (freedesktop-based) application information implementation])

+    ;;

+esac

+

 dnl ************************

 dnl *** check for libelf ***

 dnl ************************

--- gio/Makefile.am.orig    2017-11-13 11:02:33.000000000 -0600

+++ gio/Makefile.am 2017-11-22 22:33:07.000000000 -0600

@@ -262,9 +262,13 @@

 if OS_UNIX

 platform_libadd += xdgmime/libxdgmime.la

 platform_deps += xdgmime/libxdgmime.la

-if !OS_COCOA

+if OS_COCOA

+if APPINFO_IMPL_NATIVE

+appinfo_headers += gosxappinfo.h

+else

 appinfo_headers += gdesktopappinfo.h

 endif

+endif

 unix_sources = \

@@ -313,7 +317,7 @@

    gunixinputstream.h  \

    gunixoutputstream.h     \

    gunixsocketaddress.h    \

-   $(appinfo_headers) \

+   $(appinfo_headers)  \

    $(NULL)

 if HAVE_NETLINK

@@ -359,7 +363,13 @@

    win32/gwin32filemonitor.c

 if OS_WIN32

-appinfo_sources += gwin32appinfo.c gwin32appinfo.h

+if APPINFO_IMPL_NATIVE

+appinfo_headers += gwin32appinfo.h

+appinfo_sources += gwin32appinfo.c

+else

+appinfo_headers += gdesktopappinfo.h

+appinfo_sources += gdesktopappinfo.c

+endif

 contenttype_sources += gcontenttype-win32.c

 platform_libadd += -lshlwapi -lws2_32 -ldnsapi -liphlpapi

 win32_sources = $(win32_actual_sources)

@@ -368,6 +378,7 @@

 giowin32include_HEADERS = \

    gwin32inputstream.h \

    gwin32outputstream.h \

+   $(appinfo_headers) \

    $(NULL)

 endif

@@ -406,13 +417,16 @@

    $(xdp_dbus_built_sources)   \

    $(NULL)

+if OS_UNIX

 if OS_COCOA

+if APPINFO_IMPL_NATIVE

 contenttype_sources += gosxcontenttype.c