diff options
| author | Bertrand Lorentz <bertrand.lorentz@gmail.com> | 2012-02-09 21:23:18 +0100 |
|---|---|---|
| committer | Bertrand Lorentz <bertrand.lorentz@gmail.com> | 2012-02-09 21:23:18 +0100 |
| commit | 0e41988a3c1da72f2d6850ab9f0459e2c6a06fae (patch) | |
| tree | d4f1caf5cfc554227d4762aa040a319e49f77017 /build | |
| parent | bc4acbdbc1811c9c50a1ce43fdfe6440e1e3eb99 (diff) | |
build: Allow disabling the UPnPClient extension
The UPnPClient is built by default, but this can be disabled by
passing --disable-upnp to configure.
Also rework the BANSHEE_CHECK_MONO_UPNP, to only call pkg-config once.
Diffstat (limited to 'build')
| -rw-r--r-- | build/build.environment.mk | 2 | ||||
| -rw-r--r-- | build/m4/banshee/mono-upnp.m4 | 22 |
2 files changed, 17 insertions, 7 deletions
diff --git a/build/build.environment.mk b/build/build.environment.mk index 9d2043c31..508e26178 100644 --- a/build/build.environment.mk +++ b/build/build.environment.mk @@ -29,7 +29,7 @@ LINK_MONO_ADDINS_DEPS = $(MONO_ADDINS_LIBS) LINK_MONO_ADDINS_SETUP_DEPS = $(MONO_ADDINS_SETUP_LIBS) LINK_INDICATESHARP = $(INDICATESHARP_LIBS) LINK_UBUNTUONESHARP = $(UBUNTUONESHARP_LIBS) -LINK_MONO_UPNP = $(MONO_SSDP_LIBS) $(MONO_UPNP_LIBS) $(MONO_UPNP_DCP_MEDIASERVER1_LIBS) +LINK_MONO_UPNP = $(MONO_UPNP_LIBS) DIR_BIN = $(top_builddir)/bin diff --git a/build/m4/banshee/mono-upnp.m4 b/build/m4/banshee/mono-upnp.m4 index 744a1b2d6..bc90abf78 100644 --- a/build/m4/banshee/mono-upnp.m4 +++ b/build/m4/banshee/mono-upnp.m4 @@ -1,12 +1,22 @@ AC_DEFUN([BANSHEE_CHECK_MONO_UPNP], [ - PKG_CHECK_MODULES(MONO_SSDP, mono.ssdp >= 0.1) - AC_SUBST(MONO_SSDP_LIBS) + MONOUPNP_REQUIRED=0.1 - PKG_CHECK_MODULES(MONO_UPNP, mono.upnp >= 0.1) - AC_SUBST(MONO_UPNP_LIBS) + AC_ARG_ENABLE(upnp, AC_HELP_STRING([--disable-upnp], [Disable UPnP support]), , enable_upnp="yes") + + if test "x$enable_upnp" = "xyes"; then + has_mono-upnp=no + PKG_CHECK_MODULES(MONO_UPNP, + mono.ssdp >= $MONOUPNP_REQUIRED + mono.upnp >= $MONOUPNP_REQUIRED + mono.upnp.dcp.mediaserver1 >= $MONOUPNP_REQUIRED) + + AC_SUBST(MONO_UPNP_LIBS) + + AM_CONDITIONAL(UPNP_ENABLED, true) + else + AM_CONDITIONAL(UPNP_ENABLED, false) + fi - PKG_CHECK_MODULES(MONO_UPNP_DCP_MEDIASERVER1, mono.upnp.dcp.mediaserver1 >= 0.1) - AC_SUBST(MONO_UPNP_DCP_MEDIASERVER1_LIBS) ]) |