[farsight2/master] Don't build upnp tests if not enabled

[Olivier Crête]

---
 tests/Makefile.am       |   12 ++++++++----
 tests/check/Makefile.am |    7 +++++--
 2 files changed, 13 insertions(+), 6 deletions(-)

diff --git a/tests/Makefile.am b/tests/Makefile.am
index ca83c4d..90d87e4 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -1,9 +1,13 @@
-if HAVE_GST_CHECK
-SUBDIRS_CHECK = check
-else
 SUBDIRS_CHECK =
+
+if HAVE_GST_CHECK
+SUBDIRS_CHECK += check
+endif
+
+if HAVE_GUPNP
+SUBDIRS_CHECK += upnp
 endif
 
-SUBDIRS = $(SUBDIRS_CHECK) rtp gui commandline upnp
+SUBDIRS = $(SUBDIRS_CHECK) rtp gui commandline
 
 DIST_SUBDIRS = check rtp gui commandline upnp
diff --git a/tests/check/Makefile.am b/tests/check/Makefile.am
index a0ea13c..a1c298f 100644
--- a/tests/check/Makefile.am
+++ b/tests/check/Makefile.am
@@ -39,8 +39,11 @@ check_PROGRAMS = \
 	rtp/codecs \
 	rtp/sendcodecs \
 	rtp/conference \
-	utils/binadded \
-	upnp/fsupnp
+	utils/binadded
+
+if HAVE_GUPNP
+check_PROGRAMS += upnp/fsupnp
+endif
 
 
 AM_CFLAGS = \
-- 
1.5.6.5