Commit f89b8c10 authored by Rémi Denis-Courmont's avatar Rémi Denis-Courmont

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

This reverts commit 8a1afb86.
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.
parent c04d8671
......@@ -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
......
......@@ -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:
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment