[vlc-devel] commit: Don't build tests in libass when Xcompiling. (Jean-Baptiste Kempf )

[git version control]

vlc | branch: master | Jean-Baptiste Kempf <jb at altair.videolan.org> | Tue Aug 12 09:01:48 2008 +0200| [83e5162f3e7fd466b53d0b13baa93fbe39807981] | committer: Jean-Baptiste Kempf 

Don't build tests in libass when Xcompiling.

> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=83e5162f3e7fd466b53d0b13baa93fbe39807981
---

 extras/contrib/src/Makefile                   |    2 +-
 extras/contrib/src/Patches/libass-cross.patch |    8 ++++++++
 2 files changed, 9 insertions(+), 1 deletions(-)

diff --git a/extras/contrib/src/Makefile b/extras/contrib/src/Makefile
index 4c5a1b1..2e10018 100644
--- a/extras/contrib/src/Makefile
+++ b/extras/contrib/src/Makefile
@@ -2468,7 +2468,7 @@ libass: libass-$(ASS_VERSION).tar.bz2
 	patch -p0 < Patches/libass_mplayer_updates.patch
 ifneq ($(HOST),$(BUILD))
 	patch -p0 < Patches/libass-cross.patch
-	cd $@; autoconf
+	cd $@; autoconf; automake
 endif
 
 .libass: libass .png
diff --git a/extras/contrib/src/Patches/libass-cross.patch b/extras/contrib/src/Patches/libass-cross.patch
index 6edc6ff..07ed336 100644
--- a/extras/contrib/src/Patches/libass-cross.patch
+++ b/extras/contrib/src/Patches/libass-cross.patch
@@ -12,3 +12,11 @@
  AC_FUNC_STAT
  AC_FUNC_STRTOD
  AC_FUNC_VPRINTF
+--- libass/Makefile.am.old	2008-08-12 08:55:47.000000000 +0200
++++ libass/Makefile.am	2008-08-12 08:56:05.000000000 +0200
+@@ -4,4 +4,4 @@
+ pkgconfigdir = $(libdir)/pkgconfig
+ pkgconfig_DATA = libass.pc
+ 
+-SUBDIRS = libass test
++SUBDIRS = libass