mirror of
git://git.gnupg.org/gnupg.git
synced 2024-05-30 22:08:02 +02:00
Always require libksba.
-- The extra test for libksba and possible trouble building GnuPG without ksba is not anymore worth the trouble.
This commit is contained in:
parent
59b77f9ea7
commit
14cfd45d38
26
configure.ac
26
configure.ac
|
@ -1,6 +1,6 @@
|
||||||
# configure.ac - for GnuPG 2.1
|
# configure.ac - for GnuPG 2.1
|
||||||
# Copyright (C) 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007,
|
# Copyright (C) 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007,
|
||||||
# 2008, 2009, 2010, 2011 Free Software Foundation, Inc.
|
# 2008, 2009, 2010, 2011, 2012 Free Software Foundation, Inc.
|
||||||
#
|
#
|
||||||
# This file is part of GnuPG.
|
# This file is part of GnuPG.
|
||||||
#
|
#
|
||||||
|
@ -1506,11 +1506,6 @@ if test "$have_adns" = "yes"; then
|
||||||
fi
|
fi
|
||||||
|
|
||||||
|
|
||||||
if test $have_ksba = no; then
|
|
||||||
build_gpgsm=no
|
|
||||||
build_scdaemon=no
|
|
||||||
fi
|
|
||||||
|
|
||||||
build_scdaemon_extra=""
|
build_scdaemon_extra=""
|
||||||
if test "$build_scdaemon" = "yes"; then
|
if test "$build_scdaemon" = "yes"; then
|
||||||
if test $have_libusb = no; then
|
if test $have_libusb = no; then
|
||||||
|
@ -1592,18 +1587,9 @@ if test "$have_libgcrypt" = "no"; then
|
||||||
***
|
***
|
||||||
*** You need libgcrypt to build this program.
|
*** You need libgcrypt to build this program.
|
||||||
** This library is for example available at
|
** This library is for example available at
|
||||||
*** ftp://ftp.gnupg.org/gcrypt/alpha/libgcrypt/
|
*** ftp://ftp.gnupg.org/gcrypt/libgcrypt/
|
||||||
*** (at least version $NEED_LIBGCRYPT_VERSION using API $NEED_LIBGCRYPT_API is required.)
|
*** (at least version $NEED_LIBGCRYPT_VERSION (API $NEED_LIBGCRYPT_API) is required.)
|
||||||
***]])
|
***]])
|
||||||
dnl elif test "$gnupg_cv_gcry_kdf_derive" = no; then
|
|
||||||
dnl die=yes
|
|
||||||
dnl AC_MSG_NOTICE([[
|
|
||||||
dnl ***
|
|
||||||
dnl *** Libgcrypt 1.5.0 has not yet been released and thus the API
|
|
||||||
dnl *** is a bit in a flux. Your version misses the function
|
|
||||||
dnl *** gcry_kdf_derive
|
|
||||||
dnl *** You need to install a newer Libgcrypt version.
|
|
||||||
dnl #***]])
|
|
||||||
fi
|
fi
|
||||||
if test "$have_libassuan" = "no"; then
|
if test "$have_libassuan" = "no"; then
|
||||||
die=yes
|
die=yes
|
||||||
|
@ -1616,6 +1602,7 @@ if test "$have_libassuan" = "no"; then
|
||||||
***]])
|
***]])
|
||||||
fi
|
fi
|
||||||
if test "$have_ksba" = "no"; then
|
if test "$have_ksba" = "no"; then
|
||||||
|
die=yes
|
||||||
AC_MSG_NOTICE([[
|
AC_MSG_NOTICE([[
|
||||||
***
|
***
|
||||||
*** You need libksba to build this program.
|
*** You need libksba to build this program.
|
||||||
|
@ -1643,16 +1630,17 @@ if test "$gnupg_have_ldap" = "no"; then
|
||||||
fi
|
fi
|
||||||
fi
|
fi
|
||||||
if test "$have_npth" = "no"; then
|
if test "$have_npth" = "no"; then
|
||||||
|
die=yes
|
||||||
AC_MSG_NOTICE([[
|
AC_MSG_NOTICE([[
|
||||||
***
|
***
|
||||||
*** It is now required to build with support for the
|
*** It is now required to build with support for the
|
||||||
*** New Portable Threads Library (NPth). Please install this
|
*** New Portable Threads Library (nPth). Please install this
|
||||||
*** library first. The library is for example available at
|
*** library first. The library is for example available at
|
||||||
*** ftp://ftp.gnupg.org/gcrypt/npth/
|
*** ftp://ftp.gnupg.org/gcrypt/npth/
|
||||||
|
*** (at least version $NEED_NPTH_VERSION (API $NEED_NPTH_API) is requi
|
||||||
*** On a Debian GNU/Linux system you can install it using
|
*** On a Debian GNU/Linux system you can install it using
|
||||||
*** apt-get install libnpth-dev
|
*** apt-get install libnpth-dev
|
||||||
***]])
|
***]])
|
||||||
die=yes
|
|
||||||
fi
|
fi
|
||||||
|
|
||||||
if test "$die" = "yes"; then
|
if test "$die" = "yes"; then
|
||||||
|
|
Loading…
Reference in New Issue
Block a user