[glib] configure: fix win32 build



commit e943366de5cd4da4bdaf625f709b66ff9101ee3b
Author: Dan Winship <danw gnome org>
Date:   Sun Sep 4 08:42:03 2011 -0400

    configure: fix win32 build
    
    Only require -lresolv on unix, like before
    
    https://bugzilla.gnome.org/show_bug.cgi?id=645336

 configure.ac |   68 +++++++++++++++++++++++++++++----------------------------
 1 files changed, 35 insertions(+), 33 deletions(-)
---
diff --git a/configure.ac b/configure.ac
index 307e606..af61d5d 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1072,39 +1072,41 @@ AC_CHECK_FUNCS(getprotobyname_r endservent)
 AC_CHECK_HEADERS([netdb.h wspiapi.h arpa/nameser_compat.h])
 
 # For gio/libasyncns
-AC_CHECK_FUNCS(strndup setresuid setreuid)
-AC_CHECK_HEADERS(sys/prctl.h)
-
-# 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 <sys/types.h>
-	     #include <netinet/in.h>
-	     #include <arpa/nameser.h>
-	     #include <resolv.h>
-            ],[
-	     res_query("test", 0, 0, (void *)0, 0);
-            ],[AC_MSG_RESULT([yes])],
-            [save_libs="$LIBS"
-             LIBS="-lresolv $LIBS"
-             AC_TRY_LINK([#include <sys/types.h>
-			  #include <netinet/in.h>
-			  #include <arpa/nameser.h>
-			  #include <resolv.h>
-			 ],[
-			  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 <resolv.h>],
-                                      [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())]))
+if test $glib_native_win32 = no; then
+  AC_CHECK_FUNCS(strndup setresuid setreuid)
+  AC_CHECK_HEADERS(sys/prctl.h)
+
+  # 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 <sys/types.h>
+	       #include <netinet/in.h>
+	       #include <arpa/nameser.h>
+	       #include <resolv.h>
+              ],[
+	       res_query("test", 0, 0, (void *)0, 0);
+              ],[AC_MSG_RESULT([yes])],
+              [save_libs="$LIBS"
+               LIBS="-lresolv $LIBS"
+               AC_TRY_LINK([#include <sys/types.h>
+			    #include <netinet/in.h>
+			    #include <arpa/nameser.h>
+			    #include <resolv.h>
+			   ],[
+			    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 <resolv.h>],
+                                        [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)
 
 case $host in



[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]