Commit b6d24bfa authored by Christian Beier's avatar Christian Beier

Adopt autotools build system to Android.

LibVNCServer/LibVNCClient now build for Android!
parent 5a5cfbe2
...@@ -807,6 +807,13 @@ AM_CONDITIONAL(LINUX, test -c /dev/vcsa1) ...@@ -807,6 +807,13 @@ AM_CONDITIONAL(LINUX, test -c /dev/vcsa1)
AC_CHECK_HEADER(ApplicationServices/ApplicationServices.h, HAVE_OSX="true") AC_CHECK_HEADER(ApplicationServices/ApplicationServices.h, HAVE_OSX="true")
AM_CONDITIONAL(OSX, test "$HAVE_OSX" = "true") AM_CONDITIONAL(OSX, test "$HAVE_OSX" = "true")
# Check for Android specific header
AC_CHECK_HEADER(android/api-level.h, HAVE_ANDROID="true")
AM_CONDITIONAL(ANDROID, test "$HAVE_ANDROID" = "true")
if test "$HAVE_ANDROID" = "true"; then
AC_DEFINE(HAVE_ANDROID, 1, [Android host system detected])
fi
# On Solaris 2.7, write() returns ENOENT when it really means EAGAIN # On Solaris 2.7, write() returns ENOENT when it really means EAGAIN
AH_TEMPLATE(ENOENT_WORKAROUND, [work around when write() returns ENOENT but does not mean it]) AH_TEMPLATE(ENOENT_WORKAROUND, [work around when write() returns ENOENT but does not mean it])
case `(uname -sr) 2>/dev/null` in case `(uname -sr) 2>/dev/null` in
...@@ -833,6 +840,7 @@ AC_CONFIG_FILES([Makefile ...@@ -833,6 +840,7 @@ AC_CONFIG_FILES([Makefile
libvncclient.pc libvncclient.pc
libvncserver/Makefile libvncserver/Makefile
examples/Makefile examples/Makefile
examples/android/Makefile
vncterm/Makefile vncterm/Makefile
classes/Makefile classes/Makefile
classes/ssl/Makefile classes/ssl/Makefile
......
...@@ -6,6 +6,10 @@ MAC=mac ...@@ -6,6 +6,10 @@ MAC=mac
mac_LDFLAGS=-framework ApplicationServices -framework Carbon -framework IOKit mac_LDFLAGS=-framework ApplicationServices -framework Carbon -framework IOKit
endif endif
if ANDROID
SUBDIRS=android
endif
if WITH_TIGHTVNC_FILETRANSFER if WITH_TIGHTVNC_FILETRANSFER
FILETRANSFER=filetransfer FILETRANSFER=filetransfer
endif endif
......
INCLUDES = -I$(top_srcdir)
LDADD = $(top_srcdir)/libvncserver/libvncserver.la @WSOCKLIB@
noinst_PROGRAMS=androidvncserver
androidvncserver_SOURCES=jni/fbvncserver.c
...@@ -43,7 +43,7 @@ extern "C" ...@@ -43,7 +43,7 @@ extern "C"
#include <string.h> #include <string.h>
#include <rfb/rfbproto.h> #include <rfb/rfbproto.h>
#ifdef ANDROID #if defined(ANDROID) || defined(LIBVNCSERVER_HAVE_ANDROID)
#include <arpa/inet.h> #include <arpa/inet.h>
#include <sys/select.h> #include <sys/select.h>
#endif #endif
......
...@@ -8,10 +8,12 @@ LDADD=../libvncserver/libvncserver.la @WSOCKLIB@ ...@@ -8,10 +8,12 @@ LDADD=../libvncserver/libvncserver.la @WSOCKLIB@
if LINUX if LINUX
if ! MINGW if ! MINGW
if ! ANDROID
bin_PROGRAMS=LinuxVNC bin_PROGRAMS=LinuxVNC
LinuxVNC_SOURCES=LinuxVNC.c $(CONSOLE_SRCS) LinuxVNC_SOURCES=LinuxVNC.c $(CONSOLE_SRCS)
endif endif
endif endif
endif
if ! MINGW if ! MINGW
VNCOMMAND=VNCommand VNCOMMAND=VNCommand
......
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