2008-11-18 Tatsuhiro Tsujikawa <[email protected]>

	Dropped ares support.
	* README
	* configure.ac
	* m4/libares.m4: Removed.
	* src/AsyncNameResolver.cc
	* src/Makefile.am
	* test/Makefile.am

ChangeLog

@@ -1,3 +1,13 @@
+2008-11-18  Tatsuhiro Tsujikawa  <[email protected]>
+
+	Dropped ares support.
+	* README
+	* configure.ac
+	* m4/libares.m4: Removed.
+	* src/AsyncNameResolver.cc
+	* src/Makefile.am
+	* test/Makefile.am
+
 2008-11-17  Tatsuhiro Tsujikawa  <[email protected]>
 
 	Rewritten ByteArrayDiskWriter::size() using seekg() and tellg().

Makefile.in

@@ -38,9 +38,9 @@ DIST_COMMON = README $(am__configure_deps) $(dist_doc_DATA) \
 	$(dist_noinst_DATA) $(srcdir)/Makefile.am \
 	$(srcdir)/Makefile.in $(srcdir)/config.h.in \
 	$(top_srcdir)/configure $(top_srcdir)/intl/Makefile.in \
-	ABOUT-NLS AUTHORS COPYING ChangeLog INSTALL NEWS TODO \
-	config.guess config.rpath config.sub depcomp install-sh \
-	missing mkinstalldirs
+	ABOUT-NLS AUTHORS COPYING ChangeLog INSTALL NEWS config.guess \
+	config.rpath config.sub depcomp install-sh missing \
+	mkinstalldirs
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/m4/aria2_arg.m4 \
 	$(top_srcdir)/m4/codeset.m4 $(top_srcdir)/m4/cppunit.m4 \
@@ -51,18 +51,18 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/aria2_arg.m4 \
 	$(top_srcdir)/m4/inttypes-pri.m4 \
 	$(top_srcdir)/m4/inttypes_h.m4 $(top_srcdir)/m4/lcmessage.m4 \
 	$(top_srcdir)/m4/lib-ld.m4 $(top_srcdir)/m4/lib-link.m4 \
