Commit 8a1afb86 authored by Rémi Duraffort's avatar Rémi Duraffort

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

access_dtv for Android systems.
parent 361edf82
...@@ -171,6 +171,7 @@ LDFLAGS_vlc="${LDFLAGS}" ...@@ -171,6 +171,7 @@ LDFLAGS_vlc="${LDFLAGS}"
dnl dnl
dnl Check the operating system dnl Check the operating system
dnl dnl
HAVE_ANDROID="0"
HAVE_WIN64="0" HAVE_WIN64="0"
case "${host_os}" in case "${host_os}" in
"") "")
...@@ -178,6 +179,10 @@ case "${host_os}" in ...@@ -178,6 +179,10 @@ case "${host_os}" in
;; ;;
linux*) linux*)
SYS=linux SYS=linux
AC_TRY_COMPILE([],[#ifndef __ANDROID__
# error "Not compiling for Android"
#endif],
[HAVE_ANDROID="1"])
;; ;;
bsdi*) bsdi*)
SYS=bsdi SYS=bsdi
...@@ -393,13 +398,14 @@ case "${host_os}" in ...@@ -393,13 +398,14 @@ case "${host_os}" in
SYS="${host_os}" SYS="${host_os}"
;; ;;
esac esac
AM_CONDITIONAL(HAVE_ANDROID, test "${HAVE_ANDROID}" = "1")
AM_CONDITIONAL(HAVE_DARWIN, test "${SYS}" = "darwin") AM_CONDITIONAL(HAVE_DARWIN, test "${SYS}" = "darwin")
AM_CONDITIONAL(HAVE_LINUX, test "${SYS}" = "linux") AM_CONDITIONAL(HAVE_LINUX, test "${SYS}" = "linux")
AM_CONDITIONAL(HAVE_OS2, test "${SYS}" = "os2") AM_CONDITIONAL(HAVE_OS2, test "${SYS}" = "os2")
AM_CONDITIONAL(HAVE_SYMBIAN, test "${SYS}" = "symbian")
AM_CONDITIONAL(HAVE_WIN32, test "${SYS}" = "mingw32") AM_CONDITIONAL(HAVE_WIN32, test "${SYS}" = "mingw32")
AM_CONDITIONAL(HAVE_WIN64, test "${HAVE_WIN64}" = "1") AM_CONDITIONAL(HAVE_WIN64, test "${HAVE_WIN64}" = "1")
AM_CONDITIONAL(HAVE_WINCE, test "${SYS}" = "mingwce") AM_CONDITIONAL(HAVE_WINCE, test "${SYS}" = "mingwce")
AM_CONDITIONAL(HAVE_SYMBIAN, test "${SYS}" = "symbian")
AM_CONDITIONAL(USE_PEFLAGS, test "${enable_peflags}" = "yes") AM_CONDITIONAL(USE_PEFLAGS, test "${enable_peflags}" = "yes")
dnl dnl
......
...@@ -128,9 +128,11 @@ libdtv_plugin_la_LIBADD = $(AM_LIBADD) ...@@ -128,9 +128,11 @@ libdtv_plugin_la_LIBADD = $(AM_LIBADD)
libdtv_plugin_la_DEPENDENCIES = libdtv_plugin_la_DEPENDENCIES =
if HAVE_LINUX if HAVE_LINUX
if !HAVE_ANDROID
libdtv_plugin_la_SOURCES += dtv/linux.c libdtv_plugin_la_SOURCES += dtv/linux.c
libvlc_LTLIBRARIES += libdtv_plugin.la libvlc_LTLIBRARIES += libdtv_plugin.la
endif endif
endif
if HAVE_WIN32 if HAVE_WIN32
# Work-around automake bug: # 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