DISTCHECK_CONFIGURE_FLAGS = --enable-gtk-doc
-SUBDIRS = gl lib libextra po src doc tests
+SUBDIRS = gl lib extra po src doc tests
if HAVE_GUILE
SUBDIRS += guile
* Version 3.0.5 (unreleased)
-** libgnutls: Corrected bug in gnutls_x509_data2hex. Report and fix by
-Vincent Untz.
+** libgnutls-extra: is no more
+
+** libgnutls: Corrected bug in gnutls_x509_data2hex. Report and fix
+by Vincent Untz.
** API and ABI modifications:
No changes since last version.
make
sudo make install
-The commands above build and install the static archives (libgnutls.a
-and libgnutls-extra.a), the shared object (libgnutls.so and
-libgnutls-extra.so), and additional binaries such as certtool and
-gnutls-cli.
+The commands above build and install the static archive (libgnutls.a),
+the shared object (libgnutls.so), and additional binaries such as certtool
+and gnutls-cli.
The library depends on libnettle and p11-kit. Versions
2.10.3 and prior used libgcrypt as the default cryptographic library.
the GNU Lesser General Public License (LGPL) version 3 or later.
The GNU LGPL applies to the main GnuTLS library, while the
-included applications as well as gnutls-extra and gnutls-openssl
-libraries are under the GNU GPL version 3. The gnutls library is
+included applications as well as gnutls-openssl
+library are under the GNU GPL version 3. The gnutls library is
located in the lib/ directory, while the applications in src/ and
-gnutls-extra and gnutls-openssl library are at libextra/.
+gnutls-openssl library is at extra/.
For any copyright year range specified as YYYY-ZZZZ in this package
note that the range specifies every single year in that closed interval.
fi
AM_CONDITIONAL(HAVE_GUILE, test "$opt_guile_bindings" = "yes")
-
-LIBGNUTLS_EXTRA_LIBS="-L${libdir} -lgnutls-extra $LIBGNUTLS_LIBS"
-LIBGNUTLS_EXTRA_CFLAGS="-I${includedir}"
-AC_SUBST(LIBGNUTLS_EXTRA_LIBS)
-AC_SUBST(LIBGNUTLS_EXTRA_CFLAGS)
-
LIBGNUTLS_LIBS="-L${libdir} -lgnutls $LIBS"
LIBGNUTLS_CFLAGS="-I${includedir}"
AC_SUBST(LIBGNUTLS_LIBS)
tests/rsa-md5-collision/Makefile
tests/sha2/Makefile
tests/userid/Makefile
- libextra/Makefile
- libextra/gnutls-extra.pc
- libextra/includes/Makefile
+ extra/Makefile
+ extra/includes/Makefile
lib/Makefile
lib/gnutls.pc
lib/includes/Makefile
# Generated texinfos.
-gnutls_TEXINFOS += gnutls-api.texi extra-api.texi \
+gnutls_TEXINFOS += gnutls-api.texi \
x509-api.texi pgp-api.texi
-MAINTAINERCLEANFILES += gnutls-api.texi extra-api.texi \
+MAINTAINERCLEANFILES += gnutls-api.texi \
x509-api.texi pgp-api.texi
gnutls-api.texi: $(srcdir)/../lib/*.c $(srcdir)/../lib/ext/*.c $(srcdir)/../lib/auth/*.c $(srcdir)/../lib/algorithms/*.c
rm -f $@-tmp
mv -f $@-tmp2 $@
-extra-api.texi: $(srcdir)/../libextra/gnutls_extra.c
- echo "" > $@-tmp
- for i in $^; do \
- echo -n "Creating documentation for file $$i... " && \
- $(srcdir)/scripts/gdoc -texinfo $$i >> $@-tmp && \
- echo "ok"; \
- done
- $(srcdir)/scripts/sort2.pl < $@-tmp > $@-tmp2
- rm -f $@-tmp
- mv -f $@-tmp2 $@
-
# Generated texinfos.
gnutls_TEXINFOS += error_codes.texi algorithms.texi alerts.texi enums.texi
SNARF_CPPFLAGS = -I$(top_srcdir) -I$(top_builddir) \
-I$(top_srcdir)/lib/includes -I$(top_builddir)/lib/includes \
- -I$(top_srcdir)/libextra/includes \
+ -I$(top_srcdir)/extra/includes \
-I$(top_srcdir)/guile/src -I$(top_builddir)/guile/src \
$(GUILE_CFLAGS)
The implementation of the function should lie in the @code{ext/@-foobar.c} file.
To make the API available in the shared library you need to add the
-symbol in @code{lib/@-libgnutls.map} or
-@code{libextra/@-libgnutls-@-extra.map} as appropriate, so that the symbol
+symbol in @code{lib/@-libgnutls.map}, so that the symbol
is exported properly.
When writing GTK-DOC style documentation for your new APIs, don't
AM_CFLAGS = $(WARN_CFLAGS) $(WERROR_CFLAGS)
AM_CPPFLAGS = \
-I$(top_srcdir)/lib/includes -I$(top_builddir)/lib/includes \
- -I$(top_srcdir)/libextra/includes \
+ -I$(top_srcdir)/extra/includes \
-I$(top_srcdir)/gl
# Gnulib warns and suggests use of fseeko instead of fseek, which is
AM_LDFLAGS = -no-install
LDADD = libexamples.la \
../../lib/libgnutls.la \
- ../../libextra/libgnutls-extra.la \
../../gl/libgnu.la \
$(LIBSOCKET) $(INET_NTOP_LIB) $(INET_PTON_LIB)
update-makefile:
FUNCS=`$(top_srcdir)/doc/scripts/gdoc -listfunc \
- $(top_srcdir)/{lib,libextra,lib/x509,lib/openpgp}/*.c`; \
+ $(top_srcdir)/{lib,lib/x509,lib/openpgp}/*.c`; \
MANS=""; \
SRPMANS=""; \
for i in $$FUNCS; do \
echo -n "."; \
done; \
echo ""; \
- echo -n "Creating man pages for libextra/" && \
- for i in `$(top_srcdir)/doc/scripts/gdoc -listfunc $(top_srcdir)/libextra/*.c`; do \
- $(top_srcdir)/doc/scripts/gdoc -man \
- -module $(PACKAGE) -sourceversion $(VERSION) \
- -bugsto $(PACKAGE_BUGREPORT) \
- -pkg-name "$(PACKAGE_NAME)" \
- -include "gnutls/extra.h" \
- -seeinfo $(PACKAGE) -verbatimcopying \
- -copyright "2008 Free Software Foundation" \
- -function $$i \
- $(top_srcdir)/libextra/*.c > $$i.3 && \
- echo -n "."; \
- done; \
- echo ""; \
echo -n "Creating man pages for lib/x509/" && \
for i in `$(top_srcdir)/doc/scripts/gdoc -listfunc $(top_srcdir)/lib/x509/*.c | grep -v gnutls_pkcs12`; do \
$(top_srcdir)/doc/scripts/gdoc -man \
# gtk-doc will search all .c and .h files beneath these paths
# for inline comments documenting functions and macros.
# e.g. DOC_SOURCE_DIR=../../../gtk ../../../gdk
-DOC_SOURCE_DIR=../../lib ../../libextra
+DOC_SOURCE_DIR=../../lib
# Extra options to pass to gtkdoc-scangobj. Not normally needed.
SCANGOBJ_OPTIONS=
# e.g. CFILE_GLOB=$(top_srcdir)/gtk/*.c
HFILE_GLOB=$(top_srcdir)/lib/includes/gnutls/*.h \
$(top_builddir)/lib/includes/gnutls/*.h \
- $(top_srcdir)/libextra/includes/gnutls/*.h
+ $(top_srcdir)/extra/includes/gnutls/*.h
CFILE_GLOB=$(top_srcdir)/lib/*.c \
$(top_srcdir)/lib/x509/*.c \
$(top_srcdir)/lib/openpgp/*.c \
- $(top_srcdir)/libextra/*.c \
- $(top_srcdir)/lib/minitasn1/*.c \
- $(top_srcdir)/libextra/*.c
+ $(top_srcdir)/lib/minitasn1/*.c
# Extra header to include when scanning, which are not under DOC_SOURCE_DIR
# e.g. EXTRA_HFILES=$(top_srcdir}/contrib/extra.h
SUBDIRS = includes
-# Pkg-config script.
-pkgconfigdir = $(libdir)/pkgconfig
-pkgconfig_DATA = gnutls-extra.pc
-DISTCLEANFILES = $(pkgconfig_DATA)
-
defexecdir = $(bindir)
defexec_DATA =
-lib_LTLIBRARIES = libgnutls-extra.la
-libgnutls_extra_la_SOURCES = libgnutls-extra.map gnutls_extra.c
+# OpenSSL
libgnutls_openssl_la_LDFLAGS = -no-undefined
-# OpenSSL
-
if ENABLE_OPENSSL
-lib_LTLIBRARIES += libgnutls-openssl.la
+lib_LTLIBRARIES = libgnutls-openssl.la
libgnutls_openssl_la_SOURCES = gnutls_openssl.c openssl_compat.h \
openssl_compat.c
endif
endif
-# OpenPGP
-
-libgnutls_extra_la_LIBADD = $(LIBSOCKET)
-libgnutls_extra_la_LDFLAGS = -no-undefined
-
-if !ENABLE_NETTLE
-libgnutls_extra_la_LIBADD += $(LTLIBGCRYPT)
-endif
-
-# Rest
-
-if HAVE_LD_OUTPUT_DEF
-libgnutls_extra_la_LDFLAGS += \
- -Wl,--output-def,libgnutls-extra-$(DLL_VERSION).def
-defexec_DATA += libgnutls-extra-$(DLL_VERSION).def
-endif
-
-DISTCLEANFILES += $(defexec_DATA)
-
-libgnutls_extra_la_LDFLAGS += \
- -version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE)
-
-libgnutls_extra_la_LIBADD += ../gl/libgnu.la \
- ../lib/libgnutls.la
-
-if HAVE_LD_VERSION_SCRIPT
-libgnutls_extra_la_LDFLAGS += \
- -Wl,--version-script=$(srcdir)/libgnutls-extra.map
-else
-libgnutls_extra_la_LDFLAGS += -export-symbols-regex '^(gnutls_).*'
-endif
+DISTCLEANFILES = $(defexec_DATA)
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
# 02110-1301, USA.
-nobase_include_HEADERS = gnutls/extra.h
+nobase_include_HEADERS =
if ENABLE_OPENSSL
nobase_include_HEADERS += gnutls/openssl.h
# Linking against GnuTLS.
GNUTLS_CORE_LIBS = $(top_builddir)/lib/libgnutls.la
-GNUTLS_EXTRA_LIBS = $(top_builddir)/libextra/libgnutls-extra.la
# Linking against Gnulib modules.
GNULIB_LIBS = $(top_builddir)/gl/libgnu.la
libguile_gnutls_extra_v_1_la_CFLAGS = \
$(AM_CFLAGS) $(GNULIB_CFLAGS) $(GUILE_CFLAGS)
libguile_gnutls_extra_v_1_la_LIBADD = \
- $(GNUTLS_CORE_LIBS) $(GNUTLS_EXTRA_LIBS) \
+ $(GNUTLS_CORE_LIBS) \
$(builddir)/libguile-gnutls-v-1.la \
$(GNULIB_LIBS) $(GUILE_LDFLAGS)
AM_CPPFLAGS = \
-I$(top_srcdir)/lib/includes \
-I$(top_builddir)/lib/includes \
- -I$(top_srcdir)/libextra/includes \
+ -I$(top_srcdir)/extra/includes \
-I$(top_builddir) \
-I$(builddir)
+++ /dev/null
-/*
- * Copyright (C) 2002-2011 Free Software Foundation, Inc.
- *
- * Author: Nikos Mavrogiannopoulos
- *
- * This file is part of GnuTLS-EXTRA.
- *
- * GnuTLS-extra is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; either version 3 of the
- * License, or (at your option) any later version.
- *
- * GnuTLS-extra is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with GnuTLS-EXTRA; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
- * 02110-1301, USA.
- *
- */
-
-/* Note the libgnutls-extra is not a standalone library. It requires
- * to link also against libgnutls.
- */
-
-#ifndef GNUTLS_EXTRA_H
-#define GNUTLS_EXTRA_H
-
-#include <gnutls/gnutls.h>
-
-#ifdef __cplusplus
-extern "C"
-{
-#endif
-
-#define GNUTLS_EXTRA_VERSION GNUTLS_VERSION
-
- int gnutls_global_init_extra (void);
-
-/* returns libgnutls-extra version (call it with a NULL argument)
- */
- const char *gnutls_extra_check_version (const char *req_version);
-
-#ifdef __cplusplus
-}
-#endif
-#endif
-I$(srcdir)/../gl \
-I$(builddir)/../lib/includes \
-I$(srcdir)/../lib/includes \
- -I$(srcdir)/../libextra/includes \
+ -I$(srcdir)/../extra/includes \
-I$(srcdir)/cfg
bin_PROGRAMS = gnutls-serv gnutls-cli psktool gnutls-cli-debug
-I$(top_builddir)/gl \
-I$(top_srcdir)/lib/includes \
-I$(top_builddir)/lib/includes \
- -I$(top_srcdir)/libextra/includes \
- -I$(top_builddir)/libextra/includes \
+ -I$(top_srcdir)/extra/includes \
+ -I$(top_builddir)/extra/includes \
-I$(top_srcdir)/lib \
-I$(top_srcdir)/doc/examples
if ENABLE_OPENSSL
ctests += openssl
-openssl_LDADD = $(LDADD) ../libextra/libgnutls-openssl.la
+openssl_LDADD = $(LDADD) ../extra/libgnutls-openssl.la
endif
if ENABLE_OPENPGP
ctests += openpgp-auth openpgp-auth2 openpgp-keyring pgps2kgnu
-openpgp_keyring_LDADD = $(LDADD) ../libextra/libgnutls-extra.la
endif
if HAVE_FORK
#include <stdio.h>
#include <gnutls/gnutls.h>
-#include <gnutls/extra.h>
#include <gnutls/openpgp.h>
#include "utils.h"
if (debug)
gnutls_global_set_log_level (2);
- ret = gnutls_global_init_extra ();
- if (ret < 0)
- fail ("extra-init %d\n", ret);
-
ret = gnutls_openpgp_keyring_init (&keyring);
if (ret < 0)
fail ("keyring-init %d\n", ret);
-I$(top_builddir)/gl \
-I$(top_srcdir)/lib/includes \
-I$(top_builddir)/lib/includes \
- -I$(top_srcdir)/libextra/includes \
- -I$(top_builddir)/libextra/includes \
+ -I$(top_srcdir)/extra/includes \
+ -I$(top_builddir)/extra/includes \
-I$(top_srcdir)/lib \
-I$(top_srcdir)/doc/examples \
-I$(top_srcdir)/tests/suite/ecore/src/include \
projects / thirdparty / gnutls.git / commitdiff
