summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBastien Nocera <hadess@hadess.net>2002-01-17 00:36:01 +0000
committerBastien Nocera <hadess@hadess.net>2002-01-17 00:36:01 +0000
commit511817763dcd0fe1614c5b537276cbc054e40dd6 (patch)
tree17b0e1ab67fe885e4be9eacf0dfc0cd38cd368b2
parent7267131883b9014cd8cee0a20b219f776094f09e (diff)
- make the qcam plugin build only only platforms using NASM, ie. x86
Original commit message from CVS: - make the qcam plugin build only only platforms using NASM, ie. x86
-rw-r--r--ChangeLog5
-rw-r--r--sys/Makefile.am4
2 files changed, 8 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index 90109f37f..88d930111 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2002-01-17 Bastien Nocera <hadess@hadess.net>
+
+ * sys/Makefile.am: make the qcam plugin build only
+ only platforms using NASM, ie. x86
+
2002-01-06 Rodney Dawes <dobey@free.fr>
* configure.ac: added -lm to cdparanoia check so it works,
diff --git a/sys/Makefile.am b/sys/Makefile.am
index 2a022faca..fde0de70a 100644
--- a/sys/Makefile.am
+++ b/sys/Makefile.am
@@ -5,7 +5,9 @@ else
OSS_DIR=
endif
-if USE_QCAM
+# FIXME it's broken
+# hadess@hadess.net
+if HAVE_NASM
QCAM_DIR=qcam
else
QCAM_DIR=