Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

Merge pull request #3 from Dynalon/master

Add --disable-tests flags to mono-upnp configure.ac
  • Loading branch information...
commit 44e43fa8179afc53255d9be88aad9e3d115f8603 2 parents b374ed4 + c6f9bab
@alexkay alexkay authored
Showing with 18 additions and 6 deletions.
  1. +8 −2 Makefile.am
  2. +10 −4 configure.ac
View
10 Makefile.am
@@ -5,10 +5,16 @@ EXTRA_DIST = \
#Warning: This is an automatically generated file, do not edit!
if ENABLE_DEBUG
- SUBDIRS = src/Mono.Ssdp/Mono.Ssdp src/Mono.Upnp src/Mono.Upnp.Dcp/Mono.Upnp.Dcp.MediaServer1 tests
+ SUBDIRS = src/Mono.Ssdp/Mono.Ssdp src/Mono.Upnp src/Mono.Upnp.Dcp/Mono.Upnp.Dcp.MediaServer1
+if ENABLE_TESTS
+ SUBDIRS += tests
+endif
endif
if ENABLE_RELEASE
- SUBDIRS = src/Mono.Ssdp/Mono.Ssdp src/Mono.Upnp src/Mono.Upnp.Dcp/Mono.Upnp.Dcp.MediaServer1 tests
+ SUBDIRS = src/Mono.Ssdp/Mono.Ssdp src/Mono.Upnp src/Mono.Upnp.Dcp/Mono.Upnp.Dcp.MediaServer1
+if ENABLE_TESTS
+ SUBDIRS += tests
+endif
endif
.PHONY: test
View
14 configure.ac
@@ -51,11 +51,17 @@ PKG_CHECK_MODULES([GLIB_SHARP_20], [glib-sharp-2.0])
PKG_CHECK_MODULES([GLADE_SHARP_20], [glade-sharp-2.0])
PKG_CHECK_MODULES([MONO_ADDINS], [mono-addins])
PKG_CHECK_MODULES([TAGLIB_SHARP], [taglib-sharp])
-PKG_CHECK_MODULES([NUNIT], [nunit])
-
-AC_PATH_PROG(NUNIT_CMD, nunit-console2, nunit-console)
-AC_SUBST(NUNIT_CMD)
+AC_ARG_ENABLE(tests,
+ AC_HELP_STRING([--enable-tests],
+ [Build nunit tests [default=YES]]),
+ [], enable_tests=yes)
+ AM_CONDITIONAL(ENABLE_TESTS, test x$enable_tests = xyes)
+ if test "x$enable_tests" = "xyes" ; then
+ PKG_CHECK_MODULES([NUNIT], [nunit])
+ AC_PATH_PROG(NUNIT_CMD, nunit-console2, nunit-console)
+ AC_SUBST(NUNIT_CMD)
+ fi
AC_CONFIG_FILES([
src/Mono.Ssdp/Mono.Ssdp/mono.ssdp.pc
Please sign in to comment.
Something went wrong with that request. Please try again.