From f717f9661a7e2b2e388964b47be2b466c5f8cc82 Mon Sep 17 00:00:00 2001 From: Werner Koch Date: Mon, 17 Dec 2007 10:49:08 +0000 Subject: [PATCH] Fixd a W32 problems with ldaps. --- ChangeLog | 4 ++++ NEWS | 7 ++++++- configure.ac | 15 ++++++++++++--- m4/ChangeLog | 4 ++++ m4/ldap.m4 | 5 ++++- 5 files changed, 30 insertions(+), 5 deletions(-) diff --git a/ChangeLog b/ChangeLog index b7382f631..c60a563b3 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,7 @@ +2007-12-17 Werner Koch + + * configure.ac: Ass special treatment for HAVE_LDAP_START_TLS_SA. + 2007-12-14 Werner Koch Released 1.4.8rc1. diff --git a/NEWS b/NEWS index 7cffe007d..bb5eec08e 100644 --- a/NEWS +++ b/NEWS @@ -1,6 +1,11 @@ Noteworthy changes in version 1.4.8 (unreleased) ------------------------------------------------ + ******************************************* + * A decade of GnuPG: g10-0.0.0.tar.gz was * + * released exactly 10 years ago. * + ******************************************* + * Changed the license to GPLv3. * Improved detection of keyrings specified multiple times. @@ -1971,7 +1976,7 @@ Noteworthy changes in version 0.2.3 Copyright 1998, 1999, 2000, 2001, 2002, 2003, 2004, - 2005, 2006 Free Software Foundation, Inc. + 2005, 2006, 2007 Free Software Foundation, Inc. This file is free software; as a special exception the author gives unlimited permission to copy and/or distribute it, with or without diff --git a/configure.ac b/configure.ac index 6f5d0c7ea..7c1df1d3c 100644 --- a/configure.ac +++ b/configure.ac @@ -24,9 +24,9 @@ min_automake_version="1.9.3" # Remember to change the version number immediately *after* a release. # Set my_issvn to "yes" for non-released code. Remember to run an -# "svn up" and "autogen.sh" right before creating a distribution. -m4_define([my_version], [1.4.8rc2]) -m4_define([my_issvn], [no]) +# "svn up" and "autogen.sh --force" right before creating a distribution. +m4_define([my_version], [1.4.8]) +m4_define([my_issvn], [yes]) m4_define([svn_revision], m4_esyscmd([echo -n $((svn info 2>/dev/null \ || echo 'Revision: 0')|sed -n '/^Revision:/ s/[^0-9]//gp'|head -1)])) @@ -481,6 +481,15 @@ is intended for making fat binary builds on OS X. */ # endif #endif +/* Hack used for W32: ldap.m4 also tests for the ASCII version of + ldap_start_tls_s because that is the actual symbol used in the + library. winldap.h redefines it to our commonly used value, + thus we define our usual macro here. */ +#ifdef HAVE_LDAP_START_TLS_SA +# ifndef HAVE_LDAP_START_TLS_S +# define HAVE_LDAP_START_TLS_S 1 +# endif +#endif /* This is the major version number of GnuPG so that source included files can test for this. */ diff --git a/m4/ChangeLog b/m4/ChangeLog index 95466dc8d..680322064 100644 --- a/m4/ChangeLog +++ b/m4/ChangeLog @@ -1,3 +1,7 @@ +2007-12-17 Werner Koch + + * ldap.m4: Test for ldap_start_tls_sA. + 2007-10-23 gettextize * gettext.m4: Upgrade to gettext-0.16.1. diff --git a/m4/ldap.m4 b/m4/ldap.m4 index 95249ac3e..053aa51d2 100644 --- a/m4/ldap.m4 +++ b/m4/ldap.m4 @@ -67,7 +67,10 @@ if test x$_ldap_with != xno ; then LDAPLIBS="$LDAP_LDFLAGS $MY_LDAPLIBS" GPGKEYS_LDAP="gpgkeys_ldap$EXEEXT" - AC_CHECK_FUNCS(ldap_get_option ldap_set_option ldap_start_tls_s) + AC_CHECK_FUNCS(ldap_get_option ldap_set_option) + # The extra test for ldap_start_tls_sA is for W32 because + # that is the actual function in the library. + AC_CHECK_FUNCS(ldap_start_tls_s ldap_start_tls_sA) if test "$ac_cv_func_ldap_get_option" != yes ; then AC_MSG_CHECKING([whether LDAP supports ld_errno])