- dodge compiling memchunk and bufspeed if NASM is not present

Original commit message from CVS:
- dodge compiling memchunk and bufspeed if NASM is not present

diff --git a/ChangeLog b/ChangeLog
index 61f1a9b..38a66b0 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2002-01-15  Bastien Nocera  <hadess@hadess.net>
+
+       * tests/Makefile.am: dodge compiling memchunk and bufspeed
+       if NASM is not present
+
 2002-01-03 Rodney Dawes  <dobey@free.fr>
 
        * gstreamer.spec.in: Fixed the missing plug-ins problem

diff --git a/tests/Makefile.am b/tests/Makefile.am
index e9a58ec..04446fc 100644 (file)
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -1,4 +1,12 @@
-SUBDIRS = bufspeed memchunk muxing sched
+# This directory depends on an x86 computer, so if nasm is present, we're good
+# complain to hadess@hadess.net
+if HAVE_NASM
+NASMDEP_DIR=bufspeed memchunk
+else
+NASMDEP_DIR=
+endif
+
+SUBDIRS = $(NASMDEP_DIR) muxing sched
 
 noinst_PROGRAMS = lat