github
/
aria2
mirror of https://github.com/aria2/aria2
1
0
Fork 0
Code Issues Releases Wiki Activity

Don't use ac_save_* in configure.ac since they are overwritten by macro

pull/558/head
Tatsuhiro Tsujikawa 2016-02-03 00:52:27 +09:00
parent 2a4d39b7e8
commit dbcf07fd11
1 changed files with 40 additions and 40 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

80
configure.ac
View File

@ -132,17 +132,17 @@ AC_LANG([C++])
PKG_PROG_PKG_CONFIG([0.20]) PKG_PROG_PKG_CONFIG([0.20])
# Check C++ compiler supports C++0x/C++11 feature # Check C++ compiler supports C++0x/C++11 feature
ac_save_CXXFLAGS="$CXXFLAGS" save_CXXFLAGS="$CXXFLAGS"
CXXFLAGS= CXXFLAGS=
AX_CXX_COMPILE_STDCXX_11([noext], [mandatory]) AX_CXX_COMPILE_STDCXX_11([noext], [mandatory])
CXX1XCXXFLAGS="$CXXFLAGS" CXX1XCXXFLAGS="$CXXFLAGS"
CXXFLAGS="$ac_save_CXXFLAGS" CXXFLAGS="$save_CXXFLAGS"
AC_SUBST([CXX1XCXXFLAGS]) AC_SUBST([CXX1XCXXFLAGS])
# Check C++ compiler actually supports nullptr # Check C++ compiler actually supports nullptr
ac_save_CXXFLAGS=$CXXFLAGS save_CXXFLAGS=$CXXFLAGS
CXXFLAGS="$CXXFLAGS $CXX1XCXXFLAGS" CXXFLAGS="$CXXFLAGS $CXX1XCXXFLAGS"
AC_MSG_CHECKING([whether the c++ compiler supports nullptr]) AC_MSG_CHECKING([whether the c++ compiler supports nullptr])
@ -175,7 +175,7 @@ Derived x;
AC_DEFINE_UNQUOTED([CXX11_OVERRIDE], [$cxx11_override], AC_DEFINE_UNQUOTED([CXX11_OVERRIDE], [$cxx11_override],
[Define `override` keyword if the compiler supports it]) [Define `override` keyword if the compiler supports it])
CXXFLAGS=$ac_save_CXXFLAGS CXXFLAGS=$save_CXXFLAGS
# Check static build is requested # Check static build is requested
if test "x$ARIA2_STATIC" = "xyes"; then if test "x$ARIA2_STATIC" = "xyes"; then
@ -215,8 +215,8 @@ if test "x$with_libz" = "xyes"; then
AC_DEFINE([HAVE_ZLIB], [1], [Define to 1 if you have zlib.]) AC_DEFINE([HAVE_ZLIB], [1], [Define to 1 if you have zlib.])
# Android NDK arch-mips contains gzbuffer symbol but it is missing # Android NDK arch-mips contains gzbuffer symbol but it is missing
# in zlib.h # in zlib.h
ac_save_CFLAGS=$CFLAGS save_CFLAGS=$CFLAGS
ac_save_LIBS=$LIBS save_LIBS=$LIBS
CFLAGS="$CFLAGS $ZLIB_CFLAGS" CFLAGS="$CFLAGS $ZLIB_CFLAGS"
LIBS="$ZLIB_LIBS $LIBS" LIBS="$ZLIB_LIBS $LIBS"
AC_CHECK_DECL([gzbuffer], [have_decl_gzbuffer=yes], [], AC_CHECK_DECL([gzbuffer], [have_decl_gzbuffer=yes], [],
@ -225,8 +225,8 @@ if test "x$with_libz" = "xyes"; then
AC_CHECK_FUNC([gzbuffer]) AC_CHECK_FUNC([gzbuffer])
fi fi
AC_CHECK_FUNCS([gzsetparams]) AC_CHECK_FUNCS([gzsetparams])
CFLAGS=$ac_save_CFLAGS CFLAGS=$save_CFLAGS
LIBS=$ac_save_LIBS LIBS=$save_LIBS
fi fi
fi fi
@ -235,8 +235,8 @@ if test "x$with_libuv" = "xyes"; then
case "$host" in case "$host" in
*mingw*|*msvc*) *mingw*|*msvc*)
libuv_cflags="-D_WIN32_WINNT=0x0600" libuv_cflags="-D_WIN32_WINNT=0x0600"
ac_save_CPPFLAGS=$CPPFLAGS save_CPPFLAGS=$CPPFLAGS
ac_save_LIBS=$LIBS save_LIBS=$LIBS
CPPFLAGS="$CPPFLAGS $libuv_cflags" CPPFLAGS="$CPPFLAGS $libuv_cflags"
AC_SEARCH_LIBS([uv_poll_init_socket], [uv], [ AC_SEARCH_LIBS([uv_poll_init_socket], [uv], [
AC_CHECK_HEADER([uv.h], [have_libuv=yes], [have_libuv=no]) AC_CHECK_HEADER([uv.h], [have_libuv=yes], [have_libuv=no])
@ -247,14 +247,14 @@ if test "x$with_libuv" = "xyes"; then
AC_SUBST([LIBUV_CFLAGS]) AC_SUBST([LIBUV_CFLAGS])
AC_SUBST([LIBUV_LIBS]) AC_SUBST([LIBUV_LIBS])
fi fi
CPPFLAGS=$ac_save_CPPFLAGS CPPFLAGS=$save_CPPFLAGS
CPPLIBS=$ac_save_LIBS CPPLIBS=$save_LIBS
;; ;;
*darwin*) *darwin*)
libuv_ldflags="-framework Foundation -framework CoreServices -framework ApplicationServices" libuv_ldflags="-framework Foundation -framework CoreServices -framework ApplicationServices"
ac_save_LDFLAGS=$LDFLAGS save_LDFLAGS=$LDFLAGS
ac_save_LIBS=$LIBS save_LIBS=$LIBS
LDFLAGS="$LDFLAGS $libuv_ldflags" LDFLAGS="$LDFLAGS $libuv_ldflags"
AC_SEARCH_LIBS([uv_poll_init_socket], [uv], [ AC_SEARCH_LIBS([uv_poll_init_socket], [uv], [
AC_CHECK_HEADER([uv.h], [have_libuv=yes], [have_libuv=no]) AC_CHECK_HEADER([uv.h], [have_libuv=yes], [have_libuv=no])
@ -265,16 +265,16 @@ if test "x$with_libuv" = "xyes"; then
AC_SUBST([LIBUV_CFLAGS]) AC_SUBST([LIBUV_CFLAGS])
AC_SUBST([LIBUV_LIBS]) AC_SUBST([LIBUV_LIBS])
fi fi
LDFLAGS=$ac_save_LDFLAGS LDFLAGS=$save_LDFLAGS
LIBS=$ac_save_LIBS LIBS=$save_LIBS
;; ;;
*) *)
dnl Yeah, sucks that luv does not bring a pkg-config or config-tool dnl Yeah, sucks that luv does not bring a pkg-config or config-tool
AC_MSG_CHECKING([for libuv]) AC_MSG_CHECKING([for libuv])
ac_save_LIBS=$LIBS save_LIBS=$LIBS
for combo in "" "-lrt" "-ldl -lrt" "-ldl -lrt -lpthread" "-lkvm"; do for combo in "" "-lrt" "-ldl -lrt" "-ldl -lrt -lpthread" "-lkvm"; do
LIBS="-luv $combo $ac_save_LIBS -lm" LIBS="-luv $combo $save_LIBS -lm"
AC_LINK_IFELSE([AC_LANG_SOURCE([ AC_LINK_IFELSE([AC_LANG_SOURCE([
extern "C" int uv_poll_init_socket(void); extern "C" int uv_poll_init_socket(void);
int main() { return uv_poll_init_socket(); } int main() { return uv_poll_init_socket(); }
@ -290,7 +290,7 @@ int main() { return uv_poll_init_socket(); }
break; break;
fi fi
done done
LIBS=$ac_save_LIBS LIBS=$save_LIBS
if test "x$have_libuv" != "xyes"; then if test "x$have_libuv" != "xyes"; then
AC_MSG_RESULT("no") AC_MSG_RESULT("no")
fi fi
@ -299,10 +299,10 @@ int main() { return uv_poll_init_socket(); }
if test "x$have_libuv" = "xyes"; then if test "x$have_libuv" = "xyes"; then
AC_DEFINE([HAVE_LIBUV], [1], [Define to 1 if you have libuv.]) AC_DEFINE([HAVE_LIBUV], [1], [Define to 1 if you have libuv.])
ac_save_LIBS=$LIBS save_LIBS=$LIBS
LIBS="$LIBUV_LIBS $LIBS" LIBS="$LIBUV_LIBS $LIBS"
AC_CHECK_FUNCS([uv_last_error]) AC_CHECK_FUNCS([uv_last_error])
LIBS=$ac_save_LIBS LIBS=$save_LIBS
elif test "x$with_libuv_requested" = "xyes"; then elif test "x$with_libuv_requested" = "xyes"; then
ARIA2_DEP_NOT_MET([libuv]) ARIA2_DEP_NOT_MET([libuv])
fi fi
@ -333,10 +333,10 @@ if test "x$with_sqlite3" = "xyes"; then
PKG_CHECK_MODULES([SQLITE3],[sqlite3],[have_sqlite3=yes],[have_sqlite3=no]) PKG_CHECK_MODULES([SQLITE3],[sqlite3],[have_sqlite3=yes],[have_sqlite3=no])
if test "x$have_sqlite3" = "xyes"; then if test "x$have_sqlite3" = "xyes"; then
AC_DEFINE([HAVE_SQLITE3], [1], [Define to 1 if you have sqlite3.]) AC_DEFINE([HAVE_SQLITE3], [1], [Define to 1 if you have sqlite3.])
ac_save_LIBS=$LIBS save_LIBS=$LIBS
LIBS="$SQLITE3_LIBS $LIBS" LIBS="$SQLITE3_LIBS $LIBS"
AC_CHECK_FUNCS([sqlite3_open_v2]) AC_CHECK_FUNCS([sqlite3_open_v2])
LIBS=$ac_save_LIBS LIBS=$save_LIBS
else else
AC_MSG_WARN([$SQLITE3_PKG_ERRORS]) AC_MSG_WARN([$SQLITE3_PKG_ERRORS])
if test "x$with_sqlite3_requested" = "xyes"; then if test "x$with_sqlite3_requested" = "xyes"; then
@ -447,10 +447,10 @@ if test "x$with_gnutls" = "xyes" && test "x$have_ssl" != "xyes"; then
if test "x$have_libgnutls" = "xyes"; then if test "x$have_libgnutls" = "xyes"; then
have_ssl=yes have_ssl=yes
AC_DEFINE([HAVE_LIBGNUTLS], [1], [Define to 1 if you have libgnutls.]) AC_DEFINE([HAVE_LIBGNUTLS], [1], [Define to 1 if you have libgnutls.])
ac_save_LIBS=$LIBS save_LIBS=$LIBS
LIBS="$LIBGNUTLS_LIBS $LIBS" LIBS="$LIBGNUTLS_LIBS $LIBS"
AC_CHECK_FUNCS([gnutls_certificate_set_x509_system_trust]) AC_CHECK_FUNCS([gnutls_certificate_set_x509_system_trust])
LIBS=$ac_save_LIBS LIBS=$save_LIBS
else else
AC_MSG_WARN([$LIBGNUTLS_PKG_ERRORS]) AC_MSG_WARN([$LIBGNUTLS_PKG_ERRORS])
if test "x$with_gnutls_requested" = "xyes"; then if test "x$with_gnutls_requested" = "xyes"; then
@ -467,7 +467,7 @@ if test "x$with_openssl" = "xyes" && test "x$have_ssl" != "xyes"; then
have_ssl=yes have_ssl=yes
AC_DEFINE([HAVE_OPENSSL], [1], [Define to 1 if you have openssl.]) AC_DEFINE([HAVE_OPENSSL], [1], [Define to 1 if you have openssl.])
ac_save_LIBS=$LIBS save_LIBS=$LIBS
LIBS="$OPENSSL_LIBS $LIBS" LIBS="$OPENSSL_LIBS $LIBS"
AC_CHECK_FUNCS([EVP_DigestInit_ex], [have_digestinit_ex=yes]) AC_CHECK_FUNCS([EVP_DigestInit_ex], [have_digestinit_ex=yes])
if test "x$have_digestinit_ex" = "x"; then if test "x$have_digestinit_ex" = "x"; then
@ -477,7 +477,7 @@ if test "x$with_openssl" = "xyes" && test "x$have_ssl" != "xyes"; then
AC_CHECK_FUNCS([EVP_sha256]) AC_CHECK_FUNCS([EVP_sha256])
AC_CHECK_FUNCS([EVP_sha384]) AC_CHECK_FUNCS([EVP_sha384])
AC_CHECK_FUNCS([EVP_sha512]) AC_CHECK_FUNCS([EVP_sha512])
LIBS=$ac_save_LIBS LIBS=$save_LIBS
else else
AC_MSG_WARN([$OPENSSL_PKG_ERRORS]) AC_MSG_WARN([$OPENSSL_PKG_ERRORS])
if test "x$with_openssl_requested" = "xyes"; then if test "x$with_openssl_requested" = "xyes"; then
@ -513,10 +513,10 @@ if test "x$have_openssl" != "xyes"; then
AC_SUBST([LIBGMP_CFLAGS]) AC_SUBST([LIBGMP_CFLAGS])
AC_SUBST([LIBGMP_LIBS]) AC_SUBST([LIBGMP_LIBS])
AC_DEFINE([HAVE_LIBGMP], [1], [Define to 1 if you have libgmp.]) AC_DEFINE([HAVE_LIBGMP], [1], [Define to 1 if you have libgmp.])
ac_save_LIBS=$LIBS save_LIBS=$LIBS
LIBS="$LIBGMP_LIBS $LIBS" LIBS="$LIBGMP_LIBS $LIBS"
AC_CHECK_FUNCS([__gmpz_powm_sec], [have_mpz_powm_sec=yes]) AC_CHECK_FUNCS([__gmpz_powm_sec], [have_mpz_powm_sec=yes])
LIBS=$ac_save_LIBS LIBS=$save_LIBS
if test "x$have_mpz_powm_sec" = "xyes"; then if test "x$have_mpz_powm_sec" = "xyes"; then
AC_DEFINE([HAVE_GMP_SEC], [1], [Define to 1 if you have a GMP with sec functions.]) AC_DEFINE([HAVE_GMP_SEC], [1], [Define to 1 if you have a GMP with sec functions.])
fi fi
@ -556,14 +556,14 @@ if test "x$with_libcares" = "xyes"; then
[have_libcares=no]) [have_libcares=no])
if test "x$have_libcares" = "xyes"; then if test "x$have_libcares" = "xyes"; then
AC_DEFINE([HAVE_LIBCARES], [1], [Define to 1 if you have libcares.]) AC_DEFINE([HAVE_LIBCARES], [1], [Define to 1 if you have libcares.])
ac_save_LIBS=$LIBS save_LIBS=$LIBS
ac_save_CPPFLAGS=$CPPFLAGS save_CPPFLAGS=$CPPFLAGS
LIBS="$LIBCARES_LIBS $LIBS" LIBS="$LIBCARES_LIBS $LIBS"
CPPFLAGS="$LIBCARES_CFLAGS $CPPFLAGS" CPPFLAGS="$LIBCARES_CFLAGS $CPPFLAGS"
AC_CHECK_TYPES([ares_addr_node], [], [], [[#include <ares.h>]]) AC_CHECK_TYPES([ares_addr_node], [], [], [[#include <ares.h>]])
AC_CHECK_FUNCS([ares_set_servers]) AC_CHECK_FUNCS([ares_set_servers])
LIBS=$ac_save_LIBS LIBS=$save_LIBS
CPPFLAGS=$ac_save_CPPFLAGS CPPFLAGS=$save_CPPFLAGS
# -DCARES_STATICLIB is appended by pkg-config file libcares.pc # -DCARES_STATICLIB is appended by pkg-config file libcares.pc
else else
@ -703,11 +703,11 @@ AM_CONDITIONAL([HAVE_LIBSSH2], [test "x$have_libssh2" = "xyes"])
case "$host" in case "$host" in
*solaris*) *solaris*)
ac_save_LIBS=$LIBS save_LIBS=$LIBS
LIBS= LIBS=
AC_SEARCH_LIBS([getaddrinfo], [nsl socket], [], [$ac_save_LIBS]) AC_SEARCH_LIBS([getaddrinfo], [nsl socket], [], [$save_LIBS])
EXTRALIBS="$LIBS $EXTRALIBS" EXTRALIBS="$LIBS $EXTRALIBS"
LIBS=$ac_save_LIBS LIBS=$save_LIBS
;; ;;
esac esac
@ -934,7 +934,7 @@ AM_CONDITIONAL([HAVE_SOME_FALLOCATE],
|| test "x$have_osx" = "xyes" || test "x$win_build" = "xyes"]) || test "x$have_osx" = "xyes" || test "x$win_build" = "xyes"])
# mingw needs this # mingw needs this
ac_save_CPPFLAGS=$CPPFLAGS save_CPPFLAGS=$CPPFLAGS
CPPFLAGS="$CPPFLAGS $EXTRACPPFLAGS" CPPFLAGS="$CPPFLAGS $EXTRACPPFLAGS"
AC_MSG_CHECKING([for asctime_r]) AC_MSG_CHECKING([for asctime_r])
AC_LINK_IFELSE([AC_LANG_PROGRAM([[ AC_LINK_IFELSE([AC_LANG_PROGRAM([[
@ -961,7 +961,7 @@ AC_LINK_IFELSE([AC_LANG_PROGRAM([[
AC_DEFINE([HAVE_LOCALTIME_R], [1], [Define to 1 if you have the `localtime_r' function or macro.])], AC_DEFINE([HAVE_LOCALTIME_R], [1], [Define to 1 if you have the `localtime_r' function or macro.])],
[AC_MSG_RESULT([no]) [AC_MSG_RESULT([no])
AM_CONDITIONAL([HAVE_LOCALTIME_R], false)]) AM_CONDITIONAL([HAVE_LOCALTIME_R], false)])
CPPFLAGS=$ac_save_CPPFLAGS CPPFLAGS=$save_CPPFLAGS
AC_CHECK_FUNCS([basename], AC_CHECK_FUNCS([basename],
[AM_CONDITIONAL([HAVE_BASENAME], true)], [AM_CONDITIONAL([HAVE_BASENAME], true)],
@ -1130,7 +1130,7 @@ AC_SUBST([EXTRACPPFLAGS])
AC_SUBST([EXTRALDFLAGS]) AC_SUBST([EXTRALDFLAGS])
AC_SUBST([EXTRALIBS]) AC_SUBST([EXTRALIBS])
ac_save_CXXFLAGS=$CXXFLAGS save_CXXFLAGS=$CXXFLAGS
CXXFLAGS= CXXFLAGS=
if test "x$enable_werror" = "xyes"; then if test "x$enable_werror" = "xyes"; then
@ -1140,7 +1140,7 @@ if test "x$enable_werror" = "xyes"; then
fi fi
WARNCXXFLAGS=$CXXFLAGS WARNCXXFLAGS=$CXXFLAGS
CXXFLAGS=$ac_save_CXXFLAGS CXXFLAGS=$save_CXXFLAGS
AC_SUBST([WARNCXXFLAGS]) AC_SUBST([WARNCXXFLAGS])