diff options
| author | Memphiz <memphis@machzwo.de> | 2013-06-04 14:03:35 +0200 |
|---|---|---|
| committer | Memphis <memphis@machzwo.de> | 2013-06-09 15:51:03 +0200 |
| commit | a7a04d67c1c60986aaeac57df4f8fcb1c57830c5 (patch) | |
| tree | 2bb2561d32d8339cb0b4039ec1e1da7f09afdf12 | |
| parent | 257b12a4564fb4e8b1e1f923633a58df1da2db99 (diff) | |
[mdns] - add optional libmdnsembedded support to configure
| -rw-r--r-- | Makefile.in | 4 | ||||
| -rw-r--r-- | configure.in | 35 | ||||
| -rw-r--r-- | xbmc/network/mdns/Makefile | 7 |
3 files changed, 46 insertions, 0 deletions
diff --git a/Makefile.in b/Makefile.in index 0dc7b3b872..f64ec4fe46 100644 --- a/Makefile.in +++ b/Makefile.in @@ -122,6 +122,10 @@ DIRECTORY_ARCHIVES += lib/libUPnP/libupnp.a \ xbmc/network/upnp/upnp.a endif +ifeq (@USE_MDNSEMBEDDED@,1) +DIRECTORY_ARCHIVES += xbmc/network/mdns/mdns.a +endif + ifeq ($(findstring osx,@ARCH@),osx) DIRECTORY_ARCHIVES += xbmc/osx/osx.a DIRECTORY_ARCHIVES += xbmc/network/osx/network.a diff --git a/configure.in b/configure.in index 817711ee81..2a45c9f921 100644 --- a/configure.in +++ b/configure.in @@ -135,6 +135,8 @@ halstorage_not_found="== Could not find hal-storage. HAL support disabled. ==" hal_disabled="== HAL support disabled. ==" avahi_not_found="== Could not find libavahi-common or libavahi-client. Avahi support disabled. ==" avahi_disabled="== Avahi support disabled. ==" +mdnsembedded_not_found="== Could not find mDNSEmbedded. Might prevent zeroconf support. ==" +mdnsembedded_disabled="== mDNSEmbedded support disabled. ==" vdpau_not_found="== Could not find libvdpau. VDPAU support disabled. ==" vdpau_disabled="== VDPAU support manually disabled. ==" vaapi_not_found="== Could not find libva. VAAPI support disabled. ==" @@ -422,6 +424,12 @@ AC_ARG_ENABLE([avahi], [disable Avahi support (default is enabled if libavahi-common and libavahi-client is found)])], [use_avahi=$enableval], [use_avahi=yes]) + + AC_ARG_ENABLE([mdnsembedded], + [AS_HELP_STRING([--disable-mdnsembedded], + [disable mDNSEmbedded support (default is auto)])], + [use_mdnsembedded=$enableval], + [use_mdnsembedded=auto]) AC_ARG_ENABLE([non-free], [AS_HELP_STRING([--disable-non-free], @@ -1251,6 +1259,27 @@ else fi fi +# mdnsembedded +if test "$use_mdnsembedded" != "no"; then + AC_CHECK_LIB([mDNSEmbedded], [embedded_mDNSInit],, + [if test "$use_mdnsembedded" = "yes"; then + AC_MSG_ERROR($mdnsembedded_not_found) + USE_MDNSEMBEDDED=0 + elif test "$use_mdnsembedded" != "no"; then + AC_MSG_NOTICE($mdnsembedded_not_found) + use_mdnsembedded="no" + USE_MDNSEMBEDDED=0 + fi + ]) + if test $use_mdnsembedded != "no"; then + USE_MDNSEMBEDDED=1 + fi +else + AC_MSG_RESULT($mdnsembedded_disabled) + USE_MDNSEMBEDDED=0 +fi +AC_SUBST(USE_MDNSEMBEDDED) + # X11 if test "$use_x11" = "yes" && test "$host_vendor" != "apple"; then AC_MSG_NOTICE($x11_enabled) @@ -2176,6 +2205,12 @@ else final_message="$final_message\n Avahi:\tNo" fi +if test "$use_mdnsembedded" != "no"; then + final_message="$final_message\n mDNSEmbedded:\tYes" +else + final_message="$final_message\n mDNSEmbedded:\tNo" +fi + if test "$use_nonfree" = "yes"; then final_message="$final_message\n Non-free:\tYes" HAVE_XBMC_NONFREE=1 diff --git a/xbmc/network/mdns/Makefile b/xbmc/network/mdns/Makefile new file mode 100644 index 0000000000..5ea37cbe4f --- /dev/null +++ b/xbmc/network/mdns/Makefile @@ -0,0 +1,7 @@ +SRCS=ZeroconfMDNS.cpp \ + ZeroconfBrowserMDNS.cpp \ + +LIB=mdns.a + +include ../../../Makefile.include +-include $(patsubst %.cpp,%.P,$(patsubst %.c,%.P,$(SRCS))) |