-	$(top_srcdir)/m4/lib-prefix.m4 $(top_srcdir)/m4/libares.m4 \
-	$(top_srcdir)/m4/libcares.m4 $(top_srcdir)/m4/libexpat.m4 \
-	$(top_srcdir)/m4/libgcrypt.m4 $(top_srcdir)/m4/libgnutls.m4 \
-	$(top_srcdir)/m4/libxml2.m4 $(top_srcdir)/m4/libz.m4 \
-	$(top_srcdir)/m4/lock.m4 $(top_srcdir)/m4/longlong.m4 \
-	$(top_srcdir)/m4/nls.m4 $(top_srcdir)/m4/openssl.m4 \
-	$(top_srcdir)/m4/po.m4 $(top_srcdir)/m4/printf-posix.m4 \
-	$(top_srcdir)/m4/progtest.m4 $(top_srcdir)/m4/size_max.m4 \
-	$(top_srcdir)/m4/sqlite3.m4 $(top_srcdir)/m4/stdint_h.m4 \
-	$(top_srcdir)/m4/uintmax_t.m4 $(top_srcdir)/m4/visibility.m4 \
-	$(top_srcdir)/m4/wchar_t.m4 $(top_srcdir)/m4/wint_t.m4 \
-	$(top_srcdir)/m4/xsize.m4 $(top_srcdir)/configure.ac
+	$(top_srcdir)/m4/lib-prefix.m4 $(top_srcdir)/m4/libcares.m4 \
+	$(top_srcdir)/m4/libexpat.m4 $(top_srcdir)/m4/libgcrypt.m4 \
+	$(top_srcdir)/m4/libgnutls.m4 $(top_srcdir)/m4/libxml2.m4 \
+	$(top_srcdir)/m4/libz.m4 $(top_srcdir)/m4/lock.m4 \
+	$(top_srcdir)/m4/longlong.m4 $(top_srcdir)/m4/nls.m4 \
+	$(top_srcdir)/m4/openssl.m4 $(top_srcdir)/m4/po.m4 \
+	$(top_srcdir)/m4/printf-posix.m4 $(top_srcdir)/m4/progtest.m4 \
+	$(top_srcdir)/m4/size_max.m4 $(top_srcdir)/m4/sqlite3.m4 \
+	$(top_srcdir)/m4/stdint_h.m4 $(top_srcdir)/m4/uintmax_t.m4 \
+	$(top_srcdir)/m4/visibility.m4 $(top_srcdir)/m4/wchar_t.m4 \
+	$(top_srcdir)/m4/wint_t.m4 $(top_srcdir)/m4/xsize.m4 \
+	$(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
 am__CONFIG_DISTCLEAN_FILES = config.status config.cache config.log \
@@ -158,8 +158,6 @@ INTLOBJS = @INTLOBJS@
 INTL_LIBTOOL_SUFFIX_PREFIX = @INTL_LIBTOOL_SUFFIX_PREFIX@
 INTL_MACOSX_LIBS = @INTL_MACOSX_LIBS@
 LDFLAGS = @LDFLAGS@
-LIBARES_CPPFLAGS = @LIBARES_CPPFLAGS@
-LIBARES_LIBS = @LIBARES_LIBS@
 LIBCARES_CPPFLAGS = @LIBCARES_CPPFLAGS@
 LIBCARES_LIBS = @LIBCARES_LIBS@
 LIBEXPAT_CPPFLAGS = @LIBEXPAT_CPPFLAGS@

README

@@ -61,6 +61,7 @@ BitTorrent            GnuTLS+Libgcrypt or OpenSSL
 Metalink              libxml2 or Expat.
 Checksum              GnuTLS+Libgcrypt or OpenSSL
 gzip, deflate in HTTP zlib
+Async DNS             C-Ares
 Firefox3 cookie       libsqlite3
 -------------------------------------------------
 
@@ -75,10 +76,9 @@ Note;;
 You can disable BitTorrent, Metalink support by providing --disable-bittorrent,
 --disable-metalink respectively to configure script.
 
-In order to enable async DNS support, you need c-ares or ares.
+In order to enable async DNS support, you need c-ares
 
 * c-ares: http://daniel.haxx.se/projects/c-ares/
-* ares: ftp://athena-dist.mit.edu/pub/ATHENA/ares
 
 How to build
 ------------
@@ -88,7 +88,7 @@ packages(package name may vary depending on the distribution you use):
 * libgnutls-dev    (Required for HTTPS, BitTorrent, Checksum support)
 * libgpg-error-dev (Required for BitTorrent, Checksum support)
 * libgcrypt-dev    (Required for BitTorrent, Checksum support)
-* libares-dev      (Required for async DNS support)
+* libc-ares-dev    (Required for async DNS support)
 * libxml2-dev      (Required for Metalink support)
 * libz1g-dev       (Required for gzip, deflate decoding support in HTTP)
 * libsqlite3-dev   (Required for Firefox3 cookie support)

README.html

@@ -548,6 +548,14 @@ cellspacing="0" cellpadding="4">
     zlib
     </td>
   </tr>
+  <tr>
+    <td align="left">
+    Async DNS
+    </td>
+    <td align="left">
+    C-Ares
+    </td>
+  </tr>
   <tr>
     <td align="left">
     Firefox3 cookie
@@ -581,18 +589,13 @@ Note
 </dl></div>
 <div class="para"><p>You can disable BitTorrent, Metalink support by providing &#8212;disable-bittorrent,
 &#8212;disable-metalink respectively to configure script.</p></div>
-<div class="para"><p>In order to enable async DNS support, you need c-ares or ares.</p></div>
+<div class="para"><p>In order to enable async DNS support, you need c-ares</p></div>
 <div class="ilist"><ul>
 <li>
 <p>
 c-ares: <a href="http://daniel.haxx.se/projects/c-ares/">http://daniel.haxx.se/projects/c-ares/</a>
 </p>
 </li>
-<li>
-<p>
-ares: <a href="ftp://athena-dist.mit.edu/pub/ATHENA/ares">ftp://athena-dist.mit.edu/pub/ATHENA/ares</a>
-</p>
-</li>
 </ul></div>
 </div>
 <h2 id="_how_to_build">4. How to build</h2>
@@ -617,7 +620,7 @@ libgcrypt-dev    (Required for BitTorrent, Checksum support)
 </li>
 <li>
 <p>
-libares-dev      (Required for async DNS support)
+libc-ares-dev    (Required for async DNS support)
 </p>
 </li>
 <li>
@@ -843,7 +846,7 @@ ftp-pasv=true</tt></pre>
 </div>
 <div id="footer">
 <div id="footer-text">
-Last updated 2008-10-13 23:00:33 JST
+Last updated 2008-11-18 20:19:18 JST
 </div>
 </div>
 </body>

aclocal.m4

@@ -883,7 +883,6 @@ m4_include([m4/lcmessage.m4])
 m4_include([m4/lib-ld.m4])
 m4_include([m4/lib-link.m4])
 m4_include([m4/lib-prefix.m4])
-m4_include([m4/libares.m4])
 m4_include([m4/libcares.m4])
 m4_include([m4/libexpat.m4])
 m4_include([m4/libgcrypt.m4])

config.h.in

@@ -193,9 +193,6 @@
 /* Define if your <locale.h> file defines LC_MESSAGES. */
 #undef HAVE_LC_MESSAGES
 
-/* Define to 1 if you have libares. */
-#undef HAVE_LIBARES
-
 /* Define to 1 if you have libcares. */
 #undef HAVE_LIBCARES
 

configure

@@ -738,8 +738,6 @@ OPENSSL_LIBS
 OPENSSL_CFLAGS
 LIBCARES_LIBS
 LIBCARES_CPPFLAGS
-LIBARES_LIBS
-LIBARES_CPPFLAGS
 LIBZ_LIBS
 LIBZ_CPPFLAGS
 ENABLE_SSL_TRUE
@@ -1449,7 +1447,6 @@ Optional Packages:
   --with-sqlite3          use sqlite3 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)
@@ -1461,7 +1458,6 @@ Optional Packages:
                           prefix where LIBGCRYPT is installed (optional)
   --with-openssl-prefix=PREFIX  Prefix where OpenSSL installed (optional)
   --with-libcares-prefix=PREFIX  Prefix where libcares installed (optional)
-  --with-libares-prefix=PREFIX  Prefix where libares installed (optional)
   --with-libz-prefix=PREFIX  Prefix where libz installed (optional)
   --with-gnu-ld           assume the C compiler uses GNU ld default=no
   --with-libpth-prefix[=DIR]  search for libpth in DIR/include and DIR/lib
@@ -2742,15 +2738,6 @@ fi
 
 
 
-# Check whether --with-libares was given.
-if test "${with_libares+set}" = set; then
-  withval=$with_libares; with_libares=$withval
-else
-  with_libares=yes
-fi
-
-
-
 # Check whether --with-libcares was given.
 if test "${with_libcares+set}" = set; then
   withval=$with_libcares; with_libcares=$withval
@@ -7239,115 +7226,6 @@ CPPFLAGS=$CPPFLAGS_save
 
 fi
 
