@@ -10,10 +10,11 @@
 AC_PROG_LN_S
 AC_PROG_EGREP
 
 CFLAGS="$CFLAGS -Wall"
 OBJCFLAGS="$OBJCFLAGS -Wall -fobjc-exceptions"
+LIBS="$LIBS -lobjc"
 
 AC_DEFINE(OF_CONFIG_H, 1, [Define so that we know we got our config.h])
 
 BUILDSYS_LIB
 AC_C_BIGENDIAN([AC_DEFINE(OF_BIG_ENDIAN, 1, [Whether we are big endian])])
@@ -65,13 +66,11 @@
 test x"$have_asprintf" != x"yes" -a x"$ac_cv_snprintf_useful_ret" != x"yes" && \
 	AC_MSG_ERROR(No asprintf and no snprintf returning required space!)
 
 ACX_PTHREAD
 
-AC_CHECK_LIB(ws2_32, main,
-	AC_SUBST(WS2_LIBS, "-lws2_32"),
-	AC_SUBST(WS2_LIBS, ""))
+AC_CHECK_LIB(ws2_32, main, LIBS="$LIBS -lws2_32")
 
 AC_MSG_CHECKING(whether we have IPv6 support)
 AC_CACHE_VAL(ac_cv_have_ipv6, [
 	AC_TRY_RUN([
 		#include <stdlib.h>