* THANKS: Updates from stable.

* configure.ac: Include wsock32 in W32LIBS.  This is different from
NETLIBS so we don't need to force other platforms to pull in the netlibs
when they aren't actually needed.

* NEWS: Note portability changes.

4 files changed, 20 insertions, 4 deletions

diff --git a/ChangeLog b/ChangeLog
index 9e326d43c..537b34014 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,13 @@
+2003-07-10  David Shaw  <[email protected]>
+
+	* THANKS: Updates from stable.
+
+	* configure.ac: Include wsock32 in W32LIBS.  This is different
+	from NETLIBS so we don't need to force other platforms to pull in
+	the netlibs when they aren't actually needed.
+
+	* NEWS: Note portability changes.
+
 2003-06-03  David Shaw  <[email protected]>
 
 	* configure.ac: Define SAFE_VERSION so that RISCOS can override it
diff --git a/NEWS b/NEWS
index 7fa8df8f8..fdc717144 100644
--- a/NEWS
+++ b/NEWS
@@ -1,14 +1,16 @@
 Noteworthy changes in version 1.3.3 (unreleased)
 ------------------------------------------------
 
+    * A number of portability changes to make building GnuPG on
+      less-common platforms easier.
 
 Noteworthy changes in version 1.3.2 (2003-05-27)
 ------------------------------------------------
 
     * New "--gnupg" option (set by default) that disables --openpgp,
       and the various --pgpX emulation options.  This replaces
-      --no-openpgp, and --no-pgpX, and also means that GnuPG has now
-      grown a --gnupg option to make GnuPG act like GnuPG.
+      --no-openpgp, and --no-pgpX, and also means that GnuPG has
+      finally grown a --gnupg option to make GnuPG act like GnuPG.
 
     * A bug in key validation has been fixed.  This bug only affects
       keys with more than one user ID (photo IDs do not count here),
diff --git a/THANKS b/THANKS
index 3ae53e89d..2d55b7d08 100644
--- a/THANKS
+++ b/THANKS
@@ -66,13 +66,13 @@ Frank Tobin		   [email protected]
 Gabriel Rosenkoetter	   [email protected]
 Ga�l Qu�ri		   [email protected]
 Gene Carter                [email protected]
+Geoff Keating		   [email protected]
 Georg Schwarz              [email protected]
 Giampaolo Tomassoni        [email protected]
 Gilbert Fernandes          [email protected]
 Greg Louis		   [email protected]
 Greg Troxel		   [email protected]
 Gregory Steuck		   [email protected]
-Geoff Keating		   [email protected]
 Harald Denker		   [email protected]
 Holger Baust               [email protected]
 Hendrik Buschkamp	   [email protected]
@@ -103,6 +103,8 @@ John A. Martin		   [email protected]
 Johnny Teve�en		   [email protected]
 J�rg Schilling		   [email protected]
 Jos Backus		   [email protected]
+Joseph Walton              [email protected]
+Juan F. Codagnone          [email protected]
 Jun Kuriyama		   [email protected]
 Kahil D. Jallad            [email protected]
 Karl Fogel		   [email protected]
diff --git a/configure.ac b/configure.ac
index c4d0406ea..5ee47cea7 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1026,13 +1026,15 @@ GNUPG_CHECK_GNUMAKE
 # mysterious reasons - the final link step should bail out. 
 case "${target}" in
     *-*-mingw32*)
-        NETLIBS="$NETLIBS -lwsock32"
+dnl      NETLIBS="$NETLIBS -lwsock32"
+	W32LIBS="-lwsock32"
         ;;
     *)
        ;;
 esac
 
 AC_SUBST(NETLIBS)
+AC_SUBST(W32LIBS)
 
 if test "$GCC" = yes; then
     if test "$USE_MAINTAINER_MODE" = "yes"; then