163 files changed, 269 insertions, 170 deletions

diff --git a/Makefile.am b/Makefile.am
index 0b80e35aee..666c01268c 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -22,12 +22,12 @@
 
 DISTCHECK_CONFIGURE_FLAGS = --enable-gtk-doc
 
-SUBDIRS = lgl gl includes lib libextra src doc tests po
+SUBDIRS = gl includes lib libextra src doc tests po
 
 if HAVE_GUILE
 SUBDIRS += guile
 endif
 
-ACLOCAL_AMFLAGS = -I m4 -I gl/m4 -I lgl/m4 -I libextra/gl/m4
+ACLOCAL_AMFLAGS = -I m4 -I gl/m4 -I libextra/gl/m4
 
 EXTRA_DIST = cfg.mk maint.mk .clcopying
diff --git a/build-aux/config.rpath b/build-aux/config.rpath
index 85c2f209be..c547c68825 100755
--- a/build-aux/config.rpath
+++ b/build-aux/config.rpath
@@ -2,7 +2,7 @@
 # Output a system dependent set of variables, describing how to set the
 # run time search path of shared libraries in an executable.
 #
-#   Copyright 1996-2008 Free Software Foundation, Inc.
+#   Copyright 1996-2007 Free Software Foundation, Inc.
 #   Taken from GNU libtool, 2001
 #   Originally by Gordon Matzigkeit <gord@gnu.ai.mit.edu>, 1996
 #
@@ -47,7 +47,7 @@ for cc_temp in $CC""; do
 done
 cc_basename=`echo "$cc_temp" | sed -e 's%^.*/%%'`
 
-# Code taken from libtool.m4's _LT_COMPILER_PIC.
+# Code taken from libtool.m4's AC_LIBTOOL_PROG_COMPILER_PIC.
 
 wl=
 if test "$GCC" = yes; then
@@ -64,7 +64,7 @@ else
           ;;
       esac
       ;;
-    mingw* | cygwin* | pw32* | os2* | cegcc*)
+    mingw* | cygwin* | pw32* | os2*)
       ;;
     hpux9* | hpux10* | hpux11*)
       wl='-Wl,'
@@ -76,13 +76,7 @@ else
       ;;
     linux* | k*bsd*-gnu)
       case $cc_basename in
-        ecc*)
-          wl='-Wl,'
-          ;;
-        icc* | ifort*)
-          wl='-Wl,'
-          ;;
-        lf95*)
+        icc* | ecc*)
           wl='-Wl,'
           ;;
         pgcc | pgf77 | pgf90)
@@ -130,7 +124,7 @@ else
   esac
 fi
 
-# Code taken from libtool.m4's _LT_LINKER_SHLIBS.
+# Code taken from libtool.m4's AC_LIBTOOL_PROG_LD_SHLIBS.
 
 hardcode_libdir_flag_spec=
 hardcode_libdir_separator=
@@ -138,7 +132,7 @@ hardcode_direct=no
 hardcode_minus_L=no
 
 case "$host_os" in
-  cygwin* | mingw* | pw32* | cegcc*)
+  cygwin* | mingw* | pw32*)
     # FIXME: the MSVC++ port hasn't been tested in a loooong time
     # When not using gcc, we currently assume that we are using
     # Microsoft Visual C++.
@@ -164,7 +158,7 @@ if test "$with_gnu_ld" = yes; then
   # option of GNU ld is called -rpath, not --rpath.
   hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir'
   case "$host_os" in
-    aix[3-9]*)
+    aix3* | aix4* | aix5*)
       # On AIX/PPC, the GNU linker is very broken
       if test "$host_cpu" != ia64; then
         ld_shlibs=no
@@ -188,7 +182,7 @@ if test "$with_gnu_ld" = yes; then
         ld_shlibs=no
       fi
       ;;
-    cygwin* | mingw* | pw32* | cegcc*)
+    cygwin* | mingw* | pw32*)
       # hardcode_libdir_flag_spec is actually meaningless, as there is
       # no search path for DLLs.
       hardcode_libdir_flag_spec='-L$libdir'
@@ -260,7 +254,7 @@ else
         hardcode_direct=unsupported
       fi
       ;;
-    aix[4-9]*)
+    aix4* | aix5*)
       if test "$host_cpu" = ia64; then
         # On IA64, the linker does run time linking by default, so we don't
         # have to do anything special.
@@ -270,7 +264,7 @@ else
         # Test if we are trying to use run time linking or normal
         # AIX style linking. If -brtl is somewhere in LDFLAGS, we
         # need to do runtime linking.
-        case $host_os in aix4.[23]|aix4.[23].*|aix[5-9]*)
+        case $host_os in aix4.[23]|aix4.[23].*|aix5*)
           for ld_flag in $LDFLAGS; do
             if (test $ld_flag = "-brtl" || test $ld_flag = "-Wl,-brtl"); then
               aix_use_runtimelinking=yes
@@ -332,7 +326,7 @@ else
       ;;
     bsdi[45]*)
       ;;
-    cygwin* | mingw* | pw32* | cegcc*)
+    cygwin* | mingw* | pw32*)
       # When not using gcc, we currently assume that we are using
       # Microsoft Visual C++.
       # hardcode_libdir_flag_spec is actually meaningless, as there is
@@ -500,7 +494,7 @@ else
 fi
 
 # Check dynamic linker characteristics
-# Code taken from libtool.m4's _LT_SYS_DYNAMIC_LINKER.
+# Code taken from libtool.m4's AC_LIBTOOL_SYS_DYNAMIC_LINKER.
 # Unlike libtool.m4, here we don't care about _all_ names of the library, but
 # only about the one the linker finds when passed -lNAME. This is the last
 # element of library_names_spec in libtool.m4, or possibly two of them if the
@@ -511,7 +505,7 @@ case "$host_os" in
   aix3*)
     library_names_spec='$libname.a'
     ;;
-  aix[4-9]*)
+  aix4* | aix5*)
     library_names_spec='$libname$shrext'
     ;;
   amigaos*)
@@ -523,7 +517,7 @@ case "$host_os" in
   bsdi[45]*)
     library_names_spec='$libname$shrext'
     ;;
-  cygwin* | mingw* | pw32* | cegcc*)
+  cygwin* | mingw* | pw32*)
     shrext=.dll
     library_names_spec='$libname.dll.a $libname.lib'
     ;;
diff --git a/configure.in b/configure.in
index 7a10dffb87..9908ffb0ac 100644
--- a/configure.in
+++ b/configure.in
@@ -74,7 +74,6 @@ AC_MSG_RESULT([***
 
 dnl Checks for programs.
 AC_PROG_CC
-AC_PROG_CXX
 AC_PROG_LN_S
 GTK_DOC_CHECK(1.1)
 AC_PATH_PROG([GAA], [gaa])
@@ -377,146 +376,6 @@ fi
 # stuff so we will print a warning.
 ac_full=1
 
-AC_MSG_CHECKING([whether to enable Opaque PRF input support])
-AC_ARG_ENABLE(opaque-prf-input,
-	AS_HELP_STRING([--enable-opaque-prf-input=DD],
-		[enable Opaque PRF input using DD as extension type]),
-	ac_opaque_prf_input=$enableval, ac_opaque_prf_input=no)
-if test "$ac_opaque_prf_input" != "no"; then
-  if ! echo $ac_opaque_prf_input | egrep -q '^[[0-9]]+$'; then
-    ac_opaque_prf_input=no
-    AC_MSG_WARN([[
-*** Could not parse Opaque PRF Input extension type.
-*** Use --enable-opaque-prf-input=XX where XX is decimal, for example
-*** to use extension value 42 use --enable-opqaue-prf-input=42]])
-  fi
-fi
-if test "$ac_opaque_prf_input" != "no"; then
- AC_MSG_RESULT([yes (extension value $ac_opaque_prf_input)])
- AC_DEFINE_UNQUOTED(ENABLE_OPRFI, $ac_opaque_prf_input,
-                    [enable Opaque PRF Input])
-else
- AC_MSG_RESULT(no)
-fi
-AM_CONDITIONAL(ENABLE_OPRFI, test "$ac_opaque_prf_input" != "no")
-
-AC_MSG_CHECKING([whether to disable SRP authentication support])
-AC_ARG_ENABLE(srp-authentication,
-	AS_HELP_STRING([--disable-srp-authentication],
-		[disable the SRP authentication support]),
-	ac_enable_srp=no)
-if test x$ac_enable_srp != xno; then
- AC_MSG_RESULT(no)
- AC_DEFINE(ENABLE_SRP, 1, [enable SRP authentication])
-else
- ac_full=0
- AC_MSG_RESULT(yes)
-fi
-AM_CONDITIONAL(ENABLE_SRP, test "$ac_enable_srp" != "no")
-
-AC_MSG_CHECKING([whether to disable PSK authentication support])
-AC_ARG_ENABLE(psk-authentication,
-       AS_HELP_STRING([--disable-psk-authentication],
-               [disable the PSK authentication support]),
-       ac_enable_psk=no)
-if test x$ac_enable_psk != xno; then
- AC_MSG_RESULT(no)
- AC_DEFINE(ENABLE_PSK, 1, [enable PSK authentication])
-else
- ac_full=0
- AC_MSG_RESULT(yes)
-fi
-AM_CONDITIONAL(ENABLE_PSK, test "$ac_enable_psk" != "no")
-
-AC_MSG_CHECKING([whether to disable anonymous authentication support])
-AC_ARG_ENABLE(anon-authentication,
-	AS_HELP_STRING([--disable-anon-authentication],
-		[disable the anonymous authentication support]),
-	ac_enable_anon=no)
-if test x$ac_enable_anon != xno; then
- AC_MSG_RESULT(no)
- AC_DEFINE(ENABLE_ANON, 1, [enable anonymous authentication])
-else
- ac_full=0
- AC_MSG_RESULT(yes)
-fi
-AM_CONDITIONAL(ENABLE_ANON, test "$ac_enable_anon" != "no")
-
-# Allow disabling Camellia
-AC_ARG_ENABLE(camellia,
-  AS_HELP_STRING([--disable-camellia], [disable Camellia cipher]),
-  enable_camellia=$enableval, enable_camellia=no)
-AC_MSG_CHECKING([whether to disable Camellia cipher])
-if test "$enable_camellia" != "no"; then
- AC_MSG_RESULT([no])
- AC_DEFINE(ENABLE_CAMELLIA, 1, [enable camellia block cipher])
-else
- AC_MSG_RESULT([yes])
-fi
-
-AC_MSG_CHECKING([whether to disable extra PKI stuff])
-AC_ARG_ENABLE(extra-pki,
-	AS_HELP_STRING([--disable-extra-pki],
-		[only enable the basic PKI stuff]),
-	enable_pki=$enableval, enable_pki=yes)
-if test "$enable_pki" != "yes"; then
- ac_full=0
- AC_MSG_RESULT(yes)
-else
- AC_MSG_RESULT(no)
- AC_DEFINE(ENABLE_PKI, 1, [whether to include all the PKCS/PKI stuff])
-fi
-AM_CONDITIONAL(ENABLE_PKI, test "$enable_pki" = "yes")
-
-ac_enable_openpgp=yes
-AC_MSG_CHECKING([whether to disable OpenPGP Certificate authentication support])
-AC_ARG_ENABLE(openpgp-authentication,
-	AS_HELP_STRING([--disable-openpgp-authentication],
-		[disable the OpenPGP authentication support]),
-	ac_enable_openpgp=no)
-if test x$ac_enable_openpgp = xno; then
- AC_MSG_RESULT(yes)
- ac_full=0
-else
- AC_DEFINE(ENABLE_OPENPGP, 1, [use openpgp authentication])
- AC_MSG_RESULT(no)
-fi
-AM_CONDITIONAL(ENABLE_OPENPGP, test "$ac_enable_openpgp" = "yes")
-
-AC_MSG_CHECKING([whether to disable OpenSSL compatibility layer])
-AC_ARG_ENABLE(openssl-compatibility,
-	AS_HELP_STRING([--disable-openssl-compatibility],
-		[disable the OpenSSL compatibility support]),
-	ac_enable_openssl=$withval,
-	ac_enable_openssl=yes)
-if test x$ac_enable_openssl != xno; then
- AC_MSG_RESULT(no)
-else
- AC_MSG_RESULT(yes)
-fi
-
-AM_CONDITIONAL(ENABLE_OPENSSL, test "$ac_enable_openssl" = "yes")
-
-# Check for libtasn1
-AC_ARG_WITH(included-libtasn1,
-  AS_HELP_STRING([--with-included-libtasn1], [use the included libtasn1]),
-    included_libtasn1=$withval,
-    included_libtasn1=no)
-if test "$included_libtasn1" = "no"; then
-  AC_LIB_HAVE_LINKFLAGS(tasn1,, [#include <libtasn1.h>],
-  				[asn1_check_version (NULL)])
-  if test "$ac_cv_libtasn1" != yes; then
-    included_libtasn1=yes
-    AC_MSG_WARN([[
-*** 
-*** Libtasn1 was not found. Will use the included one.
-]])
-  fi
-fi
-AC_MSG_CHECKING([whether to use the included minitasn1])
-AC_MSG_RESULT($included_libtasn1)
-AM_CONDITIONAL(ENABLE_MINITASN1, test "$included_libtasn1" = "yes")
-
 if test "$ac_full" != 1; then
  AC_MSG_WARN([[
 *** 
@@ -665,6 +524,9 @@ fi
 
 AC_SUBST(AM_CFLAGS)
 
+AC_CONFIG_SUBDIRS([lib])
+AC_CONFIG_SUBDIRS([libextra])
+
 AC_CONFIG_FILES([Makefile po/Makefile.in \
 	doc/Makefile doc/examples/Makefile doc/scripts/Makefile \
 	doc/manpages/Makefile doc/reference/Makefile doc/doxygen/Doxyfile \
@@ -677,14 +539,10 @@ AC_CONFIG_FILES([Makefile po/Makefile.in \
 	tests/key-id/Makefile tests/sha2/Makefile \
 	tests/hostname-check/Makefile \
 	includes/Makefile includes/gnutls/gnutls.h \
-	lib/Makefile lib/minitasn1/Makefile lib/x509/Makefile \
-	libextra/Makefile libextra/gl/Makefile \
-	lib/openpgp/Makefile lib/opencdk/Makefile \
 	tests/openpgp/Makefile tests/openpgp-certs/Makefile \
 	src/Makefile \
 	src/cfg/Makefile src/cfg/platon/Makefile src/cfg/platon/str/Makefile \
-	lib/gnutls.pc libextra/gnutls-extra.pc
-	guile/Makefile guile/modules/Makefile
+	guile/Makefile guile/modules/Makefile \
 	guile/src/Makefile guile/tests/Makefile])
 
 AC_CONFIG_FILES([guile/pre-inst-guile], [chmod +x guile/pre-inst-guile])
diff --git a/lib/Makefile.am b/lib/Makefile.am
index 191e761c26..f2da1d0d44 100644
--- a/lib/Makefile.am
+++ b/lib/Makefile.am
@@ -20,7 +20,9 @@
 # Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
 # MA 02110-1301, USA
 
-SUBDIRS = x509
+ACLOCAL_AMFLAGS = -I gl/m4
+
+SUBDIRS = gl x509
 if ENABLE_MINITASN1
 SUBDIRS += minitasn1
 endif
@@ -28,7 +30,7 @@ endif
 localedir = $(datadir)/locale
 
 AM_CPPFLAGS = -DLOCALEDIR=\"$(localedir)\"				\
-	-I$(top_srcdir)/lgl -I$(top_builddir)/lgl			\
+	-I$(srcdir)/gl -I$(builddir)/gl					\
 	-I$(top_srcdir)/includes -I../includes				\
 	-I$(srcdir)/x509						\
 	-I$(top_srcdir)/libextra -I$(top_srcdir)/lib/openpgp/
diff --git a/lib/configure.ac b/lib/configure.ac
new file mode 100644
index 0000000000..f9ada140fc
--- /dev/null
+++ b/lib/configure.ac
@@ -0,0 +1,172 @@
+dnl Process this file with autoconf to produce a configure script.
+# Copyright (C) 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008
+#    Free Software Foundation, Inc.
+#
+# Author: Nikos Mavrogiannopoulos, Simon Josefsson
+#
+# This file is part of GNUTLS.
+#
+# The GNUTLS library is free software; you can redistribute it and/or
+# modify it under the terms of the GNU Lesser General Public License
+# as published by the Free Software Foundation; either version 2.1 of
+# the License, or (at your option) any later version.
+#
+# The GNUTLS library 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
+# Lesser General Public License for more details.
+#
+# You should have received a copy of the GNU Lesser General Public
+# License along with the GNUTLS library; if not, write to the Free
+# Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
+# MA 02110-1301, USA
+
+AC_PREREQ(2.61)
+AC_INIT([libgnutls], [2.7.1], [bug-gnutls@gnu.org])
+AC_CONFIG_AUX_DIR([../build-aux])
+AC_CONFIG_MACRO_DIR([../m4])
+
+AM_INIT_AUTOMAKE([1.10 -Wall -Werror -Wno-override])
+AM_CONFIG_HEADER(config.h)
+
+AC_LIBTOOL_WIN32_DLL
+AC_PROG_LIBTOOL
+
+AC_PROG_CC
+AC_PROG_CXX
+
+# Check for libtasn1
+AC_ARG_WITH(included-libtasn1,
+  AS_HELP_STRING([--with-included-libtasn1], [use the included libtasn1]),
+    included_libtasn1=$withval,
+    included_libtasn1=no)
+if test "$included_libtasn1" = "no"; then
+  AC_LIB_HAVE_LINKFLAGS(tasn1,, [#include <libtasn1.h>],
+  				[asn1_check_version (NULL)])
+  if test "$ac_cv_libtasn1" != yes; then
+    included_libtasn1=yes
+    AC_MSG_WARN([[
+*** 
+*** Libtasn1 was not found. Will use the included one.
+]])
+  fi
+fi
+AC_MSG_CHECKING([whether to use the included minitasn1])
+AC_MSG_RESULT($included_libtasn1)
+AM_CONDITIONAL(ENABLE_MINITASN1, test "$included_libtasn1" = "yes")
+
+AC_MSG_CHECKING([whether to enable Opaque PRF input support])
+AC_ARG_ENABLE(opaque-prf-input,
+	AS_HELP_STRING([--enable-opaque-prf-input=DD],
+		[enable Opaque PRF input using DD as extension type]),
+	ac_opaque_prf_input=$enableval, ac_opaque_prf_input=no)
+if test "$ac_opaque_prf_input" != "no"; then
+  if ! echo $ac_opaque_prf_input | egrep -q '^[[0-9]]+$'; then
+    ac_opaque_prf_input=no
+    AC_MSG_WARN([[
+*** Could not parse Opaque PRF Input extension type.
+*** Use --enable-opaque-prf-input=XX where XX is decimal, for example
+*** to use extension value 42 use --enable-opqaue-prf-input=42]])
+  fi
+fi
+if test "$ac_opaque_prf_input" != "no"; then
+ AC_MSG_RESULT([yes (extension value $ac_opaque_prf_input)])
+ AC_DEFINE_UNQUOTED(ENABLE_OPRFI, $ac_opaque_prf_input,
+                    [enable Opaque PRF Input])
+else
+ AC_MSG_RESULT(no)
+fi
+AM_CONDITIONAL(ENABLE_OPRFI, test "$ac_opaque_prf_input" != "no")
+
+AC_MSG_CHECKING([whether to disable SRP authentication support])
+AC_ARG_ENABLE(srp-authentication,
+	AS_HELP_STRING([--disable-srp-authentication],
+		[disable the SRP authentication support]),
+	ac_enable_srp=no)
+if test x$ac_enable_srp != xno; then
+ AC_MSG_RESULT(no)
+ AC_DEFINE(ENABLE_SRP, 1, [enable SRP authentication])
+else
+ ac_full=0
+ AC_MSG_RESULT(yes)
+fi
+AM_CONDITIONAL(ENABLE_SRP, test "$ac_enable_srp" != "no")
+
+AC_MSG_CHECKING([whether to disable PSK authentication support])
+AC_ARG_ENABLE(psk-authentication,
+       AS_HELP_STRING([--disable-psk-authentication],
+               [disable the PSK authentication support]),
+       ac_enable_psk=no)
+if test x$ac_enable_psk != xno; then
+ AC_MSG_RESULT(no)
+ AC_DEFINE(ENABLE_PSK, 1, [enable PSK authentication])
+else
+ ac_full=0
+ AC_MSG_RESULT(yes)
+fi
+AM_CONDITIONAL(ENABLE_PSK, test "$ac_enable_psk" != "no")
+
+AC_MSG_CHECKING([whether to disable anonymous authentication support])
+AC_ARG_ENABLE(anon-authentication,
+	AS_HELP_STRING([--disable-anon-authentication],
+		[disable the anonymous authentication support]),
+	ac_enable_anon=no)
+if test x$ac_enable_anon != xno; then
+ AC_MSG_RESULT(no)
+ AC_DEFINE(ENABLE_ANON, 1, [enable anonymous authentication])
+else
+ ac_full=0
+ AC_MSG_RESULT(yes)
+fi
+AM_CONDITIONAL(ENABLE_ANON, test "$ac_enable_anon" != "no")
+
+# Allow disabling Camellia
+AC_ARG_ENABLE(camellia,
+  AS_HELP_STRING([--disable-camellia], [disable Camellia cipher]),
+  enable_camellia=$enableval, enable_camellia=no)
+AC_MSG_CHECKING([whether to disable Camellia cipher])
+if test "$enable_camellia" != "no"; then
+ AC_MSG_RESULT([no])
+ AC_DEFINE(ENABLE_CAMELLIA, 1, [enable camellia block cipher])
+else
+ AC_MSG_RESULT([yes])
+fi
+
+AC_MSG_CHECKING([whether to disable extra PKI stuff])
+AC_ARG_ENABLE(extra-pki,
+	AS_HELP_STRING([--disable-extra-pki],
+		[only enable the basic PKI stuff]),
+	enable_pki=$enableval, enable_pki=yes)
+if test "$enable_pki" != "yes"; then
+ ac_full=0
+ AC_MSG_RESULT(yes)
+else
+ AC_MSG_RESULT(no)
+ AC_DEFINE(ENABLE_PKI, 1, [whether to include all the PKCS/PKI stuff])
+fi
+AM_CONDITIONAL(ENABLE_PKI, test "$enable_pki" = "yes")
+
+ac_enable_openpgp=yes
+AC_MSG_CHECKING([whether to disable OpenPGP Certificate authentication support])
+AC_ARG_ENABLE(openpgp-authentication,
+	AS_HELP_STRING([--disable-openpgp-authentication],
+		[disable the OpenPGP authentication support]),
+	ac_enable_openpgp=no)
+if test x$ac_enable_openpgp = xno; then
+ AC_MSG_RESULT(yes)
+ ac_full=0
+else
+ AC_DEFINE(ENABLE_OPENPGP, 1, [use openpgp authentication])
+ AC_MSG_RESULT(no)
+fi
+AM_CONDITIONAL(ENABLE_OPENPGP, test "$ac_enable_openpgp" = "yes")
+
+AC_CONFIG_FILES([ \
+  Makefile \
+  minitasn1/Makefile \
+  x509/Makefile \
+  openpgp/Makefile \
+  opencdk/Makefile \
+  gnutls.pc \
+])
+AC_OUTPUT
diff --git a/lgl/Makefile.am b/lib/gl/Makefile.am
index 00e8eb9db9..00e8eb9db9 100644
--- a/lgl/Makefile.am
+++ b/lib/gl/Makefile.am
diff --git a/lgl/alloca.in.h b/lib/gl/alloca.in.h
index 38b20c3973..38b20c3973 100644
--- a/lgl/alloca.in.h
+++ b/lib/gl/alloca.in.h
diff --git a/lgl/asnprintf.c b/lib/gl/asnprintf.c
index bf989a89a2..bf989a89a2 100644
--- a/lgl/asnprintf.c
+++ b/lib/gl/asnprintf.c
diff --git a/lgl/asprintf.c b/lib/gl/asprintf.c
index 2df1d4b0ec..2df1d4b0ec 100644
--- a/lgl/asprintf.c
+++ b/lib/gl/asprintf.c
diff --git a/lgl/byteswap.in.h b/lib/gl/byteswap.in.h
index fd63ce1756..fd63ce1756 100644
--- a/lgl/byteswap.in.h
+++ b/lib/gl/byteswap.in.h
diff --git a/lgl/c-ctype.c b/lib/gl/c-ctype.c
index 1c685c549d..1c685c549d 100644
--- a/lgl/c-ctype.c
+++ b/lib/gl/c-ctype.c
diff --git a/lgl/c-ctype.h b/lib/gl/c-ctype.h
index 2bce9d105c..2bce9d105c 100644
--- a/lgl/c-ctype.h
+++ b/lib/gl/c-ctype.h
diff --git a/lgl/errno.in.h b/lib/gl/errno.in.h
index 1dd67a15e4..1dd67a15e4 100644
--- a/lgl/errno.in.h
+++ b/lib/gl/errno.in.h
diff --git a/lgl/float+.h b/lib/gl/float+.h
index f0c0c18966..f0c0c18966 100644
--- a/lgl/float+.h
+++ b/lib/gl/float+.h
diff --git a/lgl/float.in.h b/lib/gl/float.in.h
index 1600d05afc..1600d05afc 100644
--- a/lgl/float.in.h
+++ b/lib/gl/float.in.h
diff --git a/lgl/fseeko.c b/lib/gl/fseeko.c
index 17e5f165d8..17e5f165d8 100644
--- a/lgl/fseeko.c
+++ b/lib/gl/fseeko.c
diff --git a/lgl/gettext.h b/lib/gl/gettext.h
index bd214d5cec..bd214d5cec 100644
--- a/lgl/gettext.h
+++ b/lib/gl/gettext.h
diff --git a/lgl/lseek.c b/lib/gl/lseek.c
index feec8310bd..feec8310bd 100644
--- a/lgl/lseek.c
+++ b/lib/gl/lseek.c
diff --git a/lgl/m4/alloca.m4 b/lib/gl/m4/alloca.m4
index 95f54a6d48..95f54a6d48 100644
--- a/lgl/m4/alloca.m4
+++ b/lib/gl/m4/alloca.m4
diff --git a/lgl/m4/byteswap.m4 b/lib/gl/m4/byteswap.m4
index 642c42cf83..642c42cf83 100644
--- a/lgl/m4/byteswap.m4
+++ b/lib/gl/m4/byteswap.m4
diff --git a/lgl/m4/codeset.m4 b/lib/gl/m4/codeset.m4
index 223955b454..223955b454 100644
--- a/lgl/m4/codeset.m4
+++ b/lib/gl/m4/codeset.m4
diff --git a/lgl/m4/errno_h.m4 b/lib/gl/m4/errno_h.m4
index b5af07800c..b5af07800c 100644
--- a/lgl/m4/errno_h.m4
+++ b/lib/gl/m4/errno_h.m4
diff --git a/lgl/m4/extensions.m4 b/lib/gl/m4/extensions.m4
index 917af94805..917af94805 100644
--- a/lgl/m4/extensions.m4
+++ b/lib/gl/m4/extensions.m4
diff --git a/lgl/m4/float_h.m4 b/lib/gl/m4/float_h.m4
index d36e3a46ca..d36e3a46ca 100644
--- a/lgl/m4/float_h.m4
+++ b/lib/gl/m4/float_h.m4
diff --git a/lgl/m4/fseeko.m4 b/lib/gl/m4/fseeko.m4
index 3d77365688..3d77365688 100644
--- a/lgl/m4/fseeko.m4
+++ b/lib/gl/m4/fseeko.m4
diff --git a/lgl/m4/func.m4 b/lib/gl/m4/func.m4
index d02bce8a8b..d02bce8a8b 100644
--- a/lgl/m4/func.m4
+++ b/lib/gl/m4/func.m4
diff --git a/lgl/m4/gettext.m4 b/lib/gl/m4/gettext.m4
index c9ae1f7de8..c9ae1f7de8 100644
--- a/lgl/m4/gettext.m4
+++ b/lib/gl/m4/gettext.m4
diff --git a/lgl/m4/glibc2.m4 b/lib/gl/m4/glibc2.m4
index e8f5bfe6ed..e8f5bfe6ed 100644
--- a/lgl/m4/glibc2.m4
+++ b/lib/gl/m4/glibc2.m4
diff --git a/lgl/m4/glibc21.m4 b/lib/gl/m4/glibc21.m4
index d95fd98613..d95fd98613 100644
--- a/lgl/m4/glibc21.m4
+++ b/lib/gl/m4/glibc21.m4
diff --git a/lgl/m4/gnulib-cache.m4 b/lib/gl/m4/gnulib-cache.m4
index 53904df27b..53904df27b 100644
--- a/lgl/m4/gnulib-cache.m4
+++ b/lib/gl/m4/gnulib-cache.m4
diff --git a/lgl/m4/gnulib-common.m4 b/lib/gl/m4/gnulib-common.m4
index c73db14cc5..c73db14cc5 100644
--- a/lgl/m4/gnulib-common.m4
+++ b/lib/gl/m4/gnulib-common.m4
diff --git a/lgl/m4/gnulib-comp.m4 b/lib/gl/m4/gnulib-comp.m4
index 664019419c..664019419c 100644
--- a/lgl/m4/gnulib-comp.m4
+++ b/lib/gl/m4/gnulib-comp.m4
diff --git a/lgl/m4/gnulib-tool.m4 b/lib/gl/m4/gnulib-tool.m4
index 4438d48869..4438d48869 100644
--- a/lgl/m4/gnulib-tool.m4
+++ b/lib/gl/m4/gnulib-tool.m4
diff --git a/lgl/m4/iconv.m4 b/lib/gl/m4/iconv.m4
index 66bc76f48c..66bc76f48c 100644
--- a/lgl/m4/iconv.m4
+++ b/lib/gl/m4/iconv.m4
diff --git a/lgl/m4/include_next.m4 b/lib/gl/m4/include_next.m4
index b6e4d3ae7a..b6e4d3ae7a 100644
--- a/lgl/m4/include_next.m4
+++ b/lib/gl/m4/include_next.m4
diff --git a/lgl/m4/intdiv0.m4 b/lib/gl/m4/intdiv0.m4
index 8c8a67084f..8c8a67084f 100644
--- a/lgl/m4/intdiv0.m4
+++ b/lib/gl/m4/intdiv0.m4
diff --git a/lgl/m4/intl.m4 b/lib/gl/m4/intl.m4
index 934408bb90..934408bb90 100644
--- a/lgl/m4/intl.m4
+++ b/lib/gl/m4/intl.m4
diff --git a/lgl/m4/intldir.m4 b/lib/gl/m4/intldir.m4
index 7a28843f64..7a28843f64 100644
--- a/lgl/m4/intldir.m4
+++ b/lib/gl/m4/intldir.m4
diff --git a/lgl/m4/intlmacosx.m4 b/lib/gl/m4/intlmacosx.m4
index d3f0d904d2..d3f0d904d2 100644
--- a/lgl/m4/intlmacosx.m4
+++ b/lib/gl/m4/intlmacosx.m4
diff --git a/lgl/m4/intmax.m4 b/lib/gl/m4/intmax.m4
index ce7a8a49de..ce7a8a49de 100644
--- a/lgl/m4/intmax.m4
+++ b/lib/gl/m4/intmax.m4
diff --git a/lgl/m4/intmax_t.m4 b/lib/gl/m4/intmax_t.m4
index 50ae35d223..50ae35d223 100644
--- a/lgl/m4/intmax_t.m4
+++ b/lib/gl/m4/intmax_t.m4
diff --git a/lgl/m4/inttypes-pri.m4 b/lib/gl/m4/inttypes-pri.m4
index 7c7f89401a..7c7f89401a 100644
--- a/lgl/m4/inttypes-pri.m4
+++ b/lib/gl/m4/inttypes-pri.m4
diff --git a/lgl/m4/inttypes_h.m4 b/lib/gl/m4/inttypes_h.m4
index edc8ecb2db..edc8ecb2db 100644
--- a/lgl/m4/inttypes_h.m4
+++ b/lib/gl/m4/inttypes_h.m4
diff --git a/lgl/m4/lcmessage.m4 b/lib/gl/m4/lcmessage.m4
index 19aa77e4f7..19aa77e4f7 100644
--- a/lgl/m4/lcmessage.m4
+++ b/lib/gl/m4/lcmessage.m4
diff --git a/lgl/m4/lib-ld.m4 b/lib/gl/m4/lib-ld.m4
index 96c4e2c339..96c4e2c339 100644
--- a/lgl/m4/lib-ld.m4
+++ b/lib/gl/m4/lib-ld.m4
diff --git a/lgl/m4/lib-link.m4 b/lib/gl/m4/lib-link.m4
index 7e07a42468..7e07a42468 100644
--- a/lgl/m4/lib-link.m4
+++ b/lib/gl/m4/lib-link.m4
diff --git a/lgl/m4/lib-prefix.m4 b/lib/gl/m4/lib-prefix.m4
index 3bdc0fc574..3bdc0fc574 100644
--- a/lgl/m4/lib-prefix.m4
+++ b/lib/gl/m4/lib-prefix.m4
diff --git a/lgl/m4/lock.m4 b/lib/gl/m4/lock.m4
index 9fec570dcd..9fec570dcd 100644
--- a/lgl/m4/lock.m4
+++ b/lib/gl/m4/lock.m4
diff --git a/lgl/m4/longlong.m4 b/lib/gl/m4/longlong.m4
index 15bf9dacad..15bf9dacad 100644
--- a/lgl/m4/longlong.m4
+++ b/lib/gl/m4/longlong.m4
diff --git a/lgl/m4/lseek.m4 b/lib/gl/m4/lseek.m4
index f336990709..f336990709 100644
--- a/lgl/m4/lseek.m4
+++ b/lib/gl/m4/lseek.m4
diff --git a/lgl/m4/malloc.m4 b/lib/gl/m4/malloc.m4
index 764f2a9fa1..764f2a9fa1 100644
--- a/lgl/m4/malloc.m4
+++ b/lib/gl/m4/malloc.m4
diff --git a/lgl/m4/memchr.m4 b/lib/gl/m4/memchr.m4
index 91b8636eb8..91b8636eb8 100644
--- a/lgl/m4/memchr.m4
+++ b/lib/gl/m4/memchr.m4
diff --git a/lgl/m4/memcmp.m4 b/lib/gl/m4/memcmp.m4
index c995a32987..c995a32987 100644
--- a/lgl/m4/memcmp.m4
+++ b/lib/gl/m4/memcmp.m4
diff --git a/lgl/m4/memmem.m4 b/lib/gl/m4/memmem.m4
index 87ab66319f..87ab66319f 100644
--- a/lgl/m4/memmem.m4
+++ b/lib/gl/m4/memmem.m4
diff --git a/lgl/m4/memmove.m4 b/lib/gl/m4/memmove.m4
index 66054e4416..66054e4416 100644
--- a/lgl/m4/memmove.m4
+++ b/lib/gl/m4/memmove.m4
diff --git a/lgl/m4/minmax.m4 b/lib/gl/m4/minmax.m4
index bbd1ba0b84..bbd1ba0b84 100644
--- a/lgl/m4/minmax.m4
+++ b/lib/gl/m4/minmax.m4
diff --git a/lgl/m4/netdb_h.m4 b/lib/gl/m4/netdb_h.m4
index bbe166fab4..bbe166fab4 100644
--- a/lgl/m4/netdb_h.m4
+++ b/lib/gl/m4/netdb_h.m4
diff --git a/lgl/m4/nls.m4 b/lib/gl/m4/nls.m4
index 7967cc2f9a..7967cc2f9a 100644
--- a/lgl/m4/nls.m4
+++ b/lib/gl/m4/nls.m4
diff --git a/lgl/m4/po.m4 b/lib/gl/m4/po.m4
index 0734762ab1..0734762ab1 100644
--- a/lgl/m4/po.m4
+++ b/lib/gl/m4/po.m4
diff --git a/lgl/m4/printf-posix.m4 b/lib/gl/m4/printf-posix.m4
index 14ba612839..14ba612839 100644
--- a/lgl/m4/printf-posix.m4
+++ b/lib/gl/m4/printf-posix.m4
diff --git a/lgl/m4/printf.m4 b/lib/gl/m4/printf.m4
index d544edd72d..d544edd72d 100644
--- a/lgl/m4/printf.m4
+++ b/lib/gl/m4/printf.m4
diff --git a/lgl/m4/progtest.m4 b/lib/gl/m4/progtest.m4
index a56365cd37..a56365cd37 100644
--- a/lgl/m4/progtest.m4
+++ b/lib/gl/m4/progtest.m4
diff --git a/lgl/m4/read-file.m4 b/lib/gl/m4/read-file.m4
index 8d1b8f3c5f..8d1b8f3c5f 100644
--- a/lgl/m4/read-file.m4
+++ b/lib/gl/m4/read-file.m4
diff --git a/lgl/m4/realloc.m4 b/lib/gl/m4/realloc.m4
index f9fd935dbb..f9fd935dbb 100644
--- a/lgl/m4/realloc.m4
+++ b/lib/gl/m4/realloc.m4
diff --git a/lgl/m4/size_max.m4 b/lib/gl/m4/size_max.m4
index 6cb4868927..6cb4868927 100644
--- a/lgl/m4/size_max.m4
+++ b/lib/gl/m4/size_max.m4
diff --git a/lgl/m4/snprintf.m4 b/lib/gl/m4/snprintf.m4
index 6021786ee1..6021786ee1 100644
--- a/lgl/m4/snprintf.m4
+++ b/lib/gl/m4/snprintf.m4
diff --git a/lgl/m4/socklen.m4 b/lib/gl/m4/socklen.m4
index b755757be4..b755757be4 100644
--- a/lgl/m4/socklen.m4
+++ b/lib/gl/m4/socklen.m4
diff --git a/lgl/m4/sockpfaf.m4 b/lib/gl/m4/sockpfaf.m4
index 25d9755c5e..25d9755c5e 100644
--- a/lgl/m4/sockpfaf.m4
+++ b/lib/gl/m4/sockpfaf.m4
diff --git a/lgl/m4/stdbool.m4 b/lib/gl/m4/stdbool.m4
index 2204ecd984..2204ecd984 100644
--- a/lgl/m4/stdbool.m4
+++ b/lib/gl/m4/stdbool.m4
diff --git a/lgl/m4/stdint.m4 b/lib/gl/m4/stdint.m4
index b255692567..b255692567 100644
--- a/lgl/m4/stdint.m4
+++ b/lib/gl/m4/stdint.m4
diff --git a/lgl/m4/stdint_h.m4 b/lib/gl/m4/stdint_h.m4
index db9a8ac4c2..db9a8ac4c2 100644
--- a/lgl/m4/stdint_h.m4
+++ b/lib/gl/m4/stdint_h.m4
diff --git a/lgl/m4/stdio_h.m4 b/lib/gl/m4/stdio_h.m4
index 60b4bd791a..60b4bd791a 100644
--- a/lgl/m4/stdio_h.m4
+++ b/lib/gl/m4/stdio_h.m4
diff --git a/lgl/m4/stdlib_h.m4 b/lib/gl/m4/stdlib_h.m4
index 838c5b6683..838c5b6683 100644
--- a/lgl/m4/stdlib_h.m4
+++ b/lib/gl/m4/stdlib_h.m4
diff --git a/lgl/m4/strcase.m4 b/lib/gl/m4/strcase.m4
index 79c525c110..79c525c110 100644
--- a/lgl/m4/strcase.m4
+++ b/lib/gl/m4/strcase.m4
diff --git a/lgl/m4/string_h.m4 b/lib/gl/m4/string_h.m4
index 2d5553c374..2d5553c374 100644
--- a/lgl/m4/string_h.m4
+++ b/lib/gl/m4/string_h.m4
diff --git a/lgl/m4/strings_h.m4 b/lib/gl/m4/strings_h.m4
index 03ac182f33..03ac182f33 100644
--- a/lgl/m4/strings_h.m4
+++ b/lib/gl/m4/strings_h.m4
diff --git a/lgl/m4/strverscmp.m4 b/lib/gl/m4/strverscmp.m4
index a3f9aff4b6..a3f9aff4b6 100644
--- a/lgl/m4/strverscmp.m4
+++ b/lib/gl/m4/strverscmp.m4
diff --git a/lgl/m4/sys_ioctl_h.m4 b/lib/gl/m4/sys_ioctl_h.m4
index 5488039b6c..5488039b6c 100644
--- a/lgl/m4/sys_ioctl_h.m4
+++ b/lib/gl/m4/sys_ioctl_h.m4
diff --git a/lgl/m4/sys_socket_h.m4 b/lib/gl/m4/sys_socket_h.m4
index b7b18e5300..b7b18e5300 100644
--- a/lgl/m4/sys_socket_h.m4
+++ b/lib/gl/m4/sys_socket_h.m4
diff --git a/lgl/m4/sys_stat_h.m4 b/lib/gl/m4/sys_stat_h.m4
index 20c82edf93..20c82edf93 100644
--- a/lgl/m4/sys_stat_h.m4
+++ b/lib/gl/m4/sys_stat_h.m4
diff --git a/lgl/m4/threadlib.m4 b/lib/gl/m4/threadlib.m4
index 3a8655e931..3a8655e931 100644
--- a/lgl/m4/threadlib.m4
+++ b/lib/gl/m4/threadlib.m4
diff --git a/lgl/m4/time_h.m4 b/lib/gl/m4/time_h.m4
index d42a635ece..d42a635ece 100644
--- a/lgl/m4/time_h.m4
+++ b/lib/gl/m4/time_h.m4
diff --git a/lgl/m4/time_r.m4 b/lib/gl/m4/time_r.m4
index c871b56d76..c871b56d76 100644
--- a/lgl/m4/time_r.m4
+++ b/lib/gl/m4/time_r.m4
diff --git a/lgl/m4/uintmax_t.m4 b/lib/gl/m4/uintmax_t.m4
index 641c4898d3..641c4898d3 100644
--- a/lgl/m4/uintmax_t.m4
+++ b/lib/gl/m4/uintmax_t.m4
diff --git a/lgl/m4/unistd_h.m4 b/lib/gl/m4/unistd_h.m4
index 5685273656..5685273656 100644
--- a/lgl/m4/unistd_h.m4
+++ b/lib/gl/m4/unistd_h.m4
diff --git a/lgl/m4/vasnprintf.m4 b/lib/gl/m4/vasnprintf.m4
index 536258c06b..536258c06b 100644
--- a/lgl/m4/vasnprintf.m4
+++ b/lib/gl/m4/vasnprintf.m4
diff --git a/lgl/m4/vasprintf.m4 b/lib/gl/m4/vasprintf.m4
index 074b03cf72..074b03cf72 100644
--- a/lgl/m4/vasprintf.m4
+++ b/lib/gl/m4/vasprintf.m4
diff --git a/lgl/m4/visibility.m4 b/lib/gl/m4/visibility.m4
index 2ff6330aa4..2ff6330aa4 100644
--- a/lgl/m4/visibility.m4
+++ b/lib/gl/m4/visibility.m4
diff --git a/lgl/m4/wchar.m4 b/lib/gl/m4/wchar.m4
index 5c923fa0e0..5c923fa0e0 100644
--- a/lgl/m4/wchar.m4
+++ b/lib/gl/m4/wchar.m4
diff --git a/lgl/m4/wchar_t.m4 b/lib/gl/m4/wchar_t.m4
index cde2129a97..cde2129a97 100644
--- a/lgl/m4/wchar_t.m4
+++ b/lib/gl/m4/wchar_t.m4
diff --git a/lgl/m4/wint_t.m4 b/lib/gl/m4/wint_t.m4
index af5ed936cc..af5ed936cc 100644
--- a/lgl/m4/wint_t.m4
+++ b/lib/gl/m4/wint_t.m4
diff --git a/lgl/m4/xsize.m4 b/lib/gl/m4/xsize.m4
index 85bb721e43..85bb721e43 100644
--- a/lgl/m4/xsize.m4
+++ b/lib/gl/m4/xsize.m4
diff --git a/lgl/memchr.c b/lib/gl/memchr.c
index a57179d52f..a57179d52f 100644
--- a/lgl/memchr.c
+++ b/lib/gl/memchr.c
diff --git a/lgl/memcmp.c b/lib/gl/memcmp.c
index fa340631f4..fa340631f4 100644
--- a/lgl/memcmp.c
+++ b/lib/gl/memcmp.c
diff --git a/lgl/memmem.c b/lib/gl/memmem.c
index e4816ed1a4..e4816ed1a4 100644
--- a/lgl/memmem.c
+++ b/lib/gl/memmem.c
diff --git a/lgl/memmove.c b/lib/gl/memmove.c
index c5ff8b520d..c5ff8b520d 100644
--- a/lgl/memmove.c
+++ b/lib/gl/memmove.c
diff --git a/lgl/minmax.h b/lib/gl/minmax.h
index 431e7dd918..431e7dd918 100644
--- a/lgl/minmax.h
+++ b/lib/gl/minmax.h
diff --git a/lgl/netdb.in.h b/lib/gl/netdb.in.h
index 9ceb98d1cb..9ceb98d1cb 100644
--- a/lgl/netdb.in.h
+++ b/lib/gl/netdb.in.h
diff --git a/lgl/override/lib/gc-libgcrypt.c.diff b/lib/gl/override/lib/gc-libgcrypt.c.diff
index a92198c8cc..a92198c8cc 100644
--- a/lgl/override/lib/gc-libgcrypt.c.diff
+++ b/lib/gl/override/lib/gc-libgcrypt.c.diff
diff --git a/lgl/printf-args.c b/lib/gl/printf-args.c
index bf2e60b724..bf2e60b724 100644
--- a/lgl/printf-args.c
+++ b/lib/gl/printf-args.c
diff --git a/lgl/printf-args.h b/lib/gl/printf-args.h
index b663a63b17..b663a63b17 100644
--- a/lgl/printf-args.h
+++ b/lib/gl/printf-args.h
diff --git a/lgl/printf-parse.c b/lib/gl/printf-parse.c
index 66b45a73f2..66b45a73f2 100644
--- a/lgl/printf-parse.c
+++ b/lib/gl/printf-parse.c
diff --git a/lgl/printf-parse.h b/lib/gl/printf-parse.h
index 196aa19692..196aa19692 100644
--- a/lgl/printf-parse.h
+++ b/lib/gl/printf-parse.h
diff --git a/lgl/read-file.c b/lib/gl/read-file.c
index 5771488ab1..5771488ab1 100644
--- a/lgl/read-file.c
+++ b/lib/gl/read-file.c
diff --git a/lgl/read-file.h b/lib/gl/read-file.h
index 798d841fc3..798d841fc3 100644
--- a/lgl/read-file.h
+++ b/lib/gl/read-file.h
diff --git a/lgl/realloc.c b/lib/gl/realloc.c
index 64b7d78c57..64b7d78c57 100644
--- a/lgl/realloc.c
+++ b/lib/gl/realloc.c
diff --git a/lgl/size_max.h b/lib/gl/size_max.h
index 68f3409202..68f3409202 100644
--- a/lgl/size_max.h
+++ b/lib/gl/size_max.h
diff --git a/lgl/snprintf.c b/lib/gl/snprintf.c
index 65434a94c1..65434a94c1 100644
--- a/lgl/snprintf.c
+++ b/lib/gl/snprintf.c
diff --git a/lgl/stdbool.in.h b/lib/gl/stdbool.in.h
index 45375b367e..45375b367e 100644
--- a/lgl/stdbool.in.h
+++ b/lib/gl/stdbool.in.h
diff --git a/lgl/stdint.in.h b/lib/gl/stdint.in.h
index 5170dc19c3..5170dc19c3 100644
--- a/lgl/stdint.in.h
+++ b/lib/gl/stdint.in.h
diff --git a/lgl/stdio-impl.h b/lib/gl/stdio-impl.h
index e52a7d8840..e52a7d8840 100644
--- a/lgl/stdio-impl.h
+++ b/lib/gl/stdio-impl.h
diff --git a/lgl/stdio-write.c b/lib/gl/stdio-write.c
index 0abcfc4088..0abcfc4088 100644
--- a/lgl/stdio-write.c
+++ b/lib/gl/stdio-write.c
diff --git a/lgl/stdio.in.h b/lib/gl/stdio.in.h
index 3b61879cda..3b61879cda 100644
--- a/lgl/stdio.in.h
+++ b/lib/gl/stdio.in.h
diff --git a/lgl/stdlib.in.h b/lib/gl/stdlib.in.h
index c5ef32a0b0..c5ef32a0b0 100644
--- a/lgl/stdlib.in.h
+++ b/lib/gl/stdlib.in.h
diff --git a/lgl/str-two-way.h b/lib/gl/str-two-way.h
index 69580736fa..69580736fa 100644
--- a/lgl/str-two-way.h
+++ b/lib/gl/str-two-way.h
diff --git a/lgl/strcasecmp.c b/lib/gl/strcasecmp.c
index 065c9e378d..065c9e378d 100644
--- a/lgl/strcasecmp.c
+++ b/lib/gl/strcasecmp.c
diff --git a/lgl/string.in.h b/lib/gl/string.in.h
index 0a6fb85b39..0a6fb85b39 100644
--- a/lgl/string.in.h
+++ b/lib/gl/string.in.h
diff --git a/lgl/strings.in.h b/lib/gl/strings.in.h
index 8d9e9f1449..8d9e9f1449 100644
--- a/lgl/strings.in.h
+++ b/lib/gl/strings.in.h
diff --git a/lgl/strncasecmp.c b/lib/gl/strncasecmp.c
index 5b2af35fd9..5b2af35fd9 100644
--- a/lgl/strncasecmp.c
+++ b/lib/gl/strncasecmp.c
diff --git a/lgl/strverscmp.c b/lib/gl/strverscmp.c
index 84b4ab8a88..84b4ab8a88 100644
--- a/lgl/strverscmp.c
+++ b/lib/gl/strverscmp.c
diff --git a/lgl/sys_socket.in.h b/lib/gl/sys_socket.in.h
index 17022bee5d..17022bee5d 100644
--- a/lgl/sys_socket.in.h
+++ b/lib/gl/sys_socket.in.h
diff --git a/lgl/sys_stat.in.h b/lib/gl/sys_stat.in.h
index 33e85db8c1..33e85db8c1 100644
--- a/lgl/sys_stat.in.h
+++ b/lib/gl/sys_stat.in.h
diff --git a/lgl/tests/Makefile.am b/lib/gl/tests/Makefile.am
index 4746df57fc..4746df57fc 100644
--- a/lgl/tests/Makefile.am
+++ b/lib/gl/tests/Makefile.am
diff --git a/lgl/tests/dummy.c b/lib/gl/tests/dummy.c
index ccb5c26f87..ccb5c26f87 100644
--- a/lgl/tests/dummy.c
+++ b/lib/gl/tests/dummy.c
diff --git a/lgl/tests/intprops.h b/lib/gl/tests/intprops.h
index 002161ee57..002161ee57 100644
--- a/lgl/tests/intprops.h
+++ b/lib/gl/tests/intprops.h
diff --git a/lgl/tests/test-alloca-opt.c b/lib/gl/tests/test-alloca-opt.c
index 68d906d869..68d906d869 100644
--- a/lgl/tests/test-alloca-opt.c
+++ b/lib/gl/tests/test-alloca-opt.c
diff --git a/lgl/tests/test-byteswap.c b/lib/gl/tests/test-byteswap.c
index 78f142d72d..78f142d72d 100644
--- a/lgl/tests/test-byteswap.c
+++ b/lib/gl/tests/test-byteswap.c
diff --git a/lgl/tests/test-c-ctype.c b/lib/gl/tests/test-c-ctype.c
index 6d7fe1b7a3..6d7fe1b7a3 100644
--- a/lgl/tests/test-c-ctype.c
+++ b/lib/gl/tests/test-c-ctype.c
diff --git a/lgl/tests/test-errno.c b/lib/gl/tests/test-errno.c
index 4642027dce..4642027dce 100644
--- a/lgl/tests/test-errno.c
+++ b/lib/gl/tests/test-errno.c
diff --git a/lgl/tests/test-fseeko.c b/lib/gl/tests/test-fseeko.c
index 3a1383b3d3..3a1383b3d3 100644
--- a/lgl/tests/test-fseeko.c
+++ b/lib/gl/tests/test-fseeko.c
diff --git a/lgl/tests/test-fseeko.sh b/lib/gl/tests/test-fseeko.sh
index 5c558272cb..5c558272cb 100755
--- a/lgl/tests/test-fseeko.sh
+++ b/lib/gl/tests/test-fseeko.sh
diff --git a/lgl/tests/test-func.c b/lib/gl/tests/test-func.c
index e55fcd5a97..e55fcd5a97 100644
--- a/lgl/tests/test-func.c
+++ b/lib/gl/tests/test-func.c
diff --git a/lgl/tests/test-lseek.c b/lib/gl/tests/test-lseek.c
index ebba02ec6d..ebba02ec6d 100644
--- a/lgl/tests/test-lseek.c
+++ b/lib/gl/tests/test-lseek.c
diff --git a/lgl/tests/test-lseek.sh b/lib/gl/tests/test-lseek.sh
index e84c2bb493..e84c2bb493 100755
--- a/lgl/tests/test-lseek.sh
+++ b/lib/gl/tests/test-lseek.sh
diff --git a/lgl/tests/test-memchr.c b/lib/gl/tests/test-memchr.c
index ebf3cfcdc5..ebf3cfcdc5 100644
--- a/lgl/tests/test-memchr.c
+++ b/lib/gl/tests/test-memchr.c
diff --git a/lgl/tests/test-memcmp.c b/lib/gl/tests/test-memcmp.c
index 50342cb968..50342cb968 100644
--- a/lgl/tests/test-memcmp.c
+++ b/lib/gl/tests/test-memcmp.c
diff --git a/lgl/tests/test-netdb.c b/lib/gl/tests/test-netdb.c
index cde9105fde..cde9105fde 100644
--- a/lgl/tests/test-netdb.c
+++ b/lib/gl/tests/test-netdb.c
diff --git a/lgl/tests/test-read-file.c b/lib/gl/tests/test-read-file.c
index 392c4f7eaf..392c4f7eaf 100644
--- a/lgl/tests/test-read-file.c
+++ b/lib/gl/tests/test-read-file.c
diff --git a/lgl/tests/test-snprintf.c b/lib/gl/tests/test-snprintf.c
index 790c999649..790c999649 100644
--- a/lgl/tests/test-snprintf.c
+++ b/lib/gl/tests/test-snprintf.c
diff --git a/lgl/tests/test-stdbool.c b/lib/gl/tests/test-stdbool.c
index 30d53217a5..30d53217a5 100644
--- a/lgl/tests/test-stdbool.c
+++ b/lib/gl/tests/test-stdbool.c
diff --git a/lgl/tests/test-stdint.c b/lib/gl/tests/test-stdint.c
index a2bf42ac89..a2bf42ac89 100644
--- a/lgl/tests/test-stdint.c
+++ b/lib/gl/tests/test-stdint.c
diff --git a/lgl/tests/test-stdio.c b/lib/gl/tests/test-stdio.c
index a5efa320ba..a5efa320ba 100644
--- a/lgl/tests/test-stdio.c
+++ b/lib/gl/tests/test-stdio.c
diff --git a/lgl/tests/test-stdlib.c b/lib/gl/tests/test-stdlib.c
index e103d46b20..e103d46b20 100644
--- a/lgl/tests/test-stdlib.c
+++ b/lib/gl/tests/test-stdlib.c
diff --git a/lgl/tests/test-string.c b/lib/gl/tests/test-string.c
index 68014f54c8..68014f54c8 100644
--- a/lgl/tests/test-string.c
+++ b/lib/gl/tests/test-string.c
diff --git a/lgl/tests/test-strings.c b/lib/gl/tests/test-strings.c
index 81e7362fb4..81e7362fb4 100644
--- a/lgl/tests/test-strings.c
+++ b/lib/gl/tests/test-strings.c
diff --git a/lgl/tests/test-strverscmp.c b/lib/gl/tests/test-strverscmp.c
index 04da20c105..04da20c105 100644
--- a/lgl/tests/test-strverscmp.c
+++ b/lib/gl/tests/test-strverscmp.c
diff --git a/lgl/tests/test-sys_socket.c b/lib/gl/tests/test-sys_socket.c
index b7395b3c5b..b7395b3c5b 100644
--- a/lgl/tests/test-sys_socket.c
+++ b/lib/gl/tests/test-sys_socket.c
diff --git a/lgl/tests/test-sys_stat.c b/lib/gl/tests/test-sys_stat.c
index 4b5eb767b7..4b5eb767b7 100644
--- a/lgl/tests/test-sys_stat.c
+++ b/lib/gl/tests/test-sys_stat.c
diff --git a/lgl/tests/test-time.c b/lib/gl/tests/test-time.c
index 9238ac4864..9238ac4864 100644
--- a/lgl/tests/test-time.c
+++ b/lib/gl/tests/test-time.c
diff --git a/lgl/tests/test-unistd.c b/lib/gl/tests/test-unistd.c
index dc15bda0df..dc15bda0df 100644
--- a/lgl/tests/test-unistd.c
+++ b/lib/gl/tests/test-unistd.c
diff --git a/lgl/tests/test-vasnprintf.c b/lib/gl/tests/test-vasnprintf.c
index 2f3f8900d7..2f3f8900d7 100644
--- a/lgl/tests/test-vasnprintf.c
+++ b/lib/gl/tests/test-vasnprintf.c
diff --git a/lgl/tests/test-vasprintf.c b/lib/gl/tests/test-vasprintf.c
index 7c4a728b05..7c4a728b05 100644
--- a/lgl/tests/test-vasprintf.c
+++ b/lib/gl/tests/test-vasprintf.c
diff --git a/lgl/tests/test-wchar.c b/lib/gl/tests/test-wchar.c
index 19da7d93c0..19da7d93c0 100644
--- a/lgl/tests/test-wchar.c
+++ b/lib/gl/tests/test-wchar.c
diff --git a/lgl/tests/verify.h b/lib/gl/tests/verify.h
index fac53f6fc4..fac53f6fc4 100644
--- a/lgl/tests/verify.h
+++ b/lib/gl/tests/verify.h
diff --git a/lgl/time.in.h b/lib/gl/time.in.h
index 9c0a882263..9c0a882263 100644
--- a/lgl/time.in.h
+++ b/lib/gl/time.in.h
diff --git a/lgl/time_r.c b/lib/gl/time_r.c
index 7317195e30..7317195e30 100644
--- a/lgl/time_r.c
+++ b/lib/gl/time_r.c
diff --git a/lgl/unistd.in.h b/lib/gl/unistd.in.h
index fa9e2c4346..fa9e2c4346 100644
--- a/lgl/unistd.in.h
+++ b/lib/gl/unistd.in.h
diff --git a/lgl/vasnprintf.c b/lib/gl/vasnprintf.c
index f1e6ac65d0..f1e6ac65d0 100644
--- a/lgl/vasnprintf.c
+++ b/lib/gl/vasnprintf.c
diff --git a/lgl/vasnprintf.h b/lib/gl/vasnprintf.h
index 7f5770aaf4..7f5770aaf4 100644
--- a/lgl/vasnprintf.h
+++ b/lib/gl/vasnprintf.h
diff --git a/lgl/vasprintf.c b/lib/gl/vasprintf.c
index c74dc76e4f..c74dc76e4f 100644
--- a/lgl/vasprintf.c
+++ b/lib/gl/vasprintf.c
diff --git a/lgl/wchar.in.h b/lib/gl/wchar.in.h
index 652ca6e5dc..652ca6e5dc 100644
--- a/lgl/wchar.in.h
+++ b/lib/gl/wchar.in.h
diff --git a/lgl/xsize.h b/lib/gl/xsize.h
index 42db052f8f..42db052f8f 100644
--- a/lgl/xsize.h
+++ b/lib/gl/xsize.h
diff --git a/libextra/configure.ac b/libextra/configure.ac
new file mode 100644
index 0000000000..a2deb80f4a
--- /dev/null
+++ b/libextra/configure.ac
@@ -0,0 +1,73 @@
+dnl Process this file with autoconf to produce a configure script.
+# Copyright (C) 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008
+#    Free Software Foundation, Inc.
+#
+# Author: Nikos Mavrogiannopoulos, Simon Josefsson
+#
+# 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.
+
+AC_PREREQ(2.61)
+AC_INIT([libgnutls-extra], [2.7.1], [bug-gnutls@gnu.org])
+AC_CONFIG_AUX_DIR([../build-aux])
+AC_CONFIG_MACRO_DIR([../m4])
+
+AM_INIT_AUTOMAKE([1.10 -Wall -Werror -Wno-override])
+AM_CONFIG_HEADER(config.h)
+
+AC_LIBTOOL_WIN32_DLL
+AC_PROG_LIBTOOL
+
+AC_MSG_CHECKING([whether to disable OpenSSL compatibility layer])
+AC_ARG_ENABLE(openssl-compatibility,
+	AS_HELP_STRING([--disable-openssl-compatibility],
+		[disable the OpenSSL compatibility support]),
+	ac_enable_openssl=$withval,
+	ac_enable_openssl=yes)
+if test x$ac_enable_openssl != xno; then
+ AC_MSG_RESULT(no)
+else
+ AC_MSG_RESULT(yes)
+fi
+AM_CONDITIONAL(ENABLE_OPENSSL, test "$ac_enable_openssl" = "yes")
+
+# Check for libtasn1
+AC_ARG_WITH(included-libtasn1,
+  AS_HELP_STRING([--with-included-libtasn1], [use the included libtasn1]),
+    included_libtasn1=$withval,
+    included_libtasn1=no)
+if test "$included_libtasn1" = "no"; then
+  AC_LIB_HAVE_LINKFLAGS(tasn1,, [#include <libtasn1.h>],
+  				[asn1_check_version (NULL)])
+  if test "$ac_cv_libtasn1" != yes; then
+    included_libtasn1=yes
+    AC_MSG_WARN([[
+*** 
+*** Libtasn1 was not found. Will use the included one.
+]])
+  fi
+fi
+AC_MSG_CHECKING([whether to use the included minitasn1])
+AC_MSG_RESULT($included_libtasn1)
+AM_CONDITIONAL(ENABLE_MINITASN1, test "$included_libtasn1" = "yes")
+
+AC_CONFIG_FILES([ \
+  libextra/Makefile \
+  libextra/gl/Makefile \
+  libextra/gnutls-extra.pc \
+])
+AC_OUTPUT