diff --git a/ChangeLog b/ChangeLog index 679b270d..448e1b49 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2008-06-29 Tatsuhiro Tsujikawa + + Use ARIA2_ARG_WITH and ARIA2_ARG_ENABLE instead of AC_ARG_WITH and + AC_ARG_ENABLE. + * configure.ac + 2008-06-29 Tatsuhiro Tsujikawa Added gzip, deflate decoding support in HTTP using libz. If compiled diff --git a/configure b/configure index bd59a47b..b1c7986c 100755 --- a/configure +++ b/configure @@ -1416,9 +1416,9 @@ if test -n "$ac_init_help"; then Optional Features: --disable-FEATURE do not include FEATURE (same as --enable-FEATURE=no) --enable-FEATURE[=ARG] include FEATURE [ARG=yes] - --enable-bittorrent enable BitTorrent support. Default: yes - --enable-metalink enable Metalink support. Default: yes - --enable-epoll enable epoll support. Default: yes + --enable-bittorrent enable bittorrent support. + --enable-metalink enable metalink support. + --enable-epoll enable epoll support. --disable-dependency-tracking speeds up one-time build --enable-dependency-tracking do not reject slow dependency extractors --disable-xmltest Do not try to compile and run a test LIBXML program @@ -1434,12 +1434,12 @@ Optional Packages: --without-PACKAGE do not use PACKAGE (same as --with-PACKAGE=no) --with-cppunit-prefix=PFX Prefix where CppUnit is installed (optional) --with-cppunit-exec-prefix=PFX Exec prefix where CppUnit is installed (optional) - --with-gnutls use gnutls library if installed. Default: yes - --with-openssl use openssl library if installed. Default: yes - --with-libxml2 use libxml2 library if installed. Default: yes - --with-libexpat use libexpat library if installed. Default: yes - --with-libares use ares library if installed. Default: yes - --with-libcares use c-ares library if installed. Default: yes + --with-gnutls use gnutls if it is installed. + --with-openssl use openssl if it is installed. + --with-libxml2 use libxml2 if it is installed. + --with-libexpat use libexpat if it is installed. + --with-libares use libares if it is installed. + --with-libcares use libcares if it is installed. --with-libz use libz if it is installed. --with-xml-prefix=PFX Prefix where libxml is installed (optional) --with-xml-exec-prefix=PFX Exec prefix where libxml is installed (optional) @@ -2693,6 +2693,7 @@ else fi + # Check whether --with-openssl was given. if test "${with_openssl+set}" = set; then withval=$with_openssl; with_openssl=$withval @@ -2701,6 +2702,7 @@ else fi + # Check whether --with-libxml2 was given. if test "${with_libxml2+set}" = set; then withval=$with_libxml2; with_libxml2=$withval @@ -2709,6 +2711,7 @@ else fi + # Check whether --with-libexpat was given. if test "${with_libexpat+set}" = set; then withval=$with_libexpat; with_libexpat=$withval @@ -2717,6 +2720,7 @@ else fi + # Check whether --with-libares was given. if test "${with_libares+set}" = set; then withval=$with_libares; with_libares=$withval @@ -2725,6 +2729,7 @@ else fi + # Check whether --with-libcares was given. if test "${with_libcares+set}" = set; then withval=$with_libcares; with_libcares=$withval @@ -2733,6 +2738,7 @@ else fi + # Check whether --with-libz was given. if test "${with_libz+set}" = set; then withval=$with_libz; with_libz=$withval @@ -2744,26 +2750,29 @@ fi # Check whether --enable-bittorrent was given. if test "${enable_bittorrent+set}" = set; then - enableval=$enable_bittorrent; enable_bittorrent=$enableval + enableval=$enable_bittorrent; enable_bittorrent=$withval else enable_bittorrent=yes fi + # Check whether --enable-metalink was given. if test "${enable_metalink+set}" = set; then - enableval=$enable_metalink; enable_metalink=$enableval + enableval=$enable_metalink; enable_metalink=$withval else enable_metalink=yes fi + # Check whether --enable-epoll was given. if test "${enable_epoll+set}" = set; then - enableval=$enable_epoll; enable_epoll=$enableval + enableval=$enable_epoll; enable_epoll=$withval else enable_epoll=yes fi + # Checks for programs. ac_ext=cpp ac_cpp='$CXXCPP $CPPFLAGS' diff --git a/configure.ac b/configure.ac index c36ce03b..645c1de1 100644 --- a/configure.ac +++ b/configure.ac @@ -24,17 +24,17 @@ localedir=${datadir}/locale AC_SUBST(localedir) # Checks for arguments. -AC_ARG_WITH([gnutls], [ --with-gnutls use gnutls library if installed. Default: yes], [with_gnutls=$withval], [with_gnutls=yes]) -AC_ARG_WITH([openssl], [ --with-openssl use openssl library if installed. Default: yes], [with_openssl=$withval], [with_openssl=yes]) -AC_ARG_WITH([libxml2], [ --with-libxml2 use libxml2 library if installed. Default: yes], [with_libxml2=$withval], [with_libxml2=yes]) -AC_ARG_WITH([libexpat], [ --with-libexpat use libexpat library if installed. Default: yes], [with_libexpat=$withval], [with_libexpat=yes]) -AC_ARG_WITH([libares], [ --with-libares use ares library if installed. Default: yes], [with_libares=$withval], [with_libares=yes]) -AC_ARG_WITH([libcares], [ --with-libcares use c-ares library if installed. Default: yes], [with_libcares=$withval], [with_libcares=yes]) +ARIA2_ARG_WITH([gnutls]) +ARIA2_ARG_WITH([openssl]) +ARIA2_ARG_WITH([libxml2]) +ARIA2_ARG_WITH([libexpat]) +ARIA2_ARG_WITH([libares]) +ARIA2_ARG_WITH([libcares]) ARIA2_ARG_WITH([libz]) -AC_ARG_ENABLE([bittorrent], [ --enable-bittorrent enable BitTorrent support. Default: yes], [enable_bittorrent=$enableval], [enable_bittorrent=yes]) -AC_ARG_ENABLE([metalink], [ --enable-metalink enable Metalink support. Default: yes], [enable_metalink=$enableval], [enable_metalink=yes]) -AC_ARG_ENABLE([epoll], [ --enable-epoll enable epoll support. Default: yes], [enable_epoll=$enableval], [enable_epoll=yes]) +ARIA2_ARG_ENABLE([bittorrent]) +ARIA2_ARG_ENABLE([metalink]) +ARIA2_ARG_ENABLE([epoll]) # Checks for programs. AC_PROG_CXX