summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Roitzsch <mroi@users.sourceforge.net>2004-01-12 19:34:18 +0000
committerMichael Roitzsch <mroi@users.sourceforge.net>2004-01-12 19:34:18 +0000
commitd5dfe9dac09ae19a42e284fe894c8edf3f8e2e2c (patch)
tree68306c66e82558475aead31f992739c953d49e45
parent962c11ef8de3aa7ffee91065a88456f605da0715 (diff)
downloadxine-lib-d5dfe9dac09ae19a42e284fe894c8edf3f8e2e2c.tar.gz
xine-lib-d5dfe9dac09ae19a42e284fe894c8edf3f8e2e2c.tar.bz2
* adding Thibaut's matroska demuxer
* changing libtool hacking to correctly work with 1.5 (should still work with oder versions - crossing fingers) CVS patchset: 6031 CVS date: 2004/01/12 19:34:18
-rw-r--r--configure.ac8
1 files changed, 4 insertions, 4 deletions
diff --git a/configure.ac b/configure.ac
index 425e33cd1..10b604d2c 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1933,12 +1933,12 @@ dnl cat libtool | sed -e 's/s/command\=\"\$base_compile\ \$srcfile/command\=\"\$
dnl cat libtool.tmp > libtool
dnl chmod +x libtool
-dnl made libtool-nofpic silent and not installing plugins's .la files
-cat libtool | sed -e 's/^show=\".*/show=\":\"/g;s/# Install the pseudo\-library.*/continue/g' > libtool.tmp
+dnl make libtool-nofpic silent and not installing plugins's .la files
+cat libtool | sed -e 's/^ *\$echo \"---------.*$/exit 0/;s/# Install the pseudo-library.*/continue/' > libtool.tmp
dnl Remove fPIC flag, if necessary
if test x$no_fpic = "xyes"; then
- cat libtool.tmp | sed -e 's/^pic_flag=/#pic_flag=/' > libtool-nofpic
+ cat libtool.tmp | sed -e 's/^pic_flag=/#pic_flag=/;s/^ *pic_mode=.*$/pic_mode=no/' > libtool-nofpic
else
cat libtool.tmp > libtool-nofpic
fi
@@ -2004,7 +2004,7 @@ echo " - ws aud - pva"
echo " - vox - nsf"
echo " - nsv - 4xm"
echo " - ac3 - aac"
-echo " - iff"
+echo " - iff - matroska"
if test x"$enable_asf" = "xyes"; then
echo " - asf"
fi