? .hg
? aclocal.m4
? autom4te.cache
? bcn.ircd.motd
? cache
? ircd.pid
? ircd.tune
? location.conf
? motd.txt
? robots.txt
? server.cert.pem
? server.key.pem
? server.req.pem
? smotd.txt
? tmp
? unrealircd.conf
? valgrind.unreal.suppress
? autoconf/acinclude.m4
? extras/c-ares
? extras/c-ares-1.6.0
? extras/c-ares.tar
? src/modules/callerid.c
? src/modules/m_soper.c
? src/modules/testchanmodehook.c
Index: configure
===================================================================
RCS file: /cvs/unreal/Attic/configure,v
retrieving revision 1.1.2.96.2.42
diff -u -B -r1.1.2.96.2.42 configure
===================================================================
RCS file: /cvs/unreal/autoconf/m4/Attic/unreal.m4,v
retrieving revision 1.1.2.1
diff -u -B -r1.1.2.1 unreal.m4
--- autoconf/m4/unreal.m4	8 Jul 2010 02:51:43 -0000	1.1.2.1
+++ autoconf/m4/unreal.m4	15 Jul 2010 23:43:37 -0000
@@ -84,6 +84,8 @@
 		dnl Thus, make sure to use --with-system-cares when using system-cURL. If the user
 		dnl wants bundled c-ares + system libcURL, then we should filter out c-ares
 		dnl flags. _Only_ in that case should we mess with the flags. -- ohnobinki
+		dnl
+		dnl Filtering out the -lcares can only bring us harm, such as #3925. --binki
 
 		AS_IF([test "x$with_system_cares" = "xno" && test "x$HOME/curl" != "x$enable_curl" && test "x/usr/share/unreal-curl" != "x$enable_curl" && test "$CURLUSESCARES" != "0" ],
 		[
@@ -103,22 +105,6 @@
 ]])
 		])
 
-		AS_IF([test "x`echo $CURLLIBS |grep ares`" != x && test "x$with_system_cares" = "xno"],
-		[
-			dnl Attempt one: Linux sed
-			XCURLLIBS="`echo "$CURLLIBS"|sed -r 's/(@<:@^ @:>@+ @<:@^ @:>@+ )(@<:@^ @:>@+ @<:@^ @:>@+ )(.+)/\1\3/g' 2>/dev/null`"
-			AS_IF([test x"$XCURLLIBS" = x],
-			[
-				dnl Attempt two: FreeBSD (and others?) sed
-				XCURLLIBS="`echo "$CURLLIBS"|sed -E 's/(@<:@^ @:>@+ @<:@^ @:>@+ )(@<:@^ @:>@+ @<:@^ @:>@+ )(.+)/\1\3/g' 2>/dev/null`"
-				AS_IF([test x"$XCURLLIBS" = x],
-				[
-					AC_MSG_ERROR([sed appears to be broken. It is needed for a remote includes compile hack.])
-				])
-			])
-			CURLLIBS="$XCURLLIBS"
-		])
-		
 		dnl Make sure that linking against cURL works rather than letting the user
 		dnl find out after compiling most of his program. ~ohnobinki
 		IRCDLIBS="$IRCDLIBS $CURLLIBS"