* THANKS: Changes from stable branch.

* configure.ac: Check for ctermid().  From Werner on stable
branch.

* configure.ac (GPGKEYS_LDAP,GPGKEYS_HKP): Add $EXEEXT.  From
Werner on stable branch.

* configure.ac (try_gettext): Remove special case for cygwin.
This removes all the DOS specific macros and let Cygwin work like
a real OS.  Needs a couple of changes elsewhere but after all,
GnuPG presents itself much more like a Posix program and can be
used in a full Cygwin environment; e.g. used along with mutt.
Changes suggested by Volker Quetschke.  From Werner on stable
branch.

* acinclude.m4 (GNUPG_SYS_NM_PARSE): Allow for underscore in test
symbols.  Useful for Cygwin builds.
(GNUPG_SYS_SYMBOL_UNDERSCORE): Don't hardwire to yes for Cygwin.
From Werner on stable branch.

* README: Add an installation note for Darwin 6.1.  From Werner on
stable branch.

5 files changed, 48 insertions, 17 deletions

diff --git a/ChangeLog b/ChangeLog
index 2bfda263f..d53929ae8 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,29 @@
+2002-11-13  David Shaw  <[email protected]>
+
+	* THANKS: Changes from stable branch.
+
+	* configure.ac: Check for ctermid().  From Werner on stable
+	branch.
+
+	* configure.ac (GPGKEYS_LDAP,GPGKEYS_HKP): Add $EXEEXT.  From
+	Werner on stable branch.
+
+	* configure.ac (try_gettext): Remove special case for cygwin.
+	This removes all the DOS specific macros and let Cygwin work like
+	a real OS.  Needs a couple of changes elsewhere but after all,
+	GnuPG presents itself much more like a Posix program and can be
+	used in a full Cygwin environment; e.g. used along with mutt.
+	Changes suggested by Volker Quetschke.  From Werner on stable
+	branch.
+
+	* acinclude.m4 (GNUPG_SYS_NM_PARSE): Allow for underscore in test
+	symbols.  Useful for Cygwin builds.
+	(GNUPG_SYS_SYMBOL_UNDERSCORE): Don't hardwire to yes for Cygwin.
+	From Werner on stable branch.
+
+	* README: Add an installation note for Darwin 6.1.  From Werner on
+	stable branch.
+
 2002-11-12  Werner Koch  <[email protected]>
 
 	Released 1.3.1
diff --git a/README b/README
index da477639d..a6640ed7d 100644
--- a/README
+++ b/README
@@ -1,7 +1,7 @@
 
 		    GnuPG - The GNU Privacy Guard
 		   -------------------------------
-			    Version 1.3
+			   Version 1.3.2
 
     Copyright 1998, 1999, 2000, 2001, 2002 Free Software Foundation, Inc.
 
@@ -563,23 +563,25 @@
     Specific problems on some machines
     ----------------------------------
 
-    * IBM RS/6000 running AIX:
+    * Apple Darwin 6.1:
 
-	Due to a change in gcc (since version 2.8) the MPI stuff may
-	not build. In this case try to run configure using:
-	    CFLAGS="-g -O2 -mcpu=powerpc" ./configure
+        ./configure --with-libiconv-prefix=/sw
 
     * Compaq C V6.2 for alpha:
 
         You may want to use the option "-msg-disable ptrmismatch1"
         to get rid of the sign/unsigned char mismatch warnings.
 
+    * IBM RS/6000 running AIX:
+
+	Due to a change in gcc (since version 2.8) the MPI stuff may
+	not build. In this case try to run configure using:
+	    CFLAGS="-g -O2 -mcpu=powerpc" ./configure
+
     * SVR4.2 (ESIX V4.2 cc)
 
         Due to problems with the ESIX as, you probably want to do
             CFLAGS="-O -K pentium" ./configure --disable-asm
-        Reported by Reinhard Wobst.
-
 
 
     The Random Device
diff --git a/THANKS b/THANKS
index e54cf65bd..3ae53e89d 100644
--- a/THANKS
+++ b/THANKS
@@ -177,6 +177,7 @@ Sebastian Klemke           [email protected]
 Serge Munhoven		   [email protected]
 SL Baur 		   [email protected]
 Stefan Bellon              [email protected]
+Dr.Stefan.Dalibor          [email protected]
 Stefan Karrmann 	   [email protected]
 Stefan Keller		   [email protected]
 Steffen Ullrich 	   [email protected]
@@ -186,6 +187,7 @@ Steven Murdoch             [email protected]
 Susanne Schultz 	   [email protected]
 Ted Cabeen		   [email protected]
 Thiago Jung Bauermann	   [email protected]
+Thijmen Klok               [email protected]
 Thomas Roessler 	   [email protected]
 Tim Mooney		   [email protected]
 Timo Schulz                [email protected]
@@ -200,6 +202,7 @@ Thomas Mikkelsen	   [email protected]
 Ulf M�ller		   [email protected]
 Urko Lusa		   [email protected]
 Vincent P. Broman          [email protected]
+Volker Quetschke           [email protected]
 W Lewis                    [email protected]
 Walter Hofmann		   [email protected]
 Walter Koch		   [email protected]
diff --git a/acinclude.m4 b/acinclude.m4
index 4a2c91672..63704e4e4 100644
--- a/acinclude.m4
+++ b/acinclude.m4
@@ -570,8 +570,8 @@ changequote([,])dnl
     fi
 
     # Make sure that we snagged all the symbols we need.
-    if egrep ' nm_test_var$' "$ac_nlist" >/dev/null; then
-      if egrep ' nm_test_func$' "$ac_nlist" >/dev/null; then
+    if egrep ' _?nm_test_var$' "$ac_nlist" >/dev/null; then
+      if egrep ' _?nm_test_func$' "$ac_nlist" >/dev/null; then
         cat <<EOF > conftest.c
 #ifdef __cplusplus
 extern "C" {
@@ -579,7 +579,7 @@ extern "C" {
 
 EOF
         # Now generate the symbol file.
-        sed 's/^.* \(.*\)$/extern char \1;/' < "$ac_nlist" >> conftest.c
+        sed 's/^.* _\?\(.*\)$/extern char \1;/' < "$ac_nlist" >> conftest.c
 
         cat <<EOF >> conftest.c
 #if defined (__STDC__) && __STDC__
@@ -601,7 +601,7 @@ dld_preloaded_symbols[] =
 changequote([,])dnl
 {
 EOF
-        sed 's/^\(.*\) \(.*\)$/  {"\1", (__ptr_t) \&\2},/' < "$ac_nlist" >> conftest.c
+        sed 's/^_\?\(.*\) _\?\(.*\)$/  {"\1", (__ptr_t) \&\2},/' < "$ac_nlist" >> conftest.c
         cat <<\EOF >> conftest.c
   {0, (__ptr_t) 0}
 };
@@ -661,7 +661,7 @@ AC_CHECK_TOOL(AS, as, false)
 AC_DEFUN(GNUPG_SYS_SYMBOL_UNDERSCORE,
 [tmp_do_check="no"
 case "${target}" in
-    i386-emx-os2 | i[3456]86-pc-os2*emx | i386-pc-msdosdjgpp | *-*-cygwin)
+    i386-emx-os2 | i[3456]86-pc-os2*emx | i386-pc-msdosdjgpp)
         ac_cv_sys_symbol_underscore=yes
         ;;
     *)
diff --git a/configure.ac b/configure.ac
index 9f128c7c1..c58140e56 100644
--- a/configure.ac
+++ b/configure.ac
@@ -201,7 +201,7 @@ if test "$use_exec" = yes ; then
     AC_MSG_RESULT($try_hkp)
 
     if test "$try_hkp" = yes ; then
-      AC_SUBST(GPGKEYS_HKP,"gpgkeys_hkp")
+      AC_SUBST(GPGKEYS_HKP,"gpgkeys_hkp$EXEEXT")
     fi
 
     AC_MSG_CHECKING([whether email keyserver support is requested])
@@ -274,7 +274,7 @@ MPI_OPT_FLAGS=""
 
 try_gettext=yes
 case "${target}" in
-    *-*-mingw32*|*-*-cygwin*)
+    *-*-mingw32*)
         # special stuff for Windoze NT
         ac_cv_have_dev_random=no
         AC_DEFINE(USE_ONLY_8DOT3,1,
@@ -384,7 +384,7 @@ if test "$try_ldap" = yes ; then
     if test "$gnupg_cv_func_ldap_init" = yes || \
   	test "$gnupg_cv_func_ldaplber_init" = yes ; then
        LDAPLIBS=$MY_LDAPLIBS
-       GPGKEYS_LDAP="gpgkeys_ldap"
+       GPGKEYS_LDAP="gpgkeys_ldap$EXEEXT"
 
        AC_MSG_CHECKING([whether LDAP supports ldap_get_option])
 
@@ -463,7 +463,7 @@ case "${target}" in
         PRINTABLE_OS_NAME="MingW32"
         ;;
     *-*-cygwin*)
-        PRINTABLE_OS_NAME="Cygwin32"
+        PRINTABLE_OS_NAME="Cygwin"
         ;;
     i?86-emx-os2 | i?86-*-os2*emx )
         PRINTABLE_OS_NAME="OS/2"
@@ -577,7 +577,7 @@ AC_FUNC_FSEEKO
 AC_FUNC_VPRINTF
 AC_FUNC_FORK
 AC_CHECK_FUNCS(strerror stpcpy strsep strlwr tcgetattr strtoul mmap)
-AC_CHECK_FUNCS(strcasecmp strncasecmp)
+AC_CHECK_FUNCS(strcasecmp strncasecmp ctermid)
 AC_CHECK_FUNCS(memmove gettimeofday getrusage setrlimit clock_gettime)
 AC_CHECK_FUNCS(atexit raise getpagesize strftime nl_langinfo setlocale)
 AC_CHECK_FUNCS(waitpid wait4 sigaction sigprocmask rand pipe stat)