mirrors/aria2
1
0
Fork 0
mirror of https://github.com/aria2/aria2.git synced 2025-04-04 21:17:41 +03:00
Code Issues Projects Releases Packages Wiki Activity

Add libssh2 to android build config

Browse source
This commit is contained in:
Tatsuhiro Tsujikawa 2015-05-16 23:00:26 +09:00
parent 381533e32d
commit ce36021447
3 changed files with 22 additions and 18 deletions
Download patch file Download diff file Expand all files Collapse all files

7
README.android
View file

@ -42,9 +42,10 @@ aria2c executable was generated using android-ndk-r10b.
The following libraries were statically linked. The following libraries were statically linked.
* openssl 1.0.2 * openssl 1.0.2a
* expat 2.1.0 * expat 2.1.0
* c-ares 1.10.0 * c-ares 1.10.0
* libssh2 1.5.0
Since Android does not have ``/etc/resolv.conf``, c-ares (asynchronous Since Android does not have ``/etc/resolv.conf``, c-ares (asynchronous
DNS resolver) is disabled by default. But name resolution is sometimes DNS resolver) is disabled by default. But name resolution is sometimes

5
android-config
View file

@ -50,13 +50,16 @@ PATH=$TOOLCHAIN/bin:$PATH
--with-libexpat --with-libexpat-prefix=$PREFIX \ --with-libexpat --with-libexpat-prefix=$PREFIX \
--with-libcares --with-libcares-prefix=$PREFIX \ --with-libcares --with-libcares-prefix=$PREFIX \
--with-libz --with-libz-prefix=$PREFIX \ --with-libz --with-libz-prefix=$PREFIX \
--with-libssh2 \
CXXFLAGS="-Os -g" \ CXXFLAGS="-Os -g" \
CFLAGS="-Os -g" \ CFLAGS="-Os -g" \
CPPFLAGS="-fPIE" \ CPPFLAGS="-fPIE" \
LDFLAGS="-fPIE -pie -L$PREFIX/lib" \ LDFLAGS="-fPIE -pie -L$PREFIX/lib" \
PKG_CONFIG_LIBDIR="$PREFIX/lib/pkgconfig" \ PKG_CONFIG_LIBDIR="$PREFIX/lib/pkgconfig" \
ZLIB_LIBS="-lz" \ ZLIB_LIBS="-lz" \
ZLIB_CFLAGS="-I$TOOLCHAIN/sysroot/usr/include" ZLIB_CFLAGS="-I$TOOLCHAIN/sysroot/usr/include" \
LIBSSH2_LIBS="-lssh2" \
LIBSSH2_CFLAGS="-I$TOOLCHAIN/sysroot/usr/include"
# ZLIB_LIBS and ZLIB_CFLAGS are needed because aria2 configure script # ZLIB_LIBS and ZLIB_CFLAGS are needed because aria2 configure script
# checks zlib availability using pkg-config, but android toochain does # checks zlib availability using pkg-config, but android toochain does

28
configure.ac
View file

@ -291,20 +291,6 @@ if test "x$with_sqlite3" = "xyes"; then
fi fi
fi fi
if test "x$with_libssh2" = "xyes"; then
PKG_CHECK_MODULES([LIBSSH2], [libssh2], [have_libssh2=yes], [have_libssh2=no])
if test "x$have_libssh2" = "xyes"; then
AC_DEFINE([HAVE_LIBSSH2], [1], [Define to 1 if you have libssh2.])
LIBS="$LIBSSH2_LIBS $LIBS"
CPPFLAGS="$LIBSSH2_CFLAGS $CPPFLAGS"
else
AC_MSG_WARN([$LIBSSH2_PKG_ERRORS])
if test "x$with_libssh2_requested" = "yes"; then
ARIA2_DEP_NOT_MET([libssh2])
fi
fi
fi
case "$host" in case "$host" in
*darwin*) *darwin*)
have_osx="yes" have_osx="yes"
@ -477,6 +463,20 @@ if test "x$have_openssl" != "xyes"; then
fi fi
fi fi
if test "x$with_libssh2" = "xyes"; then
PKG_CHECK_MODULES([LIBSSH2], [libssh2], [have_libssh2=yes], [have_libssh2=no])
if test "x$have_libssh2" = "xyes"; then
AC_DEFINE([HAVE_LIBSSH2], [1], [Define to 1 if you have libssh2.])
LIBS="$LIBSSH2_LIBS $LIBS"
CPPFLAGS="$LIBSSH2_CFLAGS $CPPFLAGS"
else
AC_MSG_WARN([$LIBSSH2_PKG_ERRORS])
if test "x$with_libssh2_requested" = "xyes"; then
ARIA2_DEP_NOT_MET([libssh2])
fi
fi
fi
if test "x$with_libcares" = "xyes"; then if test "x$with_libcares" = "xyes"; then
PKG_CHECK_MODULES([LIBCARES], [libcares >= 1.7.0], [have_libcares=yes], PKG_CHECK_MODULES([LIBCARES], [libcares >= 1.7.0], [have_libcares=yes],
[have_libcares=no]) [have_libcares=no])