-if test "x$have_libcares" = "x"; then
-  if test "x$with_libares" = "xyes"; then
-
-
-# Check whether --with-libares-prefix was given.
-if test "${with_libares_prefix+set}" = set; then
-  withval=$with_libares_prefix; libares_prefix=$withval
-else
-  libares_prefix=""
-fi
-
-
-if test "x$libares_prefix" = "x"; then
-  libares_prefix="/usr"
-fi
-
-libares_prefix_lib=$libares_prefix/lib
-libares_prefix_include=$libares_prefix/include
-
-LIBS_save=$LIBS
-CPPFLAGS_save=$CPPFLAGS
-
-LIBS="-L$libares_prefix_lib $LIBS"
-CPPFLAGS="-I$libares_prefix_include $CPPFLAGS"
-
-{ echo "$as_me:$LINENO: checking for ares_init in -lares" >&5
-echo $ECHO_N "checking for ares_init in -lares... $ECHO_C" >&6; }
-if test "${ac_cv_lib_ares_ares_init+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  ac_check_lib_save_LIBS=$LIBS
-LIBS="-lares  $LIBS"
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-
-/* Override any GCC internal prototype to avoid an error.
-   Use char because int might match the return type of a GCC
-   builtin and then its argument prototype would still apply.  */
-#ifdef __cplusplus
-extern "C"
-#endif
-char ares_init ();
-int
-main ()
-{
-return ares_init ();
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (ac_try="$ac_link"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_link") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_cxx_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest$ac_exeext &&
-       $as_test_x conftest$ac_exeext; then
-  ac_cv_lib_ares_ares_init=yes
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	ac_cv_lib_ares_ares_init=no
-fi
-
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-      conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS
-fi
-{ echo "$as_me:$LINENO: result: $ac_cv_lib_ares_ares_init" >&5
-echo "${ECHO_T}$ac_cv_lib_ares_ares_init" >&6; }
-if test $ac_cv_lib_ares_ares_init = yes; then
-  have_libares=yes
-fi
-
-if test "x$have_libares" = "xyes"; then
-
-cat >>confdefs.h <<\_ACEOF
-#define HAVE_LIBARES 1
-_ACEOF
-
-    LIBARES_LIBS="-L$libares_prefix_lib -lares"
-    LIBARES_CPPFLAGS="-I$libares_prefix_include"
-
-
-fi
-
-LIBS=$LIBS_save
-CPPFLAGS=$CPPFLAGS_save
-
-
-  fi
-fi
-
 # Check availability of libz
 if test "x$with_libz" = "xyes"; then
 
@@ -7596,7 +7474,7 @@ else
 fi
 
 
-if test "x$have_libcares" = "xyes" || test "x$have_libares" = "xyes"; then
+if test "x$have_libcares" = "xyes"; then
 
 cat >>confdefs.h <<\_ACEOF
 #define ENABLE_ASYNC_DNS 1
@@ -23175,8 +23053,6 @@ OPENSSL_LIBS!$OPENSSL_LIBS$ac_delim
 OPENSSL_CFLAGS!$OPENSSL_CFLAGS$ac_delim
 LIBCARES_LIBS!$LIBCARES_LIBS$ac_delim
 LIBCARES_CPPFLAGS!$LIBCARES_CPPFLAGS$ac_delim
-LIBARES_LIBS!$LIBARES_LIBS$ac_delim
-LIBARES_CPPFLAGS!$LIBARES_CPPFLAGS$ac_delim
 LIBZ_LIBS!$LIBZ_LIBS$ac_delim
 LIBZ_CPPFLAGS!$LIBZ_CPPFLAGS$ac_delim
 ENABLE_SSL_TRUE!$ENABLE_SSL_TRUE$ac_delim
@@ -23249,6 +23125,8 @@ LIBINTL!$LIBINTL$ac_delim
 LTLIBINTL!$LTLIBINTL$ac_delim
 POSUB!$POSUB$ac_delim
 LIBOBJS!$LIBOBJS$ac_delim
+HAVE_ASCTIME_R_TRUE!$HAVE_ASCTIME_R_TRUE$ac_delim
+HAVE_ASCTIME_R_FALSE!$HAVE_ASCTIME_R_FALSE$ac_delim
 _ACEOF
 
   if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 97; then
@@ -23290,8 +23168,6 @@ _ACEOF
 ac_delim='%!_!# '
 for ac_last_try in false false false false false :; do
   cat >conf$$subs.sed <<_ACEOF
-HAVE_ASCTIME_R_TRUE!$HAVE_ASCTIME_R_TRUE$ac_delim
-HAVE_ASCTIME_R_FALSE!$HAVE_ASCTIME_R_FALSE$ac_delim
 HAVE_BASENAME_TRUE!$HAVE_BASENAME_TRUE$ac_delim
 HAVE_BASENAME_FALSE!$HAVE_BASENAME_FALSE$ac_delim
 HAVE_GAI_STRERROR_TRUE!$HAVE_GAI_STRERROR_TRUE$ac_delim
@@ -23311,7 +23187,7 @@ HAVE_TIMEGM_FALSE!$HAVE_TIMEGM_FALSE$ac_delim
 LTLIBOBJS!$LTLIBOBJS$ac_delim
 _ACEOF
 
-  if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 19; then
+  if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 17; then
     break
   elif $ac_last_try; then
     { { echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5
@@ -24037,7 +23913,6 @@ echo "GnuTLS:         $have_libgnutls"
 echo "OpenSSL:        $have_openssl"
 echo "LibXML2:        $have_libxml2"
 echo "LibExpat:       $have_libexpat"
-echo "LibAres:        $have_libares"
 echo "LibCares:       $have_libcares"
 echo "Libz:           $have_libz"
 echo "Bittorrent:     $enable_bittorrent"

configure.ac

@@ -29,7 +29,6 @@ ARIA2_ARG_WITH([openssl])
 ARIA2_ARG_WITH([sqlite3])
 ARIA2_ARG_WITH([libxml2])
 ARIA2_ARG_WITH([libexpat])
-ARIA2_ARG_WITH([libares])
 ARIA2_ARG_WITH([libcares])
 ARIA2_ARG_WITH([libz])
 
@@ -92,12 +91,6 @@ if test "x$with_libcares" = "xyes"; then
   AM_PATH_LIBCARES
 fi
 
-if test "x$have_libcares" = "x"; then
-  if test "x$with_libares" = "xyes"; then
-    AM_PATH_LIBARES
-  fi
-fi
-
 # Check availability of libz
 if test "x$with_libz" = "xyes"; then
   AM_PATH_LIBZ
@@ -148,7 +141,7 @@ AM_CONDITIONAL([ENABLE_LIBXML2],
 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"; then
   AC_DEFINE([ENABLE_ASYNC_DNS], [1],
             [Define to 1 if asynchronous DNS support is enabled.])
   AM_CONDITIONAL([ENABLE_ASYNC_DNS], true)
@@ -350,7 +343,6 @@ echo "GnuTLS:         $have_libgnutls"
 echo "OpenSSL:        $have_openssl"
 echo "LibXML2:        $have_libxml2"
 echo "LibExpat:       $have_libexpat"
-echo "LibAres:        $have_libares"
 echo "LibCares:       $have_libcares"
 echo "Libz:           $have_libz"
 echo "Bittorrent:     $enable_bittorrent"

doc/Makefile.in

@@ -46,18 +46,18 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/aria2_arg.m4 \
 	$(top_srcdir)/m4/inttypes-pri.m4 \
 	$(top_srcdir)/m4/inttypes_h.m4 $(top_srcdir)/m4/lcmessage.m4 \
 	$(top_srcdir)/m4/lib-ld.m4 $(top_srcdir)/m4/lib-link.m4 \
-	$(top_srcdir)/m4/lib-prefix.m4 $(top_srcdir)/m4/libares.m4 \
-	$(top_srcdir)/m4/libcares.m4 $(top_srcdir)/m4/libexpat.m4 \
-	$(top_srcdir)/m4/libgcrypt.m4 $(top_srcdir)/m4/libgnutls.m4 \
-	$(top_srcdir)/m4/libxml2.m4 $(top_srcdir)/m4/libz.m4 \
-	$(top_srcdir)/m4/lock.m4 $(top_srcdir)/m4/longlong.m4 \
-	$(top_srcdir)/m4/nls.m4 $(top_srcdir)/m4/openssl.m4 \
-	$(top_srcdir)/m4/po.m4 $(top_srcdir)/m4/printf-posix.m4 \
-	$(top_srcdir)/m4/progtest.m4 $(top_srcdir)/m4/size_max.m4 \
-	$(top_srcdir)/m4/sqlite3.m4 $(top_srcdir)/m4/stdint_h.m4 \
-	$(top_srcdir)/m4/uintmax_t.m4 $(top_srcdir)/m4/visibility.m4 \
-	$(top_srcdir)/m4/wchar_t.m4 $(top_srcdir)/m4/wint_t.m4 \
-	$(top_srcdir)/m4/xsize.m4 $(top_srcdir)/configure.ac
+	$(top_srcdir)/m4/lib-prefix.m4 $(top_srcdir)/m4/libcares.m4 \
+	$(top_srcdir)/m4/libexpat.m4 $(top_srcdir)/m4/libgcrypt.m4 \
+	$(top_srcdir)/m4/libgnutls.m4 $(top_srcdir)/m4/libxml2.m4 \
+	$(top_srcdir)/m4/libz.m4 $(top_srcdir)/m4/lock.m4 \
+	$(top_srcdir)/m4/longlong.m4 $(top_srcdir)/m4/nls.m4 \
+	$(top_srcdir)/m4/openssl.m4 $(top_srcdir)/m4/po.m4 \
+	$(top_srcdir)/m4/printf-posix.m4 $(top_srcdir)/m4/progtest.m4 \
+	$(top_srcdir)/m4/size_max.m4 $(top_srcdir)/m4/sqlite3.m4 \
+	$(top_srcdir)/m4/stdint_h.m4 $(top_srcdir)/m4/uintmax_t.m4 \
+	$(top_srcdir)/m4/visibility.m4 $(top_srcdir)/m4/wchar_t.m4 \
+	$(top_srcdir)/m4/wint_t.m4 $(top_srcdir)/m4/xsize.m4 \
+	$(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
 mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
@@ -132,8 +132,6 @@ INTLOBJS = @INTLOBJS@
 INTL_LIBTOOL_SUFFIX_PREFIX = @INTL_LIBTOOL_SUFFIX_PREFIX@
 INTL_MACOSX_LIBS = @INTL_MACOSX_LIBS@
 LDFLAGS = @LDFLAGS@
-LIBARES_CPPFLAGS = @LIBARES_CPPFLAGS@
-LIBARES_LIBS = @LIBARES_LIBS@
 LIBCARES_CPPFLAGS = @LIBCARES_CPPFLAGS@
 LIBCARES_LIBS = @LIBCARES_LIBS@
 LIBEXPAT_CPPFLAGS = @LIBEXPAT_CPPFLAGS@

lib/Makefile.in

@@ -44,18 +44,18 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/aria2_arg.m4 \
 	$(top_srcdir)/m4/inttypes-pri.m4 \
 	$(top_srcdir)/m4/inttypes_h.m4 $(top_srcdir)/m4/lcmessage.m4 \
 	$(top_srcdir)/m4/lib-ld.m4 $(top_srcdir)/m4/lib-link.m4 \
-	$(top_srcdir)/m4/lib-prefix.m4 $(top_srcdir)/m4/libares.m4 \
-	$(top_srcdir)/m4/libcares.m4 $(top_srcdir)/m4/libexpat.m4 \
-	$(top_srcdir)/m4/libgcrypt.m4 $(top_srcdir)/m4/libgnutls.m4 \
-	$(top_srcdir)/m4/libxml2.m4 $(top_srcdir)/m4/libz.m4 \
-	$(top_srcdir)/m4/lock.m4 $(top_srcdir)/m4/longlong.m4 \
-	$(top_srcdir)/m4/nls.m4 $(top_srcdir)/m4/openssl.m4 \
-	$(top_srcdir)/m4/po.m4 $(top_srcdir)/m4/printf-posix.m4 \
-	$(top_srcdir)/m4/progtest.m4 $(top_srcdir)/m4/size_max.m4 \
-	$(top_srcdir)/m4/sqlite3.m4 $(top_srcdir)/m4/stdint_h.m4 \
-	$(top_srcdir)/m4/uintmax_t.m4 $(top_srcdir)/m4/visibility.m4 \
-	$(top_srcdir)/m4/wchar_t.m4 $(top_srcdir)/m4/wint_t.m4 \
-	$(top_srcdir)/m4/xsize.m4 $(top_srcdir)/configure.ac
+	$(top_srcdir)/m4/lib-prefix.m4 $(top_srcdir)/m4/libcares.m4 \
+	$(top_srcdir)/m4/libexpat.m4 $(top_srcdir)/m4/libgcrypt.m4 \
+	$(top_srcdir)/m4/libgnutls.m4 $(top_srcdir)/m4/libxml2.m4 \
+	$(top_srcdir)/m4/libz.m4 $(top_srcdir)/m4/lock.m4 \
+	$(top_srcdir)/m4/longlong.m4 $(top_srcdir)/m4/nls.m4 \
+	$(top_srcdir)/m4/openssl.m4 $(top_srcdir)/m4/po.m4 \
+	$(top_srcdir)/m4/printf-posix.m4 $(top_srcdir)/m4/progtest.m4 \
+	$(top_srcdir)/m4/size_max.m4 $(top_srcdir)/m4/sqlite3.m4 \
+	$(top_srcdir)/m4/stdint_h.m4 $(top_srcdir)/m4/uintmax_t.m4 \
+	$(top_srcdir)/m4/visibility.m4 $(top_srcdir)/m4/wchar_t.m4 \
+	$(top_srcdir)/m4/wint_t.m4 $(top_srcdir)/m4/xsize.m4 \
+	$(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
 mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
@@ -118,8 +118,6 @@ INTLOBJS = @INTLOBJS@
 INTL_LIBTOOL_SUFFIX_PREFIX = @INTL_LIBTOOL_SUFFIX_PREFIX@
 INTL_MACOSX_LIBS = @INTL_MACOSX_LIBS@
 LDFLAGS = @LDFLAGS@
-LIBARES_CPPFLAGS = @LIBARES_CPPFLAGS@
-LIBARES_LIBS = @LIBARES_LIBS@
 LIBCARES_CPPFLAGS = @LIBCARES_CPPFLAGS@
 LIBCARES_LIBS = @LIBCARES_LIBS@
 LIBEXPAT_CPPFLAGS = @LIBEXPAT_CPPFLAGS@

m4/Makefile.in

@@ -44,18 +44,18 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/aria2_arg.m4 \
 	$(top_srcdir)/m4/inttypes-pri.m4 \
 	$(top_srcdir)/m4/inttypes_h.m4 $(top_srcdir)/m4/lcmessage.m4 \
 	$(top_srcdir)/m4/lib-ld.m4 $(top_srcdir)/m4/lib-link.m4 \
-	$(top_srcdir)/m4/lib-prefix.m4 $(top_srcdir)/m4/libares.m4 \
-	$(top_srcdir)/m4/libcares.m4 $(top_srcdir)/m4/libexpat.m4 \
-	$(top_srcdir)/m4/libgcrypt.m4 $(top_srcdir)/m4/libgnutls.m4 \
-	$(top_srcdir)/m4/libxml2.m4 $(top_srcdir)/m4/libz.m4 \
-	$(top_srcdir)/m4/lock.m4 $(top_srcdir)/m4/longlong.m4 \
-	$(top_srcdir)/m4/nls.m4 $(top_srcdir)/m4/openssl.m4 \
-	$(top_srcdir)/m4/po.m4 $(top_srcdir)/m4/printf-posix.m4 \
-	$(top_srcdir)/m4/progtest.m4 $(top_srcdir)/m4/size_max.m4 \
-	$(top_srcdir)/m4/sqlite3.m4 $(top_srcdir)/m4/stdint_h.m4 \
-	$(top_srcdir)/m4/uintmax_t.m4 $(top_srcdir)/m4/visibility.m4 \
-	$(top_srcdir)/m4/wchar_t.m4 $(top_srcdir)/m4/wint_t.m4 \
-	$(top_srcdir)/m4/xsize.m4 $(top_srcdir)/configure.ac
+	$(top_srcdir)/m4/lib-prefix.m4 $(top_srcdir)/m4/libcares.m4 \
+	$(top_srcdir)/m4/libexpat.m4 $(top_srcdir)/m4/libgcrypt.m4 \
+	$(top_srcdir)/m4/libgnutls.m4 $(top_srcdir)/m4/libxml2.m4 \
+	$(top_srcdir)/m4/libz.m4 $(top_srcdir)/m4/lock.m4 \
+	$(top_srcdir)/m4/longlong.m4 $(top_srcdir)/m4/nls.m4 \
+	$(top_srcdir)/m4/openssl.m4 $(top_srcdir)/m4/po.m4 \
+	$(top_srcdir)/m4/printf-posix.m4 $(top_srcdir)/m4/progtest.m4 \
+	$(top_srcdir)/m4/size_max.m4 $(top_srcdir)/m4/sqlite3.m4 \
+	$(top_srcdir)/m4/stdint_h.m4 $(top_srcdir)/m4/uintmax_t.m4 \
+	$(top_srcdir)/m4/visibility.m4 $(top_srcdir)/m4/wchar_t.m4 \
+	$(top_srcdir)/m4/wint_t.m4 $(top_srcdir)/m4/xsize.m4 \
+	$(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
 mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
@@ -118,8 +118,6 @@ INTLOBJS = @INTLOBJS@
 INTL_LIBTOOL_SUFFIX_PREFIX = @INTL_LIBTOOL_SUFFIX_PREFIX@
 INTL_MACOSX_LIBS = @INTL_MACOSX_LIBS@
 LDFLAGS = @LDFLAGS@
-LIBARES_CPPFLAGS = @LIBARES_CPPFLAGS@
-LIBARES_LIBS = @LIBARES_LIBS@
 LIBCARES_CPPFLAGS = @LIBCARES_CPPFLAGS@
 LIBCARES_LIBS = @LIBCARES_LIBS@
 LIBEXPAT_CPPFLAGS = @LIBEXPAT_CPPFLAGS@

m4/libares.m4

@@ -1,33 +0,0 @@
-AC_DEFUN([AM_PATH_LIBARES],
-[
-AC_ARG_WITH([libares-prefix],
-            [  --with-libares-prefix=PREFIX  Prefix where libares installed (optional)],
-            [libares_prefix=$withval],
-            [libares_prefix=""])
-
-if test "x$libares_prefix" = "x"; then
-  libares_prefix="/usr"
-fi
-
-libares_prefix_lib=$libares_prefix/lib
-libares_prefix_include=$libares_prefix/include
-
-LIBS_save=$LIBS
-CPPFLAGS_save=$CPPFLAGS
-
-LIBS="-L$libares_prefix_lib $LIBS"
-CPPFLAGS="-I$libares_prefix_include $CPPFLAGS"
-
-AC_CHECK_LIB([ares], [ares_init], [have_libares=yes])
-if test "x$have_libares" = "xyes"; then
-    AC_DEFINE([HAVE_LIBARES], [1], [Define to 1 if you have libares.])
-    LIBARES_LIBS="-L$libares_prefix_lib -lares"
-    LIBARES_CPPFLAGS="-I$libares_prefix_include"
-    AC_SUBST(LIBARES_LIBS)
-    AC_SUBST(LIBARES_CPPFLAGS)
-fi
-
-LIBS=$LIBS_save
-CPPFLAGS=$CPPFLAGS_save
-
-])

src/AsyncNameResolver.cc

@@ -46,15 +46,6 @@ void callback(void* arg, int status, struct hostent* host)
 #endif // HAVE_LIBCARES1_5
 {
   AsyncNameResolver* resolverPtr = reinterpret_cast<AsyncNameResolver*>(arg);
-#ifdef HAVE_LIBARES
-  // This block is required since the assertion in ares_strerror fails
-  // if status = ARES_EDESTRUCTION is passed to ares_strerror as 1st argument.
-  // This does not happen in c-ares.
-  if(status == ARES_EDESTRUCTION) {
-    // we simply return in this case.
-    return;
-  }
-#endif
   if(status != ARES_SUCCESS) {
 #ifdef HAVE_LIBCARES
     resolverPtr->error = ares_strerror(status);

src/Makefile.am

@@ -485,13 +485,13 @@ endif # !HAVE_TIMEGM
 noinst_LIBRARIES = libaria2c.a
 libaria2c_a_SOURCES = $(SRCS)
 aria2c_LDADD = libaria2c.a @LIBINTL@ @ALLOCA@ @LIBGNUTLS_LIBS@\
-	@LIBGCRYPT_LIBS@ @OPENSSL_LIBS@ @XML_LIBS@ @LIBARES_LIBS@\
+	@LIBGCRYPT_LIBS@ @OPENSSL_LIBS@ @XML_LIBS@\
 	@LIBCARES_LIBS@ @WINSOCK_LIBS@ @LIBEXPAT_LIBS@ @LIBZ_LIBS@\
 	@SQLITE3_LIBS@ #-lprofiler
 #aria2c_LDFLAGS =  -pg
 AM_CPPFLAGS =  -Wall\
 	-I../lib -I../intl -I$(top_srcdir)/intl\
 	@LIBGNUTLS_CFLAGS@ @LIBGCRYPT_CFLAGS@ @OPENSSL_CFLAGS@ @XML_CPPFLAGS@\
-	@LIBARES_CPPFLAGS@ @LIBCARES_CPPFLAGS@ @LIBEXPAT_CPPFLAGS@\
+	@LIBCARES_CPPFLAGS@ @LIBEXPAT_CPPFLAGS@\
 	@LIBZ_CPPFLAGS@	 @SQLITE3_CPPFLAGS@\
 	-DLOCALEDIR=\"$(localedir)\" @DEFS@ #-pg

src/Makefile.in

@@ -277,18 +277,18 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/aria2_arg.m4 \
 	$(top_srcdir)/m4/inttypes-pri.m4 \
 	$(top_srcdir)/m4/inttypes_h.m4 $(top_srcdir)/m4/lcmessage.m4 \
 	$(top_srcdir)/m4/lib-ld.m4 $(top_srcdir)/m4/lib-link.m4 \
-	$(top_srcdir)/m4/lib-prefix.m4 $(top_srcdir)/m4/libares.m4 \
-	$(top_srcdir)/m4/libcares.m4 $(top_srcdir)/m4/libexpat.m4 \
-	$(top_srcdir)/m4/libgcrypt.m4 $(top_srcdir)/m4/libgnutls.m4 \
-	$(top_srcdir)/m4/libxml2.m4 $(top_srcdir)/m4/libz.m4 \
-	$(top_srcdir)/m4/lock.m4 $(top_srcdir)/m4/longlong.m4 \
-	$(top_srcdir)/m4/nls.m4 $(top_srcdir)/m4/openssl.m4 \
-	$(top_srcdir)/m4/po.m4 $(top_srcdir)/m4/printf-posix.m4 \
-	$(top_srcdir)/m4/progtest.m4 $(top_srcdir)/m4/size_max.m4 \
-	$(top_srcdir)/m4/sqlite3.m4 $(top_srcdir)/m4/stdint_h.m4 \
-	$(top_srcdir)/m4/uintmax_t.m4 $(top_srcdir)/m4/visibility.m4 \
-	$(top_srcdir)/m4/wchar_t.m4 $(top_srcdir)/m4/wint_t.m4 \
-	$(top_srcdir)/m4/xsize.m4 $(top_srcdir)/configure.ac
+	$(top_srcdir)/m4/lib-prefix.m4 $(top_srcdir)/m4/libcares.m4 \
+	$(top_srcdir)/m4/libexpat.m4 $(top_srcdir)/m4/libgcrypt.m4 \
+	$(top_srcdir)/m4/libgnutls.m4 $(top_srcdir)/m4/libxml2.m4 \
+	$(top_srcdir)/m4/libz.m4 $(top_srcdir)/m4/lock.m4 \
+	$(top_srcdir)/m4/longlong.m4 $(top_srcdir)/m4/nls.m4 \
+	$(top_srcdir)/m4/openssl.m4 $(top_srcdir)/m4/po.m4 \
+	$(top_srcdir)/m4/printf-posix.m4 $(top_srcdir)/m4/progtest.m4 \
+	$(top_srcdir)/m4/size_max.m4 $(top_srcdir)/m4/sqlite3.m4 \
+	$(top_srcdir)/m4/stdint_h.m4 $(top_srcdir)/m4/uintmax_t.m4 \
+	$(top_srcdir)/m4/visibility.m4 $(top_srcdir)/m4/wchar_t.m4 \
+	$(top_srcdir)/m4/wint_t.m4 $(top_srcdir)/m4/xsize.m4 \
+	$(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
 mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
@@ -901,8 +901,6 @@ INTLOBJS = @INTLOBJS@
 INTL_LIBTOOL_SUFFIX_PREFIX = @INTL_LIBTOOL_SUFFIX_PREFIX@
 INTL_MACOSX_LIBS = @INTL_MACOSX_LIBS@
 LDFLAGS = @LDFLAGS@
-LIBARES_CPPFLAGS = @LIBARES_CPPFLAGS@
-LIBARES_LIBS = @LIBARES_LIBS@
 LIBCARES_CPPFLAGS = @LIBCARES_CPPFLAGS@
 LIBCARES_LIBS = @LIBCARES_LIBS@
 LIBEXPAT_CPPFLAGS = @LIBEXPAT_CPPFLAGS@
@@ -1155,7 +1153,7 @@ SRCS = Socket.h SocketCore.cc SocketCore.h BinaryStream.h Command.cc \
 noinst_LIBRARIES = libaria2c.a
 libaria2c_a_SOURCES = $(SRCS)
 aria2c_LDADD = libaria2c.a @LIBINTL@ @ALLOCA@ @LIBGNUTLS_LIBS@\
-	@LIBGCRYPT_LIBS@ @OPENSSL_LIBS@ @XML_LIBS@ @LIBARES_LIBS@\
+	@LIBGCRYPT_LIBS@ @OPENSSL_LIBS@ @XML_LIBS@\
 	@LIBCARES_LIBS@ @WINSOCK_LIBS@ @LIBEXPAT_LIBS@ @LIBZ_LIBS@\
 	@SQLITE3_LIBS@ #-lprofiler
 
@@ -1163,7 +1161,7 @@ aria2c_LDADD = libaria2c.a @LIBINTL@ @ALLOCA@ @LIBGNUTLS_LIBS@\
 AM_CPPFLAGS = -Wall\
 	-I../lib -I../intl -I$(top_srcdir)/intl\
 	@LIBGNUTLS_CFLAGS@ @LIBGCRYPT_CFLAGS@ @OPENSSL_CFLAGS@ @XML_CPPFLAGS@\
-	@LIBARES_CPPFLAGS@ @LIBCARES_CPPFLAGS@ @LIBEXPAT_CPPFLAGS@\
+	@LIBCARES_CPPFLAGS@ @LIBEXPAT_CPPFLAGS@\
 	@LIBZ_CPPFLAGS@	 @SQLITE3_CPPFLAGS@\
 	-DLOCALEDIR=\"$(localedir)\" @DEFS@ #-pg
 

test/Makefile.am

@@ -188,7 +188,7 @@ endif # ENABLE_METALINK
 
 aria2c_LDADD = ../src/libaria2c.a ../src/download_helper.o\
     @LIBINTL@ @LIBGNUTLS_LIBS@\
-	@LIBGCRYPT_LIBS@ @OPENSSL_LIBS@ @XML_LIBS@ @LIBARES_LIBS@\
+	@LIBGCRYPT_LIBS@ @OPENSSL_LIBS@ @XML_LIBS@\
 	@LIBCARES_LIBS@ @WINSOCK_LIBS@ @LIBEXPAT_LIBS@ @LIBZ_LIBS@\
 	@SQLITE3_LIBS@\
 	${CPPUNIT_LIBS}
@@ -197,7 +197,7 @@ AM_CPPFLAGS =  -Wall\
 	-I ../src\
 	-I../lib -I../intl -I$(top_srcdir)/intl\
 	@LIBGNUTLS_CFLAGS@ @LIBGCRYPT_CFLAGS@ @OPENSSL_CFLAGS@ @XML_CPPFLAGS@\
-	@LIBARES_CPPFLAGS@ @LIBCARES_CPPFLAGS@ @LIBEXPAT_CPPFLAGS@\
+	@LIBCARES_CPPFLAGS@ @LIBEXPAT_CPPFLAGS@\
 	@LIBZ_CPPFLAGS@	 @SQLITE3_CPPFLAGS@ -DLOCALEDIR=\"$(localedir)\" @DEFS@
 
 EXTRA_DIST = 4096chunk.txt\

test/Makefile.in

@@ -152,18 +152,18 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/aria2_arg.m4 \
 	$(top_srcdir)/m4/inttypes-pri.m4 \
 	$(top_srcdir)/m4/inttypes_h.m4 $(top_srcdir)/m4/lcmessage.m4 \
 	$(top_srcdir)/m4/lib-ld.m4 $(top_srcdir)/m4/lib-link.m4 \
-	$(top_srcdir)/m4/lib-prefix.m4 $(top_srcdir)/m4/libares.m4 \
-	$(top_srcdir)/m4/libcares.m4 $(top_srcdir)/m4/libexpat.m4 \
-	$(top_srcdir)/m4/libgcrypt.m4 $(top_srcdir)/m4/libgnutls.m4 \
-	$(top_srcdir)/m4/libxml2.m4 $(top_srcdir)/m4/libz.m4 \
-	$(top_srcdir)/m4/lock.m4 $(top_srcdir)/m4/longlong.m4 \
-	$(top_srcdir)/m4/nls.m4 $(top_srcdir)/m4/openssl.m4 \
-	$(top_srcdir)/m4/po.m4 $(top_srcdir)/m4/printf-posix.m4 \
-	$(top_srcdir)/m4/progtest.m4 $(top_srcdir)/m4/size_max.m4 \
-	$(top_srcdir)/m4/sqlite3.m4 $(top_srcdir)/m4/stdint_h.m4 \
-	$(top_srcdir)/m4/uintmax_t.m4 $(top_srcdir)/m4/visibility.m4 \
-	$(top_srcdir)/m4/wchar_t.m4 $(top_srcdir)/m4/wint_t.m4 \
-	$(top_srcdir)/m4/xsize.m4 $(top_srcdir)/configure.ac
+	$(top_srcdir)/m4/lib-prefix.m4 $(top_srcdir)/m4/libcares.m4 \
+	$(top_srcdir)/m4/libexpat.m4 $(top_srcdir)/m4/libgcrypt.m4 \
+	$(top_srcdir)/m4/libgnutls.m4 $(top_srcdir)/m4/libxml2.m4 \
+	$(top_srcdir)/m4/libz.m4 $(top_srcdir)/m4/lock.m4 \
+	$(top_srcdir)/m4/longlong.m4 $(top_srcdir)/m4/nls.m4 \
+	$(top_srcdir)/m4/openssl.m4 $(top_srcdir)/m4/po.m4 \
+	$(top_srcdir)/m4/printf-posix.m4 $(top_srcdir)/m4/progtest.m4 \
+	$(top_srcdir)/m4/size_max.m4 $(top_srcdir)/m4/sqlite3.m4 \
+	$(top_srcdir)/m4/stdint_h.m4 $(top_srcdir)/m4/uintmax_t.m4 \
+	$(top_srcdir)/m4/visibility.m4 $(top_srcdir)/m4/wchar_t.m4 \
+	$(top_srcdir)/m4/wint_t.m4 $(top_srcdir)/m4/xsize.m4 \
+	$(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
 mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
@@ -448,8 +448,6 @@ INTLOBJS = @INTLOBJS@
 INTL_LIBTOOL_SUFFIX_PREFIX = @INTL_LIBTOOL_SUFFIX_PREFIX@
 INTL_MACOSX_LIBS = @INTL_MACOSX_LIBS@
 LDFLAGS = @LDFLAGS@
-LIBARES_CPPFLAGS = @LIBARES_CPPFLAGS@
-LIBARES_LIBS = @LIBARES_LIBS@
 LIBCARES_CPPFLAGS = @LIBCARES_CPPFLAGS@
 LIBCARES_LIBS = @LIBCARES_LIBS@
 LIBEXPAT_CPPFLAGS = @LIBEXPAT_CPPFLAGS@
@@ -603,7 +601,7 @@ aria2c_SOURCES = AllTest.cc TestUtil.cc TestUtil.h SocketCoreTest.cc \
 #aria2c_LDFLAGS = ${CPPUNIT_LIBS}
 aria2c_LDADD = ../src/libaria2c.a ../src/download_helper.o\
     @LIBINTL@ @LIBGNUTLS_LIBS@\
-	@LIBGCRYPT_LIBS@ @OPENSSL_LIBS@ @XML_LIBS@ @LIBARES_LIBS@\
+	@LIBGCRYPT_LIBS@ @OPENSSL_LIBS@ @XML_LIBS@\
 	@LIBCARES_LIBS@ @WINSOCK_LIBS@ @LIBEXPAT_LIBS@ @LIBZ_LIBS@\
 	@SQLITE3_LIBS@\
 	${CPPUNIT_LIBS}
@@ -613,7 +611,7 @@ AM_CPPFLAGS = -Wall\
 	-I ../src\
 	-I../lib -I../intl -I$(top_srcdir)/intl\
 	@LIBGNUTLS_CFLAGS@ @LIBGCRYPT_CFLAGS@ @OPENSSL_CFLAGS@ @XML_CPPFLAGS@\
-	@LIBARES_CPPFLAGS@ @LIBCARES_CPPFLAGS@ @LIBEXPAT_CPPFLAGS@\
+	@LIBCARES_CPPFLAGS@ @LIBEXPAT_CPPFLAGS@\
 	@LIBZ_CPPFLAGS@	 @SQLITE3_CPPFLAGS@ -DLOCALEDIR=\"$(localedir)\" @DEFS@
 
 EXTRA_DIST = 4096chunk.txt\