mirror of
https://gitlab.freedesktop.org/gstreamer/gstreamer.git
synced 2025-01-12 10:25:33 +00:00
Trying to correct the GST_CHECK_CONFIGPROG macro. It works perfectly for
Original commit message from CVS: * Trying to correct the GST_CHECK_CONFIGPROG macro. It works perfectly for I hope i dont break anything. * Shifting the MAS plugin back from gst-rotten.
This commit is contained in:
parent
abf9990e25
commit
d6441e8f27
3 changed files with 18 additions and 1 deletions
2
common
2
common
|
@ -1 +1 @@
|
||||||
Subproject commit 14f44a56213628dcfdf8ca77159ba0f9622f6102
|
Subproject commit e258b347aa811ca7aa49e102ca3d576a91e4fb62
|
|
@ -1208,6 +1208,14 @@ int main (int argc, char *argv[])
|
||||||
AC_SUBST(LAME_CFLAGS)
|
AC_SUBST(LAME_CFLAGS)
|
||||||
AC_SUBST(LAME_LIBS)
|
AC_SUBST(LAME_LIBS)
|
||||||
|
|
||||||
|
dnl *** MAS (TODO) ***
|
||||||
|
translit(dnm, m, l) AM_CONDITIONAL(USE_MAS, true)
|
||||||
|
GST_CHECK_FEATURE(MAS, [mas], mas, [
|
||||||
|
GST_CHECK_CONFIGPROG(MAS, mas-config)
|
||||||
|
AC_SUBST(MAS_CFLAGS)
|
||||||
|
AC_SUBST(MAS_LIBS)
|
||||||
|
])
|
||||||
|
|
||||||
dnl *** libcaca ***
|
dnl *** libcaca ***
|
||||||
translit(dnm, m, l) AM_CONDITIONAL(USE_LIBCACA, true)
|
translit(dnm, m, l) AM_CONDITIONAL(USE_LIBCACA, true)
|
||||||
GST_CHECK_FEATURE(LIBCACA, [libcaca], libcaca, [
|
GST_CHECK_FEATURE(LIBCACA, [libcaca], libcaca, [
|
||||||
|
@ -1954,6 +1962,7 @@ ext/libpng/Makefile
|
||||||
ext/librfb/Makefile
|
ext/librfb/Makefile
|
||||||
ext/libvisual/Makefile
|
ext/libvisual/Makefile
|
||||||
ext/mad/Makefile
|
ext/mad/Makefile
|
||||||
|
ext/mas/Makefile
|
||||||
ext/mikmod/Makefile
|
ext/mikmod/Makefile
|
||||||
ext/mpeg2dec/Makefile
|
ext/mpeg2dec/Makefile
|
||||||
ext/mpeg2enc/Makefile
|
ext/mpeg2enc/Makefile
|
||||||
|
|
|
@ -226,6 +226,12 @@ else
|
||||||
MPLEX_DIR=
|
MPLEX_DIR=
|
||||||
endif
|
endif
|
||||||
|
|
||||||
|
if USE_MAS
|
||||||
|
MAS_DIR=mas
|
||||||
|
else
|
||||||
|
MAS_DIR=
|
||||||
|
endif
|
||||||
|
|
||||||
if USE_MUSICBRAINZ
|
if USE_MUSICBRAINZ
|
||||||
MUSICBRAINZ_DIR=musicbrainz
|
MUSICBRAINZ_DIR=musicbrainz
|
||||||
else
|
else
|
||||||
|
@ -381,6 +387,7 @@ SUBDIRS=\
|
||||||
$(LIBRFB_DIR) \
|
$(LIBRFB_DIR) \
|
||||||
$(LIBVISUAL_DIR) \
|
$(LIBVISUAL_DIR) \
|
||||||
$(MAD_DIR) \
|
$(MAD_DIR) \
|
||||||
|
$(MAS_DIR) \
|
||||||
$(MIKMOD_DIR) \
|
$(MIKMOD_DIR) \
|
||||||
$(MPEG2DEC_DIR) \
|
$(MPEG2DEC_DIR) \
|
||||||
$(MPEG2ENC_DIR) \
|
$(MPEG2ENC_DIR) \
|
||||||
|
@ -444,6 +451,7 @@ DIST_SUBDIRS=\
|
||||||
mpeg2dec \
|
mpeg2dec \
|
||||||
mpeg2enc \
|
mpeg2enc \
|
||||||
mplex \
|
mplex \
|
||||||
|
mas \
|
||||||
musicbrainz \
|
musicbrainz \
|
||||||
nas \
|
nas \
|
||||||
ogg \
|
ogg \
|
||||||
|
|
Loading…
Reference in a new issue