security-and-privacy/gnupg
security-and-privacy/gnupg
1
0
Fork 0
mirror of git://git.gnupg.org/gnupg.git synced 2024-12-22 10:19:57 +01:00
Code Activity

Fix for latest libgpg-error.

Browse Source
This commit is contained in:
Werner Koch 2010-03-09 12:50:48 +00:00
parent 6216d33e8c
commit ffe6dc9957
2 changed files with 31 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
ChangeLog
View File

@ -1,3 +1,8 @@
2010-03-09 Werner Koch <wk@g10code.com>
* configure.ac: Add option --disable-ccid-driver.
(AH_BOTTOM): Define GPG_ERR_ENABLE_GETTEXT_MACROS.
2010-02-26 Werner Koch <wk@g10code.com> 2010-02-26 Werner Koch <wk@g10code.com>
* gl/mkdtemp.c (__set_errno) [W32CE]: Use gpg_err_set_errno. * gl/mkdtemp.c (__set_errno) [W32CE]: Use gpg_err_set_errno.

24
configure.ac
View File

@ -74,7 +74,7 @@ have_adns=no
use_bzip2=yes use_bzip2=yes
use_exec=yes use_exec=yes
disable_keyserver_path=no disable_keyserver_path=no
use_ccid_driver=yes
GNUPG_BUILD_PROGRAM(gpg, yes) GNUPG_BUILD_PROGRAM(gpg, yes)
GNUPG_BUILD_PROGRAM(gpgsm, yes) GNUPG_BUILD_PROGRAM(gpgsm, yes)
@ -299,6 +299,19 @@ AC_ARG_WITH(capabilities,
[use_capabilities="$withval"],[use_capabilities=no]) [use_capabilities="$withval"],[use_capabilities=no])
AC_MSG_RESULT($use_capabilities) AC_MSG_RESULT($use_capabilities)
#
# Allow disabling of internal CCID support.
# It is defined only after we confirm the library is available later
#
AC_MSG_CHECKING([whether to enable the internal CCID driver])
AC_ARG_ENABLE(ccid-driver,
AC_HELP_STRING([--disable-ccid-driver],
[disable the internal CCID driver]),
use_ccid_driver=$enableval)
AC_MSG_RESULT($use_ccid_driver)
# #
# To avoid double inclusion of config.h which might happen at some # To avoid double inclusion of config.h which might happen at some
# places, we add the usual double inclusion protection at the top of # places, we add the usual double inclusion protection at the top of
@ -428,6 +441,9 @@ AH_BOTTOM([
#define _ESTREAM_PRINTF_FREE gcry_free #define _ESTREAM_PRINTF_FREE gcry_free
#define _ESTREAM_PRINTF_EXTRA_INCLUDE "util.h" #define _ESTREAM_PRINTF_EXTRA_INCLUDE "util.h"
/* Under Windows we use the gettext code from libgpg-error. */
#define GPG_ERR_ENABLE_GETTEXT_MACROS
#endif /*GNUPG_CONFIG_H_INCLUDED*/ #endif /*GNUPG_CONFIG_H_INCLUDED*/
]) ])
@ -636,14 +652,16 @@ AM_PATH_KSBA("$NEED_KSBA_API:$NEED_KSBA_VERSION",have_ksba=yes,have_ksba=no)
# libusb allows us to use the integrated CCID smartcard reader driver. # libusb allows us to use the integrated CCID smartcard reader driver.
# #
# FiXME: Use GNUPG_CHECK_LIBUSB and modify to use separate AC_SUBSTs. # FiXME: Use GNUPG_CHECK_LIBUSB and modify to use separate AC_SUBSTs.
AC_CHECK_LIB(usb, usb_bulk_write, if test "$use_ccid_driver" = yes ; then
AC_CHECK_LIB(usb, usb_bulk_write,
[ LIBUSB_LIBS="$LIBUSB_LIBS -lusb" [ LIBUSB_LIBS="$LIBUSB_LIBS -lusb"
AC_DEFINE(HAVE_LIBUSB,1, AC_DEFINE(HAVE_LIBUSB,1,
[defined if libusb is available]) [defined if libusb is available])
have_libusb=yes have_libusb=yes
]) ])
AC_CHECK_FUNCS(usb_create_match)
fi
AC_SUBST(LIBUSB_LIBS) AC_SUBST(LIBUSB_LIBS)
AC_CHECK_FUNCS(usb_create_match)
# #
# Check wether it is necessary to link against libdl. # Check wether it is necessary to link against libdl.