Use ws2_32.lib instead of wsock32.lib

git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@14505 dc483132-0cff-0310-8789-dd5450dbe970

diff --git a/src/appl/gss-sample/ChangeLog b/src/appl/gss-sample/ChangeLog
index 90a6c06c975a9f1d27216172ed869b70add79ca0..b466bae615954db7959e6a92463813b698f2bd97 100644 (file)
--- a/src/appl/gss-sample/ChangeLog
+++ b/src/appl/gss-sample/ChangeLog
@@ -1,3 +1,8 @@
+2002-06-13  Ken Raeburn  <raeburn@mit.edu>
+
+       * Makefile.in ($(OUTPRE)gss-server.exe, $(OUTPRE)gss-server.exe):
+       Use ws2_32.lib instead of wsock32.lib.
+
 2002-04-30  Sam Hartman  <hartmans@mit.edu>
 
        * gss-server.c (server_establish_context): Same here.

diff --git a/src/appl/gss-sample/Makefile.in b/src/appl/gss-sample/Makefile.in
index debb007606560d53df4a0fc183f5c1ef451ad2d9..42519e922184e4944797d0f5a5a37f8ccd47c546 100644 (file)
--- a/src/appl/gss-sample/Makefile.in
+++ b/src/appl/gss-sample/Makefile.in
@@ -21,10 +21,10 @@ gss-client: gss-client.o gss-misc.o $(GSS_DEPLIBS) $(KRB5_BASE_DEPLIBS)
        $(CC_LINK) -o gss-client gss-client.o gss-misc.o $(GSS_LIBS) $(KRB5_BASE_LIBS)
 
 $(OUTPRE)gss-server.exe: $(OUTPRE)gss-server.obj $(OUTPRE)gss-misc.obj $(GLIB) $(KLIB)
-       link $(EXE_LINKOPTS) -out:$@ $** wsock32.lib
+       link $(EXE_LINKOPTS) -out:$@ $** ws2_32.lib
 
 $(OUTPRE)gss-client.exe: $(OUTPRE)gss-client.obj $(OUTPRE)gss-misc.obj $(GLIB) $(KLIB)
-       link $(EXE_LINKOPTS) -out:$@ $** wsock32.lib
+       link $(EXE_LINKOPTS) -out:$@ $** ws2_32.lib
 
 clean-unix::
        $(RM) gss-server gss-client

diff --git a/src/appl/gssftp/ftp/ChangeLog b/src/appl/gssftp/ftp/ChangeLog
index 51d11450a526fbe13709247414eaf735401cd30f..7953c778244ac8d8c7484e317d8e59740b808527 100644 (file)
--- a/src/appl/gssftp/ftp/ChangeLog
+++ b/src/appl/gssftp/ftp/ChangeLog
@@ -1,3 +1,8 @@
+2002-06-13  Ken Raeburn  <raeburn@mit.edu>
+
+       * Makefile.in ($(OUTPRE)ftp.exe): Use ws2_32.lib instead of
+       wsock32.lib.
+
 2002-04-11  Sam Hartman  <hartmans@mit.edu>
 
        * radix.c : Initialize c and D to suppress warning; code was already correct

diff --git a/src/appl/gssftp/ftp/Makefile.in b/src/appl/gssftp/ftp/Makefile.in
index cc5de00a2e376ed89cc762b32af2632f2a501de4..909dc265c9fc39fd7fa4ae823040371f323b27bb 100644 (file)
--- a/src/appl/gssftp/ftp/Makefile.in
+++ b/src/appl/gssftp/ftp/Makefile.in
@@ -37,7 +37,7 @@ ftp:  $(OBJS) $(GSS_DEPLIBS) $(KRB5_BASE_DEPLIBS)
        $(CC_LINK) -o ftp $(OBJS) $(GSS_LIBS) $(KRB4COMPAT_LIBS)
 
 $(OUTPRE)ftp.exe: $(OBJS) $(GLIB) $(KLIB)
-       link $(EXE_LINKOPTS) -out:$@ $** wsock32.lib advapi32.lib
+       link $(EXE_LINKOPTS) -out:$@ $** ws2_32.lib advapi32.lib
 
 clean-unix::
        $(RM) ftp

diff --git a/src/clients/klist/ChangeLog b/src/clients/klist/ChangeLog
index ac23aa3790f809b8ea3a8a685a0baa566cf20134..947e4492e53838f426ab6a8a3ae8089971384cf0 100644 (file)
--- a/src/clients/klist/ChangeLog
+++ b/src/clients/klist/ChangeLog
@@ -1,3 +1,8 @@
+2002-06-13  Ken Raeburn  <raeburn@mit.edu>
+
+       * Makefile.in ($(OUTPRE)klist.exe): Use ws2_32.lib instead of
+       wsock32.lib.
+
 2002-06-13  Jen Selby <jenselby@mit.edu>
 
        * klist.M: updated the manpage to show new ticket flags

diff --git a/src/clients/klist/Makefile.in b/src/clients/klist/Makefile.in
index 4e067eaa84ba5a65426fa752cd725e5b3b35b8c5..dda50236053785b1905d2936bd44a3ad26e9ddee 100644 (file)
--- a/src/clients/klist/Makefile.in
+++ b/src/clients/klist/Makefile.in
@@ -15,7 +15,7 @@ klist: klist.o $(KRB4COMPAT_DEPLIBS)
        $(CC_LINK) -o $@ klist.o $(KRB4COMPAT_LIBS)
 
 $(OUTPRE)klist.exe: $(OUTPRE)klist.obj $(BUILDTOP)\util\windows\$(OUTPRE)getopt.lib $(KLIB) $(CLIB)
-       link $(EXE_LINKOPTS) -out:$@ $** wsock32.lib
+       link $(EXE_LINKOPTS) -out:$@ $** ws2_32.lib
 
 clean-unix::
        $(RM) klist.o klist

diff --git a/src/krb524/ChangeLog b/src/krb524/ChangeLog
index 2ad2efa6f86fd10c2810a412603ceb89020f446d..02109c0b4e7e348d05cc03b0d873792a991ae1bf 100644 (file)
--- a/src/krb524/ChangeLog
+++ b/src/krb524/ChangeLog
@@ -1,3 +1,7 @@
+2002-06-13  Ken Raeburn  <raeburn@mit.edu>
+
+       * Makefile.in (WINLIBS): Use ws2_32.lib instead of wsock32.lib.
+
 2002-06-04  Ken Raeburn  <raeburn@mit.edu>
 
        * sendmsg.c: Include fake-addrinfo.h.  Don't include

diff --git a/src/krb524/Makefile.in b/src/krb524/Makefile.in
index 2916d4e5779e059b01f58535192b8ae9dd3b5efb..09e9c10a5bf9658bee6ec171400a9397e8ceebce 100644 (file)
--- a/src/krb524/Makefile.in
+++ b/src/krb524/Makefile.in
@@ -48,7 +48,7 @@ KRB524_LIB    = libkrb524.a
 K524LIB = $(OUTPRE)krb524.lib
 K524DEP = $(K524LIB)
 K524DEF = krb524.def
-WINLIBS = kernel32.lib wsock32.lib user32.lib shell32.lib oldnames.lib \
+WINLIBS = kernel32.lib ws2_32.lib user32.lib shell32.lib oldnames.lib \
        version.lib advapi32.lib gdi32.lib
 
 LOCALINCLUDES= $(KRB4_INCLUDES) -I. -I$(srcdir)

diff --git a/src/lib/ChangeLog b/src/lib/ChangeLog
index 852411e5d7e3abfee50d1238498f2581c356479e..4218a325f462198110f447ff3ccfb4c0ff1f0386 100644 (file)
--- a/src/lib/ChangeLog
+++ b/src/lib/ChangeLog
@@ -1,3 +1,7 @@
+2002-06-13  Ken Raeburn  <raeburn@mit.edu>
+
+       * Makefile.in (WINLIBS): Use ws2_32.lib instead of wsock32.lib.
+
 2001-11-16  Sam Hartman  <hartmans@mit.edu>
 
        * krb5_32.def: Export krb5_set_default_tgs_enctypes

diff --git a/src/lib/Makefile.in b/src/lib/Makefile.in
index db4bf7bf24cc846f07c9ae47cbc98b1a631fdcf5..b6a69b2554fff2ec5ca8a09c7e171ccbaf7eed17 100644 (file)
--- a/src/lib/Makefile.in
+++ b/src/lib/Makefile.in
@@ -51,7 +51,7 @@ K4DEF = krb4_32.def
 KRB5RC = krb5.rc
 VERSIONRC = $(BUILDTOP)\windows\version.rc
 
-WINLIBS = kernel32.lib wsock32.lib user32.lib shell32.lib oldnames.lib \
+WINLIBS = kernel32.lib ws2_32.lib user32.lib shell32.lib oldnames.lib \
        version.lib advapi32.lib gdi32.lib
 WINDLLFLAGS = $(DLL_LINKOPTS) -base:0x1c000000
 

diff --git a/src/windows/cns/ChangeLog b/src/windows/cns/ChangeLog
index 2cd2ee87aa65b565fc3e93c007681a766721c3d1..fe7d3ae743e2cf8ae4e68a4aa50e8b736eda564d 100644 (file)
--- a/src/windows/cns/ChangeLog
+++ b/src/windows/cns/ChangeLog
@@ -1,3 +1,7 @@
+2002-06-13  Ken Raeburn  <raeburn@mit.edu>
+
+       * Makefile.in (SYSLIBS): Use ws2_32.lib instead of wsock32.lib.
+
 2002-06-11  Danilo Almeida  <dalmeida@mit.edu>
 
        * cns.c: Do not use krb_get_notification_message() or

diff --git a/src/windows/cns/Makefile.in b/src/windows/cns/Makefile.in
index 095b46cba2cb9caa019b8919c970801acfbbf7cd..2a1aa60b2e0f60c1a5351fa1e90e7d487d0878ec 100644 (file)
--- a/src/windows/cns/Makefile.in
+++ b/src/windows/cns/Makefile.in
@@ -47,7 +47,7 @@ CVTRES = cvtres
 ##### Linker
 LINK    = link
 LIBS    = $(KLIB) $(CLIB) $(WLIB) ../lib/$(OUTPRE)libwin.lib
-SYSLIBS = kernel32.lib wsock32.lib user32.lib gdi32.lib advapi32.lib
+SYSLIBS = kernel32.lib ws2_32.lib user32.lib gdi32.lib advapi32.lib
 LFLAGS = /nologo $(LOPTS)
 
 all:: Makefile $(OUTPRE)$(NAME).exe

diff --git a/src/windows/gina/ChangeLog b/src/windows/gina/ChangeLog
index d2e378bbf8bf8642feb25200c64062b51b220104..e318692e37d133e50bc0dca72e7f52dc9deeaaf2 100644 (file)
--- a/src/windows/gina/ChangeLog
+++ b/src/windows/gina/ChangeLog
@@ -1,3 +1,7 @@
+2002-06-13  Ken Raeburn  <raeburn@mit.edu>
+
+       * Makefile.in (WINLIBS): Use ws2_32.lib instead of wsock32.lib.
+
 1999-12-03  Danilo Almeida  <dalmeida@mit.edu>
 
        * Makefile.in: Windows fix for updated win-pre.in.

diff --git a/src/windows/gina/Makefile.in b/src/windows/gina/Makefile.in
index 6cdda3d8ab44779ee422d6ed51b1abf11291ec93..3d630e12da47ec24d7eb7e73055dfd965c374938 100644 (file)
--- a/src/windows/gina/Makefile.in
+++ b/src/windows/gina/Makefile.in
@@ -7,7 +7,7 @@ OBJS=   $(OUTPRE)ginastub.$(OBJEXT)
 LOCALINCLUDES = -I$(BUILDTOP)\include
 
 WINLIBS = advapi32.lib comctl32.lib \
-       libc.lib kernel32.lib wsock32.lib user32.lib shell32.lib oldnames.lib
+       libc.lib kernel32.lib ws2_32.lib user32.lib shell32.lib oldnames.lib
 
 WINDLLFLAGS = /nodefaultlib /incremental:no /release \
        /nologo /base:0x1c000000 /dll $(LOPTS)

diff --git a/src/windows/gss/ChangeLog b/src/windows/gss/ChangeLog
index cefca162c2f54cdaf42bc5524ec37e62aa09969d..b426555a37ccad52f7b40dfc753d5bef60aa30c6 100644 (file)
--- a/src/windows/gss/ChangeLog
+++ b/src/windows/gss/ChangeLog
@@ -1,3 +1,7 @@
+2002-06-13  Ken Raeburn  <raeburn@mit.edu>
+
+       * Makefile.in (SYSLIBS): Use ws2_32.lib instead of wsock32.lib.
+
 2001-10-03  Ken Raeburn  <raeburn@mit.edu>
 
        * gss.c, gss.h: Don't declare functions FAR any more.

diff --git a/src/windows/gss/Makefile.in b/src/windows/gss/Makefile.in
index 306f7c79a503ca6e54adbf42aaf0e075270b875a..b545599aeb45db83e5d3d532a7253cbf909e2459 100644 (file)
--- a/src/windows/gss/Makefile.in
+++ b/src/windows/gss/Makefile.in
@@ -17,7 +17,7 @@ RCFLAGS       = $(RFLAGS) -D_WIN32 -DGSS_APP
 ##### Linker
 LINK   = link
 LIBS   = $(GLIB) $(CLIB) $(WLIB)
-SYSLIBS        = kernel32.lib wsock32.lib user32.lib gdi32.lib comdlg32.lib
+SYSLIBS        = kernel32.lib ws2_32.lib user32.lib gdi32.lib comdlg32.lib
 LFLAGS = /nologo $(LOPTS)
 
 all:: Makefile $(OUTPRE)gss.exe

diff --git a/src/windows/wintel/ChangeLog b/src/windows/wintel/ChangeLog
index cd37a3f9d019d1ae2e85dadc825c6fe863bb779c..a741cfd5479cd4023d68deea4b4ec269d828e318 100644 (file)
--- a/src/windows/wintel/ChangeLog
+++ b/src/windows/wintel/ChangeLog
@@ -1,3 +1,7 @@
+2002-06-13  Ken Raeburn  <raeburn@mit.edu>
+
+       * Makefile.in (SYSLIBS): Use ws2_32.lib instead of wsock32.lib.
+
 2001-10-10  Danilo Almeida  <dalmeida@mit.edu>
 
        * intern.c (ScreenInsChar): Return BOOL.

diff --git a/src/windows/wintel/Makefile.in b/src/windows/wintel/Makefile.in
index 56cddb188dc78145a6cc9bac095039b777d7cb60..f1cdbc26906b3e4bcdf24d6519c2adcbfab58dca 100644 (file)
--- a/src/windows/wintel/Makefile.in
+++ b/src/windows/wintel/Makefile.in
@@ -27,7 +27,7 @@ RCFLAGS       = $(RFLAGS) -D_WIN32 -DTELNET_APP
 ##### Linker
 LINK   = link
 LIBS   = $(KLIB) $(CLIB) $(WLIB)
-SYSLIBS        = kernel32.lib wsock32.lib user32.lib gdi32.lib comdlg32.lib
+SYSLIBS        = kernel32.lib ws2_32.lib user32.lib gdi32.lib comdlg32.lib
 LFLAGS = /nologo $(LOPTS)
 
 all:: Makefile $(OUTPRE)telnet.exe