[vlc-commits] omxil: Remove the header check for the iomx module

Martin Storsjö git at videolan.org
Tue Dec 20 00:23:45 CET 2011


vlc/vlc-1.2 | branch: master | Martin Storsjö <martin at martin.st> | Fri Dec 16 23:47:04 2011 +0200| [f19bf724db6f6f31283a64e8186e8bc685948ed7] | committer: Jean-Baptiste Kempf

omxil: Remove the header check for the iomx module

Building the iomx version of the omxil module itself doesn't
require the private headers any longer, they're only necessary
when building the iomx wrapper code (which should be built by the
NDK makefile instead).

Signed-off-by: Jean-Baptiste Kempf <jb at videolan.org>
(cherry picked from commit 8acfed11dc97ae97353f6f982323f9fdc86c0eb8)

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

 configure.ac |   13 +------------
 1 files changed, 1 insertions(+), 12 deletions(-)

diff --git a/configure.ac b/configure.ac
index 057dc68..8bcca5c 100644
--- a/configure.ac
+++ b/configure.ac
@@ -2305,18 +2305,7 @@ AC_ARG_ENABLE(iomx,
   [  --enable-iomx           iomx codec module (default disabled)])
 if test "${enable_iomx}" = "yes"
 then
-  CPPFLAGS_save="${CPPFLAGS}"
-  CPPFLAGS="${CPPFLAGS} -I${srcdir}/modules/codec/omxil" # For the OMX headers
-  AC_LANG_PUSH([C++])
-  AC_CHECK_HEADER(media/stagefright/OMXClient.h, [
-    VLC_ADD_PLUGIN([iomx])
-    VLC_ADD_CXXFLAGS([iomx], [-fno-exceptions -fno-rtti])
-    VLC_ADD_LIBS([iomx], [-lstagefright -lmedia -lutils -lbinder])
-  ], [
-    AC_MSG_ERROR("Could not find IOMX headers")
-  ])
-  AC_LANG_POP([C++])
-  CPPFLAGS="${CPPFLAGS_save}"
+  VLC_ADD_PLUGIN([iomx])
 fi
 
 dnl



More information about the vlc-commits mailing list