From c1cecbab40ef2d70446308aabdef10d9c8e21be1 Mon Sep 17 00:00:00 2001 From: Toni Uhlig Date: Mon, 26 Nov 2018 01:32:29 +0100 Subject: support for android eabi builds Signed-off-by: Toni Uhlig --- configure.ac | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) (limited to 'configure.ac') diff --git a/configure.ac b/configure.ac index 36ddddc..4de8642 100644 --- a/configure.ac +++ b/configure.ac @@ -11,6 +11,9 @@ case x"${host}" in use_msw=yes PROGRAM_EXT=".exe" ;; + *-androideabi) + use_android=yes + ;; esac AM_SILENT_RULES([yes]) @@ -35,10 +38,16 @@ dnl Check for std includes. AC_CHECK_HEADERS([stdarg.h stdio.h unistd.h stdlib.h string.h stdint.h time.h signal.h assert.h],, [AC_MSG_ERROR([Missing essential std headers.])]) if test x"${use_msw}" != x"yes"; then - AC_CHECK_HEADERS([sys/unistd.h sys/types.h sys/socket.h netinet/in.h arpa/inet.h netdb.h pthread.h errno.h net/ethernet.h syslog.h pwd.h grp.h],, + if test x"${use_android}" != x"yes"; then + AC_CHECK_HEADERS([sys/unistd.h],,[AC_MSG_ERROR([Missing essential non-Windows/Android std headers.])]) + fi + AC_CHECK_HEADERS([sys/types.h sys/socket.h netinet/in.h arpa/inet.h netdb.h pthread.h errno.h net/ethernet.h syslog.h pwd.h grp.h],, [AC_MSG_ERROR([Missing essential non-Windows std headers.])]) AC_SEARCH_LIBS([pthread_create], [pthread],, [AC_MSG_ERROR([Missing pthread library.])],) + if test x"${use_android}" != x"yes"; then + AC_CHECK_FUNCS([signal],,[AC_MSG_ERROR([Missing essential non-Android std functions.])]) + fi AC_CHECK_FUNCS([pthread_mutex_init pthread_mutex_lock pthread_mutex_unlock syslog getaddrinfo freeaddrinfo gai_strerror],, [AC_MSG_ERROR([Missing essential Linux std functions.])]) else @@ -104,7 +113,7 @@ struct foo { ,[AC_MSG_ERROR([Your compiler does not support \`__attribute__ ((packed))\`.])]) dnl Check for std functions. -AC_CHECK_FUNCS([malloc calloc free memcpy memset signal printf sprintf vsnprintf strerror strlen strncmp strstr strtol strtoul fopen fprintf gettimeofday close fclose exit getopt_long],, +AC_CHECK_FUNCS([malloc calloc free memcpy memset printf sprintf vsnprintf strerror strlen strncmp strstr strtol strtoul fopen fprintf gettimeofday close fclose exit getopt_long],, [AC_MSG_ERROR([Missing essential std functions.])]) dnl `--disable-pcap`: Enabled if found. -- cgit v1.2.3 From 3f8b7c92b4cf074345c75d72eefd5fb0ba513cc6 Mon Sep 17 00:00:00 2001 From: Toni Uhlig Date: Mon, 26 Nov 2018 15:17:32 +0100 Subject: android host build: check for __android_log_vprint in liblog.so to prevent linker errors in the logging facility Signed-off-by: Toni Uhlig --- configure.ac | 3 +++ 1 file changed, 3 insertions(+) (limited to 'configure.ac') diff --git a/configure.ac b/configure.ac index 4de8642..6585093 100644 --- a/configure.ac +++ b/configure.ac @@ -154,6 +154,9 @@ if test x"${selinux_enabled}" != x; then AC_SEARCH_LIBS([setcon], [selinux],,[selinux_enabled=],) fi +dnl Check for Android liblog.so +AC_SEARCH_LIBS([__android_log_vprint], [log],,,) + dnl Set automake conf vars AM_CONDITIONAL([HAVE_PCAP], [test x"${pcap_enabled}" = xyes]) AM_CONDITIONAL([HAVE_SELINUX], [test x"${selinux_enabled}" = xyes]) -- cgit v1.2.3 From a2eee970b908ab3f898b20a546c6bc0517bd2d17 Mon Sep 17 00:00:00 2001 From: Toni Uhlig Date: Mon, 26 Nov 2018 18:08:51 +0100 Subject: fix configure error for OpenWrt also (see c1cecbab40ef2d70446308aabdef10d9c8e21be1) Signed-off-by: Toni Uhlig --- configure.ac | 4 +--- src/ptunnel.h | 2 +- 2 files changed, 2 insertions(+), 4 deletions(-) (limited to 'configure.ac') diff --git a/configure.ac b/configure.ac index 6585093..4d34483 100644 --- a/configure.ac +++ b/configure.ac @@ -38,9 +38,7 @@ dnl Check for std includes. AC_CHECK_HEADERS([stdarg.h stdio.h unistd.h stdlib.h string.h stdint.h time.h signal.h assert.h],, [AC_MSG_ERROR([Missing essential std headers.])]) if test x"${use_msw}" != x"yes"; then - if test x"${use_android}" != x"yes"; then - AC_CHECK_HEADERS([sys/unistd.h],,[AC_MSG_ERROR([Missing essential non-Windows/Android std headers.])]) - fi + AC_CHECK_HEADERS([sys/unistd.h],,) AC_CHECK_HEADERS([sys/types.h sys/socket.h netinet/in.h arpa/inet.h netdb.h pthread.h errno.h net/ethernet.h syslog.h pwd.h grp.h],, [AC_MSG_ERROR([Missing essential non-Windows std headers.])]) AC_SEARCH_LIBS([pthread_create], [pthread],, diff --git a/src/ptunnel.h b/src/ptunnel.h index 8f77458..7566f92 100644 --- a/src/ptunnel.h +++ b/src/ptunnel.h @@ -45,7 +45,7 @@ #define PING_TUNNEL_H 1 #ifndef WIN32 -#ifndef __ANDROID__ +#ifdef HAVE_SYS_UNISTD_H #include #endif #include -- cgit v1.2.3 From abea0f617f6339f3eeedcc849ef690289d5bad80 Mon Sep 17 00:00:00 2001 From: Toni Uhlig Date: Mon, 3 Dec 2018 10:07:31 +0100 Subject: 1.31-release Signed-off-by: Toni Uhlig --- ChangeLog | 4 ++++ configure.ac | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) (limited to 'configure.ac') diff --git a/ChangeLog b/ChangeLog index 03879da..fc40604 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,6 +1,10 @@ PingTunnel-NG Changelog ======================= +1.31 - 03. December 2018 +- added Android build support (requires a root'ed device!) +- fixed ArchLinux PKGBUILD/AUR + 1.30 - 19. October 2018 - travis-ci, coverity integration - xcompile issue for mingw-w64 fixed diff --git a/configure.ac b/configure.ac index 4d34483..f45d875 100644 --- a/configure.ac +++ b/configure.ac @@ -1,5 +1,5 @@ AC_PREREQ(2.69) -AC_INIT([ptunnel-ng], [1.3], [], [], []) +AC_INIT([ptunnel-ng], [1.31], [], [], []) AC_CONFIG_SRCDIR([src/config.h.in]) AC_CONFIG_FILES([Makefile src/Makefile]) -- cgit v1.2.3