[vlc-devel] [PATCH 1/2] iomx: Always build this module if building for android

[Martin Storsjö]

Remove the configure option for enabling iomx - there is no point
in using this module on any other platform than android.
---
 configure.ac             |   10 ----------
 modules/codec/Modules.am |    7 +++++--
 2 files changed, 5 insertions(+), 12 deletions(-)

diff --git a/configure.ac b/configure.ac
index d2acd93..5b32559 100644
--- a/configure.ac
+++ b/configure.ac
@@ -2094,16 +2094,6 @@ then
 fi
 
 dnl
-dnl iomx codec plugin
-dnl
-AC_ARG_ENABLE(iomx,
-  [  --enable-iomx           iomx codec module (default disabled)])
-if test "${enable_iomx}" = "yes"
-then
-  VLC_ADD_PLUGIN([iomx])
-fi
-
-dnl
 dnl CrystalHD codec plugin
 dnl
 AC_ARG_ENABLE(crystalhd,
diff --git a/modules/codec/Modules.am b/modules/codec/Modules.am
index 7947def..b6258f9 100644
--- a/modules/codec/Modules.am
+++ b/modules/codec/Modules.am
@@ -147,8 +147,11 @@ libiomx_plugin_la_SOURCES = $(libomxil_plugin_la_SOURCES)
 libiomx_plugin_la_CPPFLAGS = $(libomxil_plugin_la_CPPFLAGS) -DUSE_IOMX
 libiomx_plugin_la_LIBADD = $(libomxil_plugin_la_LIBADD)
 
-libvlc_LTLIBRARIES += $(LTLIBomxil) $(LTLIBiomx)
-EXTRA_LTLIBRARIES += libomxil_plugin.la libiomx_plugin.la
+libvlc_LTLIBRARIES += $(LTLIBomxil)
+EXTRA_LTLIBRARIES += libomxil_plugin.la
+if HAVE_ANDROID
+libvlc_LTLIBRARIES += libiomx_plugin.la
+endif
 
 ### Windows DLL loader ###
 
-- 
1.7.10