From bbccf23eed302607fd169a5843f043167a15041b Mon Sep 17 00:00:00 2001
From: David Schleef <ds@schleef.org>
Date: Wed, 15 Sep 2004 19:29:24 +0000
Subject: configure.ac: remove NASM check, since we don't use it.  Update dirac
 check to 0.4

Original commit message from CVS:
* configure.ac: remove NASM check, since we don't use it.  Update
dirac check to 0.4
* ext/dirac/gstdiracdec.cc: update to current 0.4 API
* gst/audioconvert/gstaudioconvert.c: (gst_audio_convert_link):
Initialized variables.
* gst/qtdemux/qtdemux.c: (gst_qtdemux_change_state),
(gst_qtdemux_loop_header), (qtdemux_parse), (qtdemux_parse_trak),
(gst_qtdemux_handle_esds), (qtdemux_audio_caps): Fix seeking, add
SVQ3 format
---
 configure.ac | 16 ++++------------
 1 file changed, 4 insertions(+), 12 deletions(-)

(limited to 'configure.ac')

diff --git a/configure.ac b/configure.ac
index 220e081a..37a4cad9 100644
--- a/configure.ac
+++ b/configure.ac
@@ -156,17 +156,6 @@ AC_ARG_WITH(pkg-config-path,
 dnl check architecture
 GST_ARCH()
 
-dnl Check for nasm
-AC_PATH_PROG(NASM_PATH, nasm, no)
-AC_SUBST(NASM_PATH)
-if test x$NASM_PATH = xno; then
-  AC_MSG_WARN(Couldn't find nasm)
-  HAVE_NASM="no"
-else
-  AC_DEFINE(HAVE_NASM, 1, [Define if NASM, the netwide assembler, is available])
-  HAVE_NASM="yes"
-fi
-
 dnl check for gconftool-2
 translit(dnm, m, l) AM_CONDITIONAL(USE_GCONFTOOL, true)
 GST_CHECK_FEATURE(GCONFTOOL, [GConf schemas], , [
@@ -817,7 +806,10 @@ dnl AC_CHECK_HEADER(cdda_paranoia.h, :, HAVE_CDPARANOIA=no)
 dnl *** dirac ***
 translit(dnm, m, l) AM_CONDITIONAL(USE_DIRAC, true)
 GST_CHECK_FEATURE(DIRAC, [dirac plug-ins], dirac, [
-  PKG_CHECK_MODULES(DIRAC, dirac, HAVE_DIRAC="yes", HAVE_DIRAC="no")
+  PKG_CHECK_MODULES(DIRAC, dirac-pic >= 0.4, HAVE_DIRAC="yes", HAVE_DIRAC="no")
+  if test x$HAVE_DIRAC = xno ; then
+    PKG_CHECK_MODULES(DIRAC, dirac >= 0.4, HAVE_DIRAC="yes", HAVE_DIRAC="no")
+  fi
   AC_SUBST(DIRAC_CFLAGS)
   AC_SUBST(DIRAC_LIBS)
 ])
-- 
cgit v1.2.1