summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThomas Vander Stichele <thomas@apestaart.org>2001-12-23 15:38:01 +0000
committerThomas Vander Stichele <thomas@apestaart.org>2001-12-23 15:38:01 +0000
commit4990996dbf1fa7d50e4dd44d242ef6bb3240f6e6 (patch)
tree51b8fa9fac7e3f5b38c58a0fc2eb508077f5cc94
parentba954374496502524ccd4b96731ecb16ff8ab5d9 (diff)
downloadgst-plugins-bad-4990996dbf1fa7d50e4dd44d242ef6bb3240f6e6.tar.gz
gst-plugins-bad-4990996dbf1fa7d50e4dd44d242ef6bb3240f6e6.tar.bz2
gst-plugins-bad-4990996dbf1fa7d50e4dd44d242ef6bb3240f6e6.zip
adding openquicktime (the renamed quicktime)
Original commit message from CVS: adding openquicktime (the renamed quicktime)
-rw-r--r--configure.ac14
-rw-r--r--ext/Makefile.am11
2 files changed, 16 insertions, 9 deletions
diff --git a/configure.ac b/configure.ac
index 1f25e9dd..61e40d98 100644
--- a/configure.ac
+++ b/configure.ac
@@ -523,7 +523,7 @@ AC_SUBST(MAD_LIBS)
dnl *** mikmod ***
translit(dnm, m, l) AM_CONDITIONAL(USE_LIBMIKMOD, true)
-GST_CHECK_FEATURE(LIBMIKMOD, [mikmod plugin], mikmod, [
+GST_CHECK_FEATURE(MIKMOD, [mikmod plugin], mikmod, [
AM_PATH_LIBMIKMOD(, HAVE_LIBMIKMOD=yes, HAVE_LIBMIKMOD=no)
])
@@ -534,11 +534,11 @@ GST_CHECK_FEATURE(MPEG2DEC, [mpeg2dec], mpeg2dec, [
AC_SUBST(MPEG2DEC_LIBS)
])
-dnl *** quicktime ***
-dnl FIXME: make this be called openquicktime
-translit(dnm, m, l) AM_CONDITIONAL(USE_QUICKTIME, true)
-GST_CHECK_FEATURE(QUICKTIME, [Open Quicktime], quicktime_parser quicktime_decoder quicktime_demux,[
- GST_CHECK_LIBHEADER(QUICKTIME, openquicktime, quicktime_init,, openquicktime/openquicktime.h, QUICKTIME_LIBS="-lopenquicktime")
+dnl *** openquicktime ***
+translit(dnm, m, l) AM_CONDITIONAL(USE_OPENQUICKTIME, true)
+GST_CHECK_FEATURE(OPENQUICKTIME, [Open Quicktime], quicktime_parser quicktime_decoder quicktime_demux,[
+ GST_CHECK_LIBHEADER(OPENQUICKTIME, openquicktime, quicktime_init,, openquicktime/openquicktime.h, OPENQUICKTIME_LIBS="-lopenquicktime")
+ AC_SUBST(OPENQUICKTIME_LIBS)
])
dnl *** raw1394 ***
@@ -912,7 +912,6 @@ AM_CONDITIONAL(HAVE_XMMS, test "x$HAVE_XMMS" = "xyes")
AM_CONDITIONAL(HAVE_RAW1394, test "x$HAVE_RAW1394" = "xyes")
AM_CONDITIONAL(HAVE_LIBDV, test "x$HAVE_LIBDV" = "xyes")
AM_CONDITIONAL(HAVE_GNOME_VFS, test "x$HAVE_GNOME_VFS" = "xyes")
-AM_CONDITIONAL(HAVE_LIBOPENQUICKTIME, test "x$HAVE_LIBOPENQUICKTIME" = "xyes")
AM_CONDITIONAL(HAVE_LIBGSM, test "x$HAVE_LIBGSM" = "xyes")
AM_CONDITIONAL(PLUGINS_USE_BUILDDIR, test "x$PLUGINS_USE_BUILDDIR" = "xyes")
AM_CONDITIONAL(HAVE_SIDPLAY, test "x$have_sidplay" = "xyes")
@@ -1075,6 +1074,7 @@ ext/jpeg/Makefile
ext/lame/Makefile
ext/mad/Makefile
ext/mpeg2dec/Makefile
+ext/openquicktime/Makefile
ext/shout/Makefile
ext/sdl/Makefile
ext/vorbis/Makefile
diff --git a/ext/Makefile.am b/ext/Makefile.am
index 8a69f2c2..d5c74f0d 100644
--- a/ext/Makefile.am
+++ b/ext/Makefile.am
@@ -95,6 +95,12 @@ else
MPEG2DEC_DIR=
endif
+if USE_OPENQUICKTIME
+OPENQUICKTIME_DIR=openquicktime
+else
+OPENQUICKTIME_DIR=
+endif
+
if USE_SDL
SDL_DIR=sdl
else
@@ -117,7 +123,8 @@ SUBDIRS=$(A52_DIR) $(AALIB_DIR) $(ALSA_DIR) $(AUDIOFILE_DIR) \
$(AVIFILE_DIR) $(CDPARANOIA_DIR) $(DVDREAD_DIR) $(ESD_DIR) \
$(FESTIVAL_DIR) $(FLAC_DIR) $(GSM_DIR) $(HERMES_DIR) \
$(JPEG_DIR) $(LAME_DIR) $(MAD_DIR) $(MPEG2DEC_DIR) \
- $(SDL_DIR) $(SHOUT_DIR) $(VORBIS_DIR)
+ $(OPENQUICKTIME_DIR) $(SDL_DIR) $(SHOUT_DIR) $(VORBIS_DIR)
DIST_SUBDIRS=a52 aalib alsa avifile audiofile cdparanoia dvdread esd \
- festival flac gsm hermes jpeg lame mad mpeg2dec sdl shout vorbis
+ festival flac gsm hermes jpeg lame mad mpeg2dec \
+ openquicktime sdl shout vorbis