diff -Naur pkg-config-0.28/glib/configure.ac pkg-config-0.28-haiku/glib/configure.ac --- pkg-config-0.28/glib/configure.ac 2012-10-13 09:35:36.033030144 -0500 +++ pkg-config-0.28-haiku/glib/configure.ac 2013-08-18 19:05:41.008388608 -0500 @@ -288,7 +288,6 @@ AM_CONDITIONAL(HAVE_CXX, [test "$CXX" != ""]) AC_LANG_RESTORE -AM_PROG_CC_STDC AM_PROG_CC_C_O AC_PROG_INSTALL @@ -1031,38 +1030,6 @@ AC_CHECK_FUNCS(getprotobyname_r endservent if_nametoindex) AC_CHECK_HEADERS([netdb.h wspiapi.h arpa/nameser_compat.h]) -if test $glib_native_win32 = no; then - # We can't just use AC_CHECK_FUNC/AC_CHECK_LIB here. Bug 586150 - NETWORK_LIBS="" - AC_MSG_CHECKING([for res_query]) - AC_TRY_LINK([#include - #include - #include - #include - ],[ - res_query("test", 0, 0, (void *)0, 0); - ],[AC_MSG_RESULT([yes])], - [save_libs="$LIBS" - LIBS="-lresolv $LIBS" - AC_TRY_LINK([#include - #include - #include - #include - ],[ - res_query("test", 0, 0, (void *)0, 0); - ],[AC_MSG_RESULT([in -lresolv]) - NETWORK_LIBS="-lresolv $NETWORK_LIBS"], - [LIBS="-lbind $save_libs" - AC_TRY_LINK([#include ], - [res_query("test", 0, 0, (void *)0, 0);], - [AC_MSG_RESULT([in -lbind]) - NETWORK_LIBS="-lbind $NETWORK_LIBS"], - [AC_MSG_ERROR(not found)])]) - LIBS="$save_libs"]) - AC_CHECK_FUNC(socket, :, AC_CHECK_LIB(socket, socket, - [NETWORK_LIBS="-lsocket $NETWORK_LIBS"], - [AC_MSG_ERROR(Could not find socket())])) -fi AC_SUBST(NETWORK_LIBS) AC_CHECK_HEADER([linux/netlink.h],