[vlc-commits] Revert " Add an automate variable to detect Android builb and use it to forbid build of "

[Rémi Denis-Courmont]

vlc | branch: master | Rémi Denis-Courmont <remi at remlab.net> | Sat Apr 30 17:29:33 2011 +0300| [f89b8c10ebd2536b5638252b1f966084b4463ae7] | committer: Rémi Denis-Courmont

Revert "Add an automate variable to detect Android builb and use it to forbid build of"

This reverts commit 8a1afb86f7747205d490d86fa20d4dd1f5932e69.
Don't define HAVE_LINUX if you don't have it in the first place.
And this does not even respect the configure message rules.

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

 configure.ac              |    8 +-------
 modules/access/Modules.am |    2 --
 2 files changed, 1 insertions(+), 9 deletions(-)

diff --git a/configure.ac b/configure.ac
index 39707f1..79a118f 100644
--- a/configure.ac
+++ b/configure.ac
@@ -171,7 +171,6 @@ LDFLAGS_vlc="${LDFLAGS}"
 dnl
 dnl  Check the operating system
 dnl
-HAVE_ANDROID="0"
 HAVE_WIN64="0"
 case "${host_os}" in
   "")
@@ -179,10 +178,6 @@ case "${host_os}" in
     ;;
   linux*)
     SYS=linux
-    AC_TRY_COMPILE([],[#ifndef __ANDROID__
-                       # error "Not compiling for Android"
-                       #endif],
-                   [HAVE_ANDROID="1"])
     ;;
   bsdi*)
     SYS=bsdi
@@ -398,14 +393,13 @@ case "${host_os}" in
     SYS="${host_os}"
     ;;
 esac
-AM_CONDITIONAL(HAVE_ANDROID, test "${HAVE_ANDROID}" = "1")
 AM_CONDITIONAL(HAVE_DARWIN,  test "${SYS}" = "darwin")
 AM_CONDITIONAL(HAVE_LINUX,   test "${SYS}" = "linux")
 AM_CONDITIONAL(HAVE_OS2,     test "${SYS}" = "os2")
-AM_CONDITIONAL(HAVE_SYMBIAN, test "${SYS}" = "symbian")
 AM_CONDITIONAL(HAVE_WIN32,   test "${SYS}" = "mingw32")
 AM_CONDITIONAL(HAVE_WIN64,   test "${HAVE_WIN64}" = "1")
 AM_CONDITIONAL(HAVE_WINCE,   test "${SYS}" = "mingwce")
+AM_CONDITIONAL(HAVE_SYMBIAN, test "${SYS}" = "symbian")
 AM_CONDITIONAL(USE_PEFLAGS,  test "${enable_peflags}" = "yes")
 
 dnl
diff --git a/modules/access/Modules.am b/modules/access/Modules.am
index ba81980..8d7bdce 100644
--- a/modules/access/Modules.am
+++ b/modules/access/Modules.am
@@ -128,11 +128,9 @@ libdtv_plugin_la_LIBADD = $(AM_LIBADD)
 libdtv_plugin_la_DEPENDENCIES =
 
 if HAVE_LINUX
-if !HAVE_ANDROID
 libdtv_plugin_la_SOURCES += dtv/linux.c
 libvlc_LTLIBRARIES += libdtv_plugin.la
 endif
-endif
 
 if HAVE_WIN32
 # Work-around automake bug: