diff options
| author | David Schleef <ds@schleef.org> | 2004-09-15 19:29:24 +0000 |
|---|---|---|
| committer | David Schleef <ds@schleef.org> | 2004-09-15 19:29:24 +0000 |
| commit | bbccf23eed302607fd169a5843f043167a15041b (patch) | |
| tree | 67fb77c952a604716d640e68b089398dd38f609c /configure.ac | |
| parent | 9ce02e0a6c5b5af9f1d0e4522ba5e6667075cb8b (diff) | |
| download | gst-plugins-bad-bbccf23eed302607fd169a5843f043167a15041b.tar.gz gst-plugins-bad-bbccf23eed302607fd169a5843f043167a15041b.tar.bz2 gst-plugins-bad-bbccf23eed302607fd169a5843f043167a15041b.zip | |
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
Diffstat (limited to 'configure.ac')
| -rw-r--r-- | configure.ac | 16 |
1 files changed, 4 insertions, 12 deletions
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) ]) |