From 433072bf44cf549c452866af53a430a492faab87 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?U-WIN-U2045GN0RNQ=5CV=C3=ADtor=20Santos=20Costa?=
 <Vítor Santos Costa@WIN-U2045GN0RNQ.(none)>
Date: Tue, 20 Jul 2010 22:54:20 +0100
Subject: [PATCH] more clib fixes

---
 configure    | 23 ++++++++++++++++-------
 configure.in | 23 ++++++++++++++++-------
 2 files changed, 32 insertions(+), 14 deletions(-)

diff --git a/configure b/configure
index 096feb1c7..a3afe93f0 100755
--- a/configure
+++ b/configure
@@ -5189,8 +5189,10 @@ fi
       if test "$target_win64" = yes
       then
         prefix="\${SYSTEMDRIVE}/Yap64"
+	CLIB_NETLIBS="-lwsock32 -lpsapi -lgdi32"
       else
         prefix="\${SYSTEMDRIVE}/Yap"
+	CLIB_NETLIBS="-lws2_32 -lpsapi -lgid32"
       fi
     fi
     ENABLE_WINCONSOLE=""
@@ -9273,14 +9275,14 @@ CHR_TARGETS=chr_support."$SO"
 
 
 
+CLIB_TARGETS="random.$SO socket.$SO cgi.$SO memfile.$SO files.$SO mime.$SO crypt.$SO"
+CLIB_PLTARGETS="\$(srcdir)/random.pl \$(srcdir)/socket.pl \$(srcdir)/cgi.pl \$(srcdir)/memfile.pl \$(srcdir)/filesex.pl \$(srcdir)/mime.pl \$(srcdir)/crypt.pl"
 
-
-
-
-
-CLIB_TARGETS="random.$SO unix.$SO socket.$SO cgi.$SO memfile.$SO files.$SO mime.$SO crypt.$SO"
-CLIB_PLTARGETS="\$(srcdir)/random.pl \$(srcdir)/unix.pl \$(srcdir)/socket.pl \$(srcdir)/cgi.pl \$(srcdir)/memfile.pl \$(srcdir)/filesex.pl \$(srcdir)/mime.pl \$(srcdir)/crypt.pl"
-
+if test "$IN_UNIX" = ""; then
+CLIB_TARGETS="unix.$SO $CLIB_TARGETS"
+CLIB_PLTARGETS="\$(srcdir)/unix.pl $CLIB_PLTARGETS"
+CLIB_NETLIBS=
+else
 ac_fn_c_check_func "$LINENO" "socket" "ac_cv_func_socket"
 if test "x$ac_cv_func_socket" = x""yes; then :
 
@@ -9381,6 +9383,8 @@ fi
 
 fi
 
+fi
+
 
 oldlibs="$LIBS"
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for crypt in -lcrypt" >&5
@@ -9442,6 +9446,11 @@ done
 
 LIBS="$oldlibs"
 
+
+
+
+
+
 ac_fn_c_check_type "$LINENO" "socklen_t" "ac_cv_type_socklen_t" "
 #include <sys/types.h>
 #include <sys/socket.h>
diff --git a/configure.in b/configure.in
index 633aa7fb5..72e64ce96 100755
--- a/configure.in
+++ b/configure.in
@@ -570,8 +570,10 @@ then
       if test "$target_win64" = yes
       then
         prefix="\${SYSTEMDRIVE}/Yap64"
+	CLIB_NETLIBS="-lwsock32 -lpsapi -lgdi32"
       else
         prefix="\${SYSTEMDRIVE}/Yap"
+	CLIB_NETLIBS="-lws2_32 -lpsapi -lgid32"
       fi
     fi
     ENABLE_WINCONSOLE=""   
@@ -1726,14 +1728,14 @@ AC_SUBST(TARGETS)
 AC_SUBST(PLTARGETS)
 AC_SUBST(CHR_TARGETS)
 
-AC_SUBST(CLIB_TARGETS)
-AC_SUBST(CLIB_PLTARGETS)
-AC_SUBST(CLIB_NETLIBS)
-AC_SUBST(CLIB_CRYPTLIBS)
-
-CLIB_TARGETS="random.$SO unix.$SO socket.$SO cgi.$SO memfile.$SO files.$SO mime.$SO crypt.$SO"
-CLIB_PLTARGETS="\$(srcdir)/random.pl \$(srcdir)/unix.pl \$(srcdir)/socket.pl \$(srcdir)/cgi.pl \$(srcdir)/memfile.pl \$(srcdir)/filesex.pl \$(srcdir)/mime.pl \$(srcdir)/crypt.pl"
+CLIB_TARGETS="random.$SO socket.$SO cgi.$SO memfile.$SO files.$SO mime.$SO crypt.$SO"
+CLIB_PLTARGETS="\$(srcdir)/random.pl \$(srcdir)/socket.pl \$(srcdir)/cgi.pl \$(srcdir)/memfile.pl \$(srcdir)/filesex.pl \$(srcdir)/mime.pl \$(srcdir)/crypt.pl"
 
+if test "$IN_UNIX" = ""; then
+CLIB_TARGETS="unix.$SO $CLIB_TARGETS"
+CLIB_PLTARGETS="\$(srcdir)/unix.pl $CLIB_PLTARGETS"
+CLIB_NETLIBS=
+else
 AC_CHECK_FUNC(socket, [], [
              AC_CHECK_LIB(socket, socket,
                       [CLIB_NETLIBS="$CLIB_NETLIBS -lsocket"]
@@ -1744,6 +1746,8 @@ AC_CHECK_FUNC(gethostent, [], [
                       [CLIB_NETLIBS="$CLIB_NETLIBS -lnsl"]
                       AC_DEFINE(HAVE_LIBNSL, 1,
                       "Define if you have the nsl library (-lnsl)."))])
+fi
+
 
 oldlibs="$LIBS"
 AC_CHECK_LIB(crypt, crypt)
@@ -1751,6 +1755,11 @@ CRYPTLIBS="$LIBS"
 AC_CHECK_FUNCS(crypt)
 LIBS="$oldlibs"
 
+AC_SUBST(CLIB_TARGETS)
+AC_SUBST(CLIB_PLTARGETS)
+AC_SUBST(CLIB_NETLIBS)
+AC_SUBST(CLIB_CRYPTLIBS)
+
 AC_CHECK_TYPES(socklen_t, [], [],
 [
 #include <sys/types.h>