diff options
| author | Nikos Mavrogiannopoulos <nmav@gnutls.org> | 2011-04-13 19:58:36 +0200 |
|---|---|---|
| committer | Nikos Mavrogiannopoulos <nmav@gnutls.org> | 2011-04-13 19:58:36 +0200 |
| commit | 2971a436f8422ab99d65f2415d7c6b71f999c05b (patch) | |
| tree | e273dbe9d2400f47733edbb47885e68be738bdef /m4 | |
| parent | 1726cb4569daef037797d9e85e18a09a38024dd4 (diff) | |
| download | gnutls-2971a436f8422ab99d65f2415d7c6b71f999c05b.tar.gz | |
Reorganization in configure file.
Pakchois is not longer checked for being present. The included version
is always used.
Diffstat (limited to 'm4')
| -rw-r--r-- | m4/hooks.m4 | 29 |
1 files changed, 0 insertions, 29 deletions
diff --git a/m4/hooks.m4 b/m4/hooks.m4 index 76a366cb94..3c58f26118 100644 --- a/m4/hooks.m4 +++ b/m4/hooks.m4 @@ -127,35 +127,6 @@ fi GNUTLS_REQUIRES_PRIVATE="Requires.private: libtasn1" fi - AC_ARG_WITH(included-pakchois, - AS_HELP_STRING([--with-included-pakchois], [use the included pakchois]), - included_pakchois=$withval, - included_pakchois=no) - if test "$included_pakchois" = "no"; then - AC_LIB_HAVE_LINKFLAGS(pakchois,, [#include <pakchois/pakchois.h>], - [pakchois_module_load(0,0);]) - if test "$ac_cv_pakchois" != yes; then - included_pakchois=yes - AC_MSG_WARN([[ - *** - *** Pakchois was not found. Will use the included one. - ]]) - fi - fi - #not other option for now. The released pakchois cannot open an arbitrary PKCS11 module, - #and the author is reluctant to add such feature. - included_pakchois=yes - AC_MSG_CHECKING([whether to use the included pakchois]) - AC_MSG_RESULT($included_pakchois) - AM_CONDITIONAL(ENABLE_LOCAL_PAKCHOIS, test "$included_pakchois" = "yes") - if test "$included_pakchois" = "yes";then - AC_CHECK_LIB(pthread, pthread_mutex_lock,, - [AC_MSG_WARN([could not find pthread_mutex_lock])]) - AC_CHECK_LIB(dl, dlopen,, - [AC_MSG_WARN([could not find dlopen])]) - - fi - AC_MSG_CHECKING([whether C99 macros are supported]) AC_TRY_COMPILE(, [ |