From b54c8d9d962445260b6c237d53a63c589a9ed1c6 Mon Sep 17 00:00:00 2001 From: Thomas Vander Stichele Date: Thu, 17 Jan 2002 13:03:04 +0000 Subject: [PATCH] please don't try to change what is going to be build in Makefile.am files everything is done using a USE_ conditional... Original commit message from CVS: please don't try to change what is going to be build in Makefile.am files everything is done using a USE_ conditional, so set it to no in configure.ac if you don't want it. This one is a good example. Don't know if qcam needs nasm though : is checking for nasm a check for what hardware platform ? If so we need to change this. In any case, let's not "fix" "problems" like this because this is how cruft comes in. Keep it in a local tree and bring it up so we can fix it right ;) --- configure.ac | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/configure.ac b/configure.ac index 857f96cb25..57a6fa03eb 100644 --- a/configure.ac +++ b/configure.ac @@ -279,7 +279,16 @@ GST_CHECK_FEATURE(OSS, [OSS audio], osssrc osssink, [ dnl *** QuickCam *** translit(dnm, m, l) AM_CONDITIONAL(USE_QCAM, true) -GST_CHECK_FEATURE(QCAM, [QuickCam], qcamsrc, HAVE_QCAM="yes") +GST_CHECK_FEATURE(QCAM, [QuickCam], qcamsrc, [ +dnl this one is for hadess, no qcam when no nasm found + if test "x$HAVE_NASM" = "xno"; + then + HAVE_QCAM="no" + AC_MSG_WARN([QuickCam needs nasm]) + else + HAVE_QCAM="yes" + fi +]) dnl *** Video 4 Linux *** translit(dnm, m, l) AM_CONDITIONAL(USE_V4L, true)