diff options
| -rw-r--r-- | ChangeLog | 9 | ||||
| -rw-r--r-- | NEWS | 19 | ||||
| -rw-r--r-- | THANKS | 1 | ||||
| -rw-r--r-- | configure.ac | 40 |
4 files changed, 56 insertions, 13 deletions
@@ -1,3 +1,12 @@ +2002-09-24 David Shaw <dshaw@jabberwocky.com> + + * THANKS: Remove duplicate. + + * NEWS: Bring in cosmetic changes from stable branch. + + * configure.ac: Figure out whether the LDAP library supports + ldap_get_option, ld_errno, or neither. + 2002-09-19 David Shaw <dshaw@jabberwocky.com> * configure.ac: Try linking LDAP as just -lldap as it seems very @@ -1,13 +1,14 @@ Noteworthy changes in version 1.3 ------------------------------------------------- -Noteworthy changes in version 1.1.93 -------------------------------------------------- - - Noteworthy changes in version 1.1.92 (2002-09-11) ------------------------------------------------- + * [IMPORTANT] The default configuration file is now + ~/.gnupg/gpg.conf. If an old ~/.gnupg/options is found it will + still be used. This change is required to have a more + consistent naming scheme with forthcoming tools. + * The use of MDCs have increased. A MDC will be used if the recipients directly request it, if the recipients have AES, AES192, AES256, or TWOFISH in their cipher preferences, or if @@ -33,12 +34,6 @@ Noteworthy changes in version 1.1.92 (2002-09-11) extension specified with --load-extension are checked, along with their enclosing directories. - * IMPORTANT: - The default configuration file is now ~/.gnupg/gpg.conf. If an - old ~/.gnupg/options is found it will still be used. This - change is required to have a more consistent naming scheme with - forthcoming tools. - * The configure option --with-static-rnd=auto allows to build gpg with all available entropy gathering modules included. At runtime the best usable one will be selected from the list @@ -49,8 +44,8 @@ Noteworthy changes in version 1.1.92 (2002-09-11) it can still be overridden by the --charset option. Using the option -vvv shows the used character set. - * --emulate-checksum-bug and --emulate-3des-s2k-bug have been - removed. + * [REMOVED] --emulate-checksum-bug and --emulate-3des-s2k-bug have + been removed. Noteworthy changes in version 1.1.91 (2002-08-04) @@ -208,7 +208,6 @@ Wim Vandeputte bunbun@reptile.rug.ac.be Winona Brown win@huh.org Yosiaki IIDA iida@ring.gr.jp Yoshihiro Kajiki kajiki@ylug.org - disastry@saiknes.lv nbecker@hns.com Thanks to the German Unix User Group for sponsoring this project, diff --git a/configure.ac b/configure.ac index 26e5250a8..f48e1b3ca 100644 --- a/configure.ac +++ b/configure.ac @@ -383,6 +383,46 @@ if test "$try_ldap" = yes ; then if test "$gnupg_cv_func_ldap_init" = yes || \ test "$gnupg_cv_func_ldaplber_init" = yes ; then GPGKEYS_LDAP="gpgkeys_ldap" + + AC_MSG_CHECKING([whether LDAP supports ldap_get_option]) + + if test "$gnupg_cv_func_ldap_init" = yes ; then + AC_TRY_LINK([#include <ldap.h>], + [ldap_get_option((void *)0,0,(void *)0);], + [gnupg_cv_func_ldap_get_option=yes], + [gnupg_cv_func_ldap_get_option=no]) + else + AC_TRY_LINK([#include <lber.h> +#include <ldap.h>],[ldap_get_option((void *)0,0,(void *)0);], + [gnupg_cv_func_ldap_get_option=yes], + [gnupg_cv_func_ldap_get_option=no]) + fi + + AC_MSG_RESULT([$gnupg_cv_func_ldap_get_option]) + + if test "$gnupg_cv_func_ldap_get_option" = yes ; then + AC_DEFINE(HAVE_LDAP_GET_OPTION,1,[Define if the LDAP library has ldap_get_option]) + else + AC_MSG_CHECKING([whether LDAP supports ld_errno]) + + if test "$gnupg_cv_func_ldap_init" = yes ; then + AC_TRY_COMPILE([#include <ldap.h>], + [LDAP *ldap; ldap->ld_errno;], + [gnupg_cv_func_ldap_ld_errno=yes], + [gnupg_cv_func_ldap_ld_errno=no]) + else + AC_TRY_LINK([#include <lber.h> +#include <ldap.h>],[LDAP *ldap; ldap->ld_errno;], + [gnupg_cv_func_ldap_ld_errno=yes], + [gnupg_cv_func_ldap_ld_errno=no]) + fi + + AC_MSG_RESULT([$gnupg_cv_func_ldap_ld_errno]) + + if test "$gnupg_cv_func_ldap_ld_errno" = yes ; then + AC_DEFINE(HAVE_LDAP_LD_ERRNO,1,[Define if the LDAP library supports ld_errno]) + fi + fi fi LIBS=$_ldap_save_libs |