mirror of https://github.com/aria2/aria2
2008-06-30 Tatsuhiro Tsujikawa <tujikawa at rednoah dot com>
Cleaned up configure.ac. * configure.acpull/1/head
Tatsuhiro Tsujikawa
parent
dd97f4f0a4
commit
570837b325
|
|
@ -1,3 +1,8 @@
|
||||||
|
2008-06-30 Tatsuhiro Tsujikawa <tujikawa at rednoah dot com>
|
||||||
|
|
||||||
|
Cleaned up configure.ac.
|
||||||
|
* configure.ac
|
||||||
|
|
||||||
2008-06-29 Tatsuhiro Tsujikawa <tujikawa at rednoah dot com>
|
2008-06-29 Tatsuhiro Tsujikawa <tujikawa at rednoah dot com>
|
||||||
|
|
||||||
Use ARIA2_ARG_WITH and ARIA2_ARG_ENABLE instead of AC_ARG_WITH and
|
Use ARIA2_ARG_WITH and ARIA2_ARG_ENABLE instead of AC_ARG_WITH and
|
||||||
|
|
|
||||||
|
|
@ -7006,6 +7006,7 @@ CPPFLAGS=$CPPFLAGS_save
|
||||||
fi
|
fi
|
||||||
fi
|
fi
|
||||||
|
|
||||||
|
# Check availability of libz
|
||||||
if test "x$with_libz" = "xyes"; then
|
if test "x$with_libz" = "xyes"; then
|
||||||
|
|
||||||
|
|
||||||
|
|
@ -7148,7 +7149,8 @@ fi
|
||||||
|
|
||||||
fi
|
fi
|
||||||
|
|
||||||
if test "x$enable_bittorrent" = "xyes" && test "x$enable_message_digest" = "xyes"; then
|
if test "x$enable_bittorrent" = "xyes" &&
|
||||||
|
test "x$enable_message_digest" = "xyes"; then
|
||||||
|
|
||||||
cat >>confdefs.h <<\_ACEOF
|
cat >>confdefs.h <<\_ACEOF
|
||||||
#define ENABLE_BITTORRENT 1
|
#define ENABLE_BITTORRENT 1
|
||||||
|
|
@ -7174,7 +7176,8 @@ fi
|
||||||
|
|
||||||
fi
|
fi
|
||||||
|
|
||||||
if (test "x$have_libxml2" = "xyes" || test "x$have_libexpat" = "xyes") && test "x$enable_metalink" = "xyes"; then
|
if (test "x$have_libxml2" = "xyes" || test "x$have_libexpat" = "xyes") &&
|
||||||
|
test "x$enable_metalink" = "xyes"; then
|
||||||
|
|
||||||
cat >>confdefs.h <<\_ACEOF
|
cat >>confdefs.h <<\_ACEOF
|
||||||
#define ENABLE_METALINK 1
|
#define ENABLE_METALINK 1
|
||||||
|
|
@ -7242,6 +7245,7 @@ fi
|
||||||
|
|
||||||
fi
|
fi
|
||||||
|
|
||||||
|
# Set conditional for libz
|
||||||
if test "x$have_libz" = "xyes"; then
|
if test "x$have_libz" = "xyes"; then
|
||||||
HAVE_LIBZ_TRUE=
|
HAVE_LIBZ_TRUE=
|
||||||
HAVE_LIBZ_FALSE='#'
|
HAVE_LIBZ_FALSE='#'
|
||||||
|
|
@ -7813,7 +7817,34 @@ fi
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
for ac_header in winsock2.h ws2tcpip.h argz.h arpa/inet.h fcntl.h float.h inttypes.h io.h langinfo.h libintl.h limits.h locale.h malloc.h netdb.h netinet/in.h stddef.h stdint.h stdio_ext.h stdlib.h string.h strings.h sys/ioctl.h sys/param.h sys/socket.h sys/time.h termios.h unistd.h wchar.h
|
for ac_header in winsock2.h \
|
||||||
|
ws2tcpip.h \
|
||||||
|
argz.h \
|
||||||
|
arpa/inet.h \
|
||||||
|
fcntl.h \
|
||||||
|
float.h \
|
||||||
|
inttypes.h \
|
||||||
|
io.h \
|
||||||
|
langinfo.h \
|
||||||
|
libintl.h \
|
||||||
|
limits.h \
|
||||||
|
locale.h \
|
||||||
|
malloc.h \
|
||||||
|
netdb.h \
|
||||||
|
netinet/in.h \
|
||||||
|
stddef.h \
|
||||||
|
stdint.h \
|
||||||
|
stdio_ext.h \
|
||||||
|
stdlib.h \
|
||||||
|
string.h \
|
||||||
|
strings.h \
|
||||||
|
sys/ioctl.h \
|
||||||
|
sys/param.h \
|
||||||
|
sys/socket.h \
|
||||||
|
sys/time.h \
|
||||||
|
termios.h \
|
||||||
|
unistd.h \
|
||||||
|
wchar.h
|
||||||
do
|
do
|
||||||
as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
|
as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
|
||||||
if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
|
if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
|
||||||
|
|
@ -20054,7 +20085,45 @@ done
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
for ac_func in __argz_count __argz_next __argz_stringify atexit daemon ftruncate getcwd gethostbyaddr gethostbyname getpagesize inet_ntoa memchr memmove mempcpy memset mkdir munmap nl_langinfo posix_memalign putenv rmdir select setlocale sleep socket stpcpy strcasecmp strchr strcspn strdup strerror strncasecmp strstr strtol strtoul strtoull tzset unsetenv usleep
|
for ac_func in __argz_count \
|
||||||
|
__argz_next \
|
||||||
|
__argz_stringify \
|
||||||
|
atexit \
|
||||||
|
daemon \
|
||||||
|
ftruncate \
|
||||||
|
getcwd \
|
||||||
|
gethostbyaddr \
|
||||||
|
gethostbyname \
|
||||||
|
getpagesize \
|
||||||
|
inet_ntoa \
|
||||||
|
memchr \
|
||||||
|
memmove \
|
||||||
|
mempcpy \
|
||||||
|
memset \
|
||||||
|
mkdir \
|
||||||
|
munmap \
|
||||||
|
nl_langinfo \
|
||||||
|
posix_memalign \
|
||||||
|
putenv \
|
||||||
|
rmdir \
|
||||||
|
select \
|
||||||
|
setlocale \
|
||||||
|
sleep \
|
||||||
|
socket \
|
||||||
|
stpcpy \
|
||||||
|
strcasecmp \
|
||||||
|
strchr \
|
||||||
|
strcspn \
|
||||||
|
strdup \
|
||||||
|
strerror \
|
||||||
|
strncasecmp \
|
||||||
|
strstr \
|
||||||
|
strtol \
|
||||||
|
strtoul \
|
||||||
|
strtoull \
|
||||||
|
tzset \
|
||||||
|
unsetenv \
|
||||||
|
usleep
|
||||||
do
|
do
|
||||||
as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
|
as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
|
||||||
{ echo "$as_me:$LINENO: checking for $ac_func" >&5
|
{ echo "$as_me:$LINENO: checking for $ac_func" >&5
|
||||||
|
|
|
||||||
95
configure.ac
95
configure.ac
|
|
@ -93,6 +93,7 @@ if test "x$have_libcares" = "x"; then
|
||||||
fi
|
fi
|
||||||
fi
|
fi
|
||||||
|
|
||||||
|
# Check availability of libz
|
||||||
if test "x$with_libz" = "xyes"; then
|
if test "x$with_libz" = "xyes"; then
|
||||||
AM_PATH_LIBZ
|
AM_PATH_LIBZ
|
||||||
fi
|
fi
|
||||||
|
|
@ -103,45 +104,81 @@ if test "x$have_libgnutls" = "xyes" || test "x$have_openssl" = "xyes"; then
|
||||||
fi
|
fi
|
||||||
|
|
||||||
if test "x$have_libgcrypt" = "xyes" || test "x$have_openssl" = "xyes"; then
|
if test "x$have_libgcrypt" = "xyes" || test "x$have_openssl" = "xyes"; then
|
||||||
AC_DEFINE([ENABLE_MESSAGE_DIGEST], [1], [Define to 1 if message digest support is enabled.])
|
AC_DEFINE([ENABLE_MESSAGE_DIGEST], [1],
|
||||||
|
[Define to 1 if message digest support is enabled.])
|
||||||
AM_CONDITIONAL([ENABLE_MESSAGE_DIGEST], true)
|
AM_CONDITIONAL([ENABLE_MESSAGE_DIGEST], true)
|
||||||
enable_message_digest=yes
|
enable_message_digest=yes
|
||||||
else
|
else
|
||||||
AM_CONDITIONAL([ENABLE_MESSAGE_DIGEST], false)
|
AM_CONDITIONAL([ENABLE_MESSAGE_DIGEST], false)
|
||||||
fi
|
fi
|
||||||
|
|
||||||
if test "x$enable_bittorrent" = "xyes" && test "x$enable_message_digest" = "xyes"; then
|
if test "x$enable_bittorrent" = "xyes" &&
|
||||||
AC_DEFINE([ENABLE_BITTORRENT], [1], [Define to 1 if BitTorrent support is enabled.])
|
test "x$enable_message_digest" = "xyes"; then
|
||||||
|
AC_DEFINE([ENABLE_BITTORRENT], [1],
|
||||||
|
[Define to 1 if BitTorrent support is enabled.])
|
||||||
AM_CONDITIONAL([ENABLE_BITTORRENT], true)
|
AM_CONDITIONAL([ENABLE_BITTORRENT], true)
|
||||||
else
|
else
|
||||||
enable_bittorrent=no
|
enable_bittorrent=no
|
||||||
AM_CONDITIONAL([ENABLE_BITTORRENT], false)
|
AM_CONDITIONAL([ENABLE_BITTORRENT], false)
|
||||||
fi
|
fi
|
||||||
|
|
||||||
if (test "x$have_libxml2" = "xyes" || test "x$have_libexpat" = "xyes") && test "x$enable_metalink" = "xyes"; then
|
if (test "x$have_libxml2" = "xyes" || test "x$have_libexpat" = "xyes") &&
|
||||||
AC_DEFINE([ENABLE_METALINK], [1], [Define to 1 if Metalink support is enabled.])
|
test "x$enable_metalink" = "xyes"; then
|
||||||
|
AC_DEFINE([ENABLE_METALINK], [1],
|
||||||
|
[Define to 1 if Metalink support is enabled.])
|
||||||
AM_CONDITIONAL([ENABLE_METALINK], true)
|
AM_CONDITIONAL([ENABLE_METALINK], true)
|
||||||
else
|
else
|
||||||
enable_metalink=no
|
enable_metalink=no
|
||||||
AM_CONDITIONAL([ENABLE_METALINK], false)
|
AM_CONDITIONAL([ENABLE_METALINK], false)
|
||||||
fi
|
fi
|
||||||
|
|
||||||
AM_CONDITIONAL([ENABLE_LIBXML2], [test "x$enable_metalink" = "xyes" && test "x$have_libxml2" = "xyes"])
|
AM_CONDITIONAL([ENABLE_LIBXML2],
|
||||||
AM_CONDITIONAL([ENABLE_LIBEXPAT], [test "x$enable_metalink" = "xyes" && test "x$have_libexpat" = "xyes"])
|
[test "x$enable_metalink" = "xyes" && test "x$have_libxml2" = "xyes"])
|
||||||
|
AM_CONDITIONAL([ENABLE_LIBEXPAT],
|
||||||
|
[test "x$enable_metalink" = "xyes" && test "x$have_libexpat" = "xyes"])
|
||||||
|
|
||||||
if test "x$have_libcares" = "xyes" || test "x$have_libares" = "xyes"; then
|
if test "x$have_libcares" = "xyes" || test "x$have_libares" = "xyes"; then
|
||||||
AC_DEFINE([ENABLE_ASYNC_DNS], [1], [Define to 1 if asynchronous DNS support is enabled.])
|
AC_DEFINE([ENABLE_ASYNC_DNS], [1],
|
||||||
|
[Define to 1 if asynchronous DNS support is enabled.])
|
||||||
AM_CONDITIONAL([ENABLE_ASYNC_DNS], true)
|
AM_CONDITIONAL([ENABLE_ASYNC_DNS], true)
|
||||||
else
|
else
|
||||||
AM_CONDITIONAL([ENABLE_ASYNC_DNS], false)
|
AM_CONDITIONAL([ENABLE_ASYNC_DNS], false)
|
||||||
fi
|
fi
|
||||||
|
|
||||||
|
# Set conditional for libz
|
||||||
AM_CONDITIONAL([HAVE_LIBZ], [test "x$have_libz" = "xyes"])
|
AM_CONDITIONAL([HAVE_LIBZ], [test "x$have_libz" = "xyes"])
|
||||||
|
|
||||||
# Checks for header files.
|
# Checks for header files.
|
||||||
AC_FUNC_ALLOCA
|
AC_FUNC_ALLOCA
|
||||||
AC_HEADER_STDC
|
AC_HEADER_STDC
|
||||||
AC_CHECK_HEADERS([winsock2.h ws2tcpip.h argz.h arpa/inet.h fcntl.h float.h inttypes.h io.h langinfo.h libintl.h limits.h locale.h malloc.h netdb.h netinet/in.h stddef.h stdint.h stdio_ext.h stdlib.h string.h strings.h sys/ioctl.h sys/param.h sys/socket.h sys/time.h termios.h unistd.h wchar.h])
|
AC_CHECK_HEADERS([winsock2.h \
|
||||||
|
ws2tcpip.h \
|
||||||
|
argz.h \
|
||||||
|
arpa/inet.h \
|
||||||
|
fcntl.h \
|
||||||
|
float.h \
|
||||||
|
inttypes.h \
|
||||||
|
io.h \
|
||||||
|
langinfo.h \
|
||||||
|
libintl.h \
|
||||||
|
limits.h \
|
||||||
|
locale.h \
|
||||||
|
malloc.h \
|
||||||
|
netdb.h \
|
||||||
|
netinet/in.h \
|
||||||
|
stddef.h \
|
||||||
|
stdint.h \
|
||||||
|
stdio_ext.h \
|
||||||
|
stdlib.h \
|
||||||
|
string.h \
|
||||||
|
strings.h \
|
||||||
|
sys/ioctl.h \
|
||||||
|
sys/param.h \
|
||||||
|
sys/socket.h \
|
||||||
|
sys/time.h \
|
||||||
|
termios.h \
|
||||||
|
unistd.h \
|
||||||
|
wchar.h])
|
||||||
|
|
||||||
# Checks for typedefs, structures, and compiler characteristics.
|
# Checks for typedefs, structures, and compiler characteristics.
|
||||||
AC_HEADER_STDBOOL
|
AC_HEADER_STDBOOL
|
||||||
|
|
@ -189,7 +226,45 @@ AC_TYPE_SIGNAL
|
||||||
AC_FUNC_STAT
|
AC_FUNC_STAT
|
||||||
AC_FUNC_STRFTIME
|
AC_FUNC_STRFTIME
|
||||||
AC_FUNC_VPRINTF
|
AC_FUNC_VPRINTF
|
||||||
AC_CHECK_FUNCS([__argz_count __argz_next __argz_stringify atexit daemon ftruncate getcwd gethostbyaddr gethostbyname getpagesize inet_ntoa memchr memmove mempcpy memset mkdir munmap nl_langinfo posix_memalign putenv rmdir select setlocale sleep socket stpcpy strcasecmp strchr strcspn strdup strerror strncasecmp strstr strtol strtoul strtoull tzset unsetenv usleep])
|
AC_CHECK_FUNCS([__argz_count \
|
||||||
|
__argz_next \
|
||||||
|
__argz_stringify \
|
||||||
|
atexit \
|
||||||
|
daemon \
|
||||||
|
ftruncate \
|
||||||
|
getcwd \
|
||||||
|
gethostbyaddr \
|
||||||
|
gethostbyname \
|
||||||
|
getpagesize \
|
||||||
|
inet_ntoa \
|
||||||
|
memchr \
|
||||||
|
memmove \
|
||||||
|
mempcpy \
|
||||||
|
memset \
|
||||||
|
mkdir \
|
||||||
|
munmap \
|
||||||
|
nl_langinfo \
|
||||||
|
posix_memalign \
|
||||||
|
putenv \
|
||||||
|
rmdir \
|
||||||
|
select \
|
||||||
|
setlocale \
|
||||||
|
sleep \
|
||||||
|
socket \
|
||||||
|
stpcpy \
|
||||||
|
strcasecmp \
|
||||||
|
strchr \
|
||||||
|
strcspn \
|
||||||
|
strdup \
|
||||||
|
strerror \
|
||||||
|
strncasecmp \
|
||||||
|
strstr \
|
||||||
|
strtol \
|
||||||
|
strtoul \
|
||||||
|
strtoull \
|
||||||
|
tzset \
|
||||||
|
unsetenv \
|
||||||
|
usleep])
|
||||||
|
|
||||||
if test "x$enable_epoll" = "xyes"; then
|
if test "x$enable_epoll" = "xyes"; then
|
||||||
AC_CHECK_FUNCS([epoll_create])
|
AC_CHECK_FUNCS([epoll_create])
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue