summaryrefslogtreecommitdiff
path: root/source4/lib/tls
diff options
context:
space:
mode:
authorJelmer Vernooij <jelmer@samba.org>2010-10-31 02:17:29 +0100
committerJelmer Vernooij <jelmer@samba.org>2010-10-31 02:01:44 +0000
commit3deece559159150a0710d8160f39583ba7f2e582 (patch)
tree861600d7060d1ca8764c26f7ecc2cb82a4a44bec /source4/lib/tls
parent9401189d5435632bcc6a177845ce03beaa804113 (diff)
downloadsamba-3deece559159150a0710d8160f39583ba7f2e582.tar.gz
samba-3deece559159150a0710d8160f39583ba7f2e582.tar.bz2
samba-3deece559159150a0710d8160f39583ba7f2e582.zip
s4: Remove the old perl/m4/make/mk-based build system.
The new waf-based build system now has all the same functionality, and the old build system has been broken for quite some time. Autobuild-User: Jelmer Vernooij <jelmer@samba.org> Autobuild-Date: Sun Oct 31 02:01:44 UTC 2010 on sn-devel-104
Diffstat (limited to 'source4/lib/tls')
-rw-r--r--source4/lib/tls/config.m448
-rw-r--r--source4/lib/tls/config.mk5
2 files changed, 0 insertions, 53 deletions
diff --git a/source4/lib/tls/config.m4 b/source4/lib/tls/config.m4
deleted file mode 100644
index 8a5b996638..0000000000
--- a/source4/lib/tls/config.m4
+++ /dev/null
@@ -1,48 +0,0 @@
-###############################
-# start SMB_EXT_LIB_GNUTLS
-# check for gnutls/gnutls.h and -lgnutls
-
-use_gnutls=auto
-AC_ARG_ENABLE(gnutls,
-AS_HELP_STRING([--enable-gnutls],[Turn on gnutls support (default=yes)]),
- [if test x$enable_gnutls = xno; then
- use_gnutls=no
- fi])
-
-
-if test x$use_gnutls = xauto && pkg-config --exists gnutls; then
- SMB_EXT_LIB_FROM_PKGCONFIG(GNUTLS, gnutls >= 1.4.0,
- [use_gnutls=yes],
- [use_gnutls=no])
-fi
-
-if test x$use_gnutls = xauto; then
- AC_CHECK_HEADERS(gnutls/gnutls.h)
- AC_CHECK_LIB_EXT(gnutls, GNUTLS_LIBS, gnutls_global_init)
- AC_CHECK_DECL(gnutls_x509_crt_set_version,
- [AC_DEFINE(HAVE_GNUTLS_X509_CRT_SET_VERSION,1,gnutls set_version)], [], [
- #include <gnutls/gnutls.h>
- #include <gnutls/x509.h>
- ])
- if test x"$ac_cv_header_gnutls_gnutls_h" = x"yes" -a x"$ac_cv_lib_ext_gnutls_gnutls_global_init" = x"yes" -a x"$ac_cv_have_decl_gnutls_x509_crt_set_version" = x"yes";then
- SMB_ENABLE(GNUTLS,YES)
- AC_CHECK_DECL(gnutls_x509_crt_set_subject_key_id,
- [AC_DEFINE(HAVE_GNUTLS_X509_CRT_SET_SUBJECT_KEY_ID,1,gnutls subject_key)], [], [
- #include <gnutls/gnutls.h>
- #include <gnutls/x509.h>
- ])
- fi
- SMB_EXT_LIB(GNUTLS, $GNUTLS_LIBS)
-fi
-if test x$use_gnutls = xyes; then
- #Some older versions have a different type name
- AC_CHECK_TYPES([gnutls_datum],,,[#include "gnutls/gnutls.h"])
- AC_CHECK_TYPES([gnutls_datum_t],,,[#include "gnutls/gnutls.h"])
- AC_DEFINE(ENABLE_GNUTLS,1,[Whether we have gnutls support (SSL)])
- AC_CHECK_HEADERS(gcrypt.h)
- AC_CHECK_LIB_EXT(gcrypt, GCRYPT_LIBS, gcry_control)
- # On Solaris libgcrypt.so has a bug and seems to be not linked
- # to libgpg-error.so, so we need to manually add them...
- AC_CHECK_LIB_EXT(gpg-error, GCRYPT_LIBS, gpg_err_code_from_errno)
- SMB_EXT_LIB(GCRYPT, $GCRYPT_LIBS)
-fi
diff --git a/source4/lib/tls/config.mk b/source4/lib/tls/config.mk
deleted file mode 100644
index 0e1978cc1b..0000000000
--- a/source4/lib/tls/config.mk
+++ /dev/null
@@ -1,5 +0,0 @@
-[SUBSYSTEM::LIBTLS]
-PUBLIC_DEPENDENCIES = \
- LIBTALLOC GNUTLS GCRYPT LIBSAMBA-HOSTCONFIG samba_socket
-
-LIBTLS_OBJ_FILES = $(addprefix $(libtlssrcdir)/, tls.o tlscert.o)