@@ -1027,14 +1027,10 @@
 	AS_HELP_STRING([--disable-sockets], [disable socket support]))
 AS_IF([test x"$enable_sockets" != x"no"], [
 	AC_DEFINE(OF_HAVE_SOCKETS, 1, [Whether we have sockets])
 	AC_SUBST(USE_SRCS_SOCKETS, '${SRCS_SOCKETS}')
 
-	AS_IF([test x"$enable_files" != x"no"], [
-		AC_SUBST(OFHTTP, "ofhttp")
-	])
-
 	AC_CHECK_LIB(socket, socket, LIBS="$LIBS -lsocket")
 	AC_CHECK_LIB(network, socket, LIBS="$LIBS -lnetwork")
 	AC_CHECK_LIB(ws2_32, main, LIBS="$LIBS -lws2_32")
 
 	AC_CHECK_HEADER(sys/socket.h, [
@@ -1230,11 +1226,16 @@
 		AC_MSG_RESULT(no)
 	])
 ])
 
 AS_IF([test x"$enable_sockets" != x"no" -a x"$enable_threads" != x"no"], [
+	AC_SUBST(OFHTTPCLIENT_M, "OFHTTPClient.m")
 	AC_SUBST(OFHTTPCLIENTTESTS_M, "OFHTTPClientTests.m")
+
+	AS_IF([test x"$enable_files" != x"no"], [
+		AC_SUBST(OFHTTP, "ofhttp")
+	])
 ])
 
 AC_DEFUN([CHECK_BUILTIN_BSWAP], [
 	AC_MSG_CHECKING(for __builtin_bswap$1)
 	AC_TRY_LINK([