Add bootstrap + bootstrap.conf

Signed-off-by: Tim Rühsen <tim.ruehsen@gmx.de>

.gitignore

+/build-aux
 *.gcda
 *.gcno
 *.gcov
@@ -17,19 +18,7 @@
 ABOUT-NLS
 aclocal.m4
 autom4te.cache/
-build-aux/ar-lib
-build-aux/compile
-build-aux/config.guess
-build-aux/config.rpath
-build-aux/config.sub
-build-aux/depcomp
-build-aux/install-sh
-build-aux/ltmain.sh
-build-aux/mdate-sh
-build-aux/missing
-build-aux/test-driver
-build-aux/texinfo.tex
-build-aux/ylwrap
+build-aux/
 build/
 ChangeLog
 compat_reports/
@@ -206,198 +195,11 @@ extra/libgnutls-openssl.la
 extra/Makefile
 extra/Makefile.in
 fuzz/*_fuzzer
-gl/alloca.h
-gl/arg-nonnull.h
-gl/byteswap.h
-gl/c++defs.h
-gl/dirent.h
-gl/errno.h
-gl/getopt.h
-gl/glthread/.dirstamp
-gl/iconv.h
-gl/libgnu.la
-gl/limits.h
-gl/Makefile
-gl/Makefile.in
-gl/math.h
-gl/netdb.h
-gl/signal.h
-gl/stdalign.h
-gl/stddef.h
-gl/stdint.h
-gl/stdio.h
-gl/stdlib.h
-gl/string.h
-gl/strings.h
-gl/sys/
-gl/tests/arg-nonnull.h
-gl/tests/arpa/
-gl/tests/c++defs.h
-gl/tests/ctype.h
-gl/tests/fcntl.h
-gl/tests/glthread/.dirstamp
-gl/tests/glthread/glthread
-gl/tests/inttypes.h
-gl/tests/inttypes.h 
-gl/tests/libtests.a
-gl/tests/locale.h
-gl/tests/Makefile
-gl/tests/Makefile.in
-gl/tests/sys/
-gl/tests/test-accept
-gl/tests/test-alignof
-gl/tests/test-alloca-opt
-gl/tests/test-argp
-gl/tests/test-arpa_inet
-gl/tests/test-base64
-gl/tests/test-binary-io
-gl/tests/test-bind
-gl/tests/test-byteswap
-gl/tests/test-c-ctype
-gl/tests/test-c-strcasecmp
-gl/tests/test-c-strncasecmp
-gl/tests/test-close
-gl/tests/test-connect
-gl/tests/test-ctype
-gl/tests/test-dirent
-gl/tests/test-dup2
-gl/tests/test-environ
-gl/tests/test-errno
-gl/tests/test-fcntl-h
-gl/tests/test-fdopen
-gl/tests/test-fgetc
-gl/tests/test-float
-gl/tests/test-fputc
-gl/tests/test-fread
-gl/tests/test-frexp-nolibm
-gl/tests/test-frexpl-nolibm
-gl/tests/test-fseek
-gl/tests/test-fseeko
-gl/tests/test-fseeko3
-gl/tests/test-fseeko4
-gl/tests/test-fseterr
-gl/tests/test-fstat
-gl/tests/test-ftell
-gl/tests/test-ftell3
-gl/tests/test-ftello
-gl/tests/test-ftello3
-gl/tests/test-ftello4
-gl/tests/test-ftruncate
-gl/tests/test-func
-gl/tests/test-fwrite
-gl/tests/test-getaddrinfo
-gl/tests/test-getcwd-lgpl
-gl/tests/test-getdelim
-gl/tests/test-getdtablesize
-gl/tests/test-getline
-gl/tests/test-getopt
-gl/tests/test-getpeername
-gl/tests/test-gettimeofday
-gl/tests/test-hmac-md5
-gl/tests/test-iconv
-gl/tests/test-iconv-h
-gl/tests/test-iconv-utf
-gl/tests/test-ignore-value
-gl/tests/test-inet_ntop
-gl/tests/test-inet_pton
-gl/tests/test-intprops
-gl/tests/test-intprops 
-gl/tests/test-inttypes
-gl/tests/test-inttypes 
-gl/tests/test-ioctl
-gl/tests/test-isnand-nolibm
-gl/tests/test-isnanf-nolibm
-gl/tests/test-isnanl-nolibm
-gl/tests/test-limits-h
-gl/tests/test-listen
-gl/tests/test-locale
-gl/tests/test-localename
-gl/tests/test-lock
-gl/tests/test-lseek
-gl/tests/test-lstat
-gl/tests/test-malloc-gnu
-gl/tests/test-malloca
-gl/tests/test-math
-gl/tests/test-md5
-gl/tests/test-memchr
-gl/tests/test-netdb
-gl/tests/test-netinet_in
-gl/tests/test-open
-gl/tests/test-pathmax
-gl/tests/test-perror
-gl/tests/test-perror2
-gl/tests/test-pipe
-gl/tests/test-printf-frexp
-gl/tests/test-printf-frexpl
-gl/tests/test-rawmemchr
-gl/tests/test-read-file
-gl/tests/test-recv
-gl/tests/test-recvfrom
-gl/tests/test-select
-gl/tests/test-select-fd
-gl/tests/test-select-stdin
-gl/tests/test-send
-gl/tests/test-sendto
-gl/tests/test-setenv
-gl/tests/test-setlocale1
-gl/tests/test-setlocale2
-gl/tests/test-setsockopt
-gl/tests/test-shutdown
-gl/tests/test-signal-h
-gl/tests/test-signbit
-gl/tests/test-sleep
-gl/tests/test-snprintf
-gl/tests/test-sockets
-gl/tests/test-stat
-gl/tests/test-stdalign
-gl/tests/test-stdbool
-gl/tests/test-stddef
-gl/tests/test-stdint
-gl/tests/test-stdio
-gl/tests/test-stdlib
-gl/tests/test-strchrnul
-gl/tests/test-strerror
-gl/tests/test-strerror_r
-gl/tests/test-string
-gl/tests/test-strings
-gl/tests/test-strnlen
-gl/tests/test-strverscmp
-gl/tests/test-symlink
-gl/tests/test-sysexits
-gl/tests/test-sys_ioctl
-gl/tests/test-sys_select
-gl/tests/test-sys_socket
-gl/tests/test-sys_stat
-gl/tests/test-sys_time
-gl/tests/test-sys_types
-gl/tests/test-sys_uio
-gl/tests/test-thread_create
-gl/tests/test-thread_self
-gl/tests/test-time
-gl/tests/test-u64
-gl/tests/test-u8-mbtoucr
-gl/tests/test-u8-uctomb
-gl/tests/test-unistd
-gl/tests/test-unsetenv
-gl/tests/test-vasnprintf
-gl/tests/test-vasprintf
-gl/tests/test-verify
-gl/tests/test-version-etc
-gl/tests/test-vfprintf-posix
-gl/tests/test-vprintf-posix
-gl/tests/test-vsnprintf
-gl/tests/test-wchar
-gl/tests/unused-parameter.h
-gl/tests/warn-on-use.h
-gl/time.h
-gl/unistd.h
-gl/unistr.h
-gl/unitypes.h
-gl/unused-parameter.h
-gl/warn-on-use.h
-gl/wchar.h
+gl
 GnuTLS-*-coverage/
 gnutls-*.tar.*
+gtk-doc.m4
+gtk-doc.make
 guile/Makefile
 guile/Makefile.in
 guile/modules/gnutls.go
@@ -441,16 +243,7 @@ lib/openpgp/Makefile
 lib/openpgp/Makefile.in
 lib/openpgp/pgp-api.texi
 lib/priority_options.h
-lib/unistring/libunistring.la
-lib/unistring/limits.h
-lib/unistring/stdint.h
-lib/unistring/sys/
-lib/unistring/unictype.h
-lib/unistring/unictype/categ_byname.h
-lib/unistring/uninorm.h
-lib/unistring/unistr.h
-lib/unistring/unitypes.h
-lib/unistring/unused-parameter.h
+lib/unistring
 lib/x509/libgnutls_x509.la
 lib/x509/Makefile
 lib/x509/Makefile.in
@@ -459,65 +252,11 @@ libdane/gnutls-dane.pc
 libdane/libgnutls-dane.la
 libopts/libopts.la
 libtool
-m4/codeset.m4
-m4/extern-inline.m4
-m4/fcntl-o.m4
-m4/gettext.m4
-m4/glibc2.m4
-m4/glibc21.m4
-m4/iconv.m4
-m4/intdiv0.m4
-m4/intl.m4
-m4/intldir.m4
-m4/intlmacosx.m4
-m4/intmax.m4
-m4/inttypes-pri.m4
-m4/inttypes_h.m4
-m4/lcmessage.m4
-m4/lib-ld.m4
-m4/lib-link.m4
-m4/lib-prefix.m4
-m4/libtool.m4
-m4/lock.m4
-m4/longlong.m4
-m4/ltoptions.m4
-m4/ltsugar.m4
-m4/ltversion.m4
-m4/lt~obsolete.m4
-m4/nls.m4
-m4/po.m4
-m4/printf-posix.m4
-m4/progtest.m4
-m4/size_max.m4
-m4/stdint_h.m4
-m4/threadlib.m4
-m4/uintmax_t.m4
-m4/visibility.m4
-m4/wchar_t.m4
-m4/wint_t.m4
-m4/xsize.m4
+m4/*
+!m4/hooks.m4
 Makefile
 Makefile.in
 Makefile.user
-po/*.gmo
-po/*.po
-po/boldquot.sed
-po/en@boldquot.header
-po/en@boldquot.insert-header
-po/en@quot.header
-po/en@quot.insert-header
-po/gnutls.pot
-po/insert-header.sin
-po/Makefile
-po/Makefile.in
-po/Makefile.in.in
-po/Makevars.template
-po/POTFILES
-po/quot.sed
-po/remove-potcdate.sed
-po/remove-potcdate.sin
-po/Rules-quot
-po/stamp-po
 src/*.stamp
 src/benchmark
 src/benchmark-cipher
@@ -540,27 +279,7 @@ src/danetool
 src/danetool-args.c
 src/danetool-args.h
 src/gaa.skel
-src/gl/alloca.h
-src/gl/arg-nonnull.h
-src/gl/arpa/
-src/gl/c++defs.h
-src/gl/libgnu_gpl.a
-src/gl/libgnu_gpl.la
-src/gl/limits.h
-src/gl/netdb.h
-src/gl/netinet/
-src/gl/parse-datetime.c
-src/gl/signal.h
-src/gl/stddef.h
-src/gl/stdint.h
-src/gl/stdio.h
-src/gl/stdlib.h
-src/gl/string.h
-src/gl/sys/
-src/gl/time.h
-src/gl/unistd.h
-src/gl/warn-on-use.h
-src/gl/wchar.h
+src/gl
 src/gnutls-cli
 src/gnutls-cli-debug
 src/gnutls-serv

GNUmakefile

@@ -5,7 +5,7 @@
 # It is necessary if you want to build targets usually of interest
 # only to the maintainer.
 
-# Copyright (C) 2001, 2003, 2006-2016 Free Software Foundation, Inc.
+# Copyright (C) 2001, 2003, 2006-2018 Free Software Foundation, Inc.
 
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -18,7 +18,7 @@
 # GNU General Public License for more details.
 
 # You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+# along with this program.  If not, see <https://www.gnu.org/licenses/>.
 
 # If the user runs GNU make but has not yet run ./configure,
 # give them a diagnostic.

README.md

@@ -103,10 +103,11 @@ $ cd gnutls
 $ git submodule update --init
 ```
 
-The next step is to run autoreconf (etc) and then ./configure:
+The next step is to bootstrap and ./configure:
 
 ```
-$ make bootstrap
+$ ./bootstrap
+$ ./configure
 ```
 
 When built this way, some developer defaults will be enabled.  See

bootstrap.conf

+# Copyright (C) 2016 Tim Rühsen
+# Copyright (C) 2016-2017 Simon Josefsson
+
+# This program 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.
+
+# This program 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 this program.  If not, see <http://www.gnu.org/licenses/>.
+
+# gnulib library name
+source_base=gl
+tests_base=gl/tests
+m4_base=gl/m4
+gnulib_name=libgnu
+gnulib_tool_option_extras="--with-tests"
+use_libtool=1
+checkout_only_file=
+local_gl_dir=gl/override/
+SKIP_PO=1
+
+# Reproduce by: gnulib-tool --import --local-dir=gl/override --lib=libgnu --source-base=gl --m4-base=gl/m4 --doc-base=doc --tests-base=gl/tests --aux-dir=build-aux --with-tests --avoid=alignof-tests --avoid=lock-tests --avoid=lseek-tests --lgpl=2 --no-conditional-dependencies --libtool --macro-prefix=gl --no-vc-files alloca byteswap c-ctype extensions func gendocs getline gettext-h gettimeofday hash-pjw-bare havelib intprops lib-msvc-compat lib-symbol-versions maintainer-makefile manywarnings memmem-simple minmax netdb netinet_in pmccabe2html read-file secure_getenv snprintf stdint strcase strndup strtok_r strverscmp sys_socket sys_stat time_r unistd vasprintf vsnprintf warnings
+
+gnulib_modules="
+alloca byteswap c-ctype extensions func gendocs getline gettext-h gettimeofday hash-pjw-bare havelib intprops lib-msvc-compat lib-symbol-versions maintainer-makefile manywarnings memmem-simple minmax netdb netinet_in pmccabe2html read-file secure_getenv snprintf stdint strcase strndup strtok_r strverscmp sys_socket sys_stat sys_types time_r unistd valgrind-tests vasprintf vsnprintf warnings
+"
+
+unistring_modules="
+unictype/category-all unictype/property-default-ignorable-code-point unictype/property-join-control unictype/property-not-a-character uninorm/nfc uninorm/nfkc uninorm/u16-normalize uninorm/u32-normalize uninorm/u8-normalize unistr/u16-to-u8 unistr/u32-to-u8 unistr/u8-check unistr/u8-to-u16 unistr/u8-to-u32
+"
+
+src_modules="
+accept bind close connect getaddrinfo getpass gettext-h inet_ntop inet_pton listen minmax parse-datetime progname read-file recv recvfrom select send sendto servent setsockopt shutdown socket sockets socklen
+"
+
+# Build prerequisites
+buildreq="\
+autoconf   2.62
+automake   1.11.1
+gettext    0.17
+git        1.4.4
+perl       5.5
+"
+
+GTKDOCIZE=$(which gtkdocize 2>/dev/null)
+if test $? -ne 0; then
+  echo "No gtk-doc support found. You can't build the docs."
+  # rm because gtk-doc.make might be a link to a protected file
+  rm -f gtk-doc.make 2>/dev/null
+  echo "EXTRA_DIST =" >gtk-doc.make
+  echo "CLEANFILES =" >>gtk-doc.make
+  GTKDOCIZE=""
+else
+  $GTKDOCIZE
+fi
+
+bootstrap_post_import_hook ()
+{
+  # we re-use malloc-posix from the original gnulib
+#  for i in ${unistring_modules}; do
+#    sed -i 's/malloc-posix//g' ${GNULIB_SRCDIR}/modules/$i
+#  done
+
+  ${GNULIB_SRCDIR}/gnulib-tool --import --local-dir=lib/unistring/override --lib=libunistring --source-base=lib/unistring --m4-base=lib/unistring/m4 --doc-base=doc --tests-base=tests --aux-dir=build-aux --lgpl=3orGPLv2 --no-conditional-dependencies --libtool --macro-prefix=unistring ${unistring_modules}
+
+  ${GNULIB_SRCDIR}/gnulib-tool --import --local-dir=src/gl/override --lib=libgnu_gpl --source-base=src/gl --m4-base=src/gl/m4 --doc-base=doc --tests-base=tests --aux-dir=build-aux --no-conditional-dependencies --libtool --macro-prefix=ggl --no-vc-files ${src_modules}
+
+#  git -C ${GNULIB_SRCDIR} reset --hard
+
+  # Automake requires that ChangeLog exist.
+  touch ChangeLog || return 1
+}

build-aux/gendocs.sh

-#!/bin/sh -e
-# gendocs.sh -- generate a GNU manual in many formats.  This script is
-#   mentioned in maintain.texi.  See the help message below for usage details.
-
-scriptversion=2016-05-20.09
-
-# Copyright 2003-2016 Free Software Foundation, Inc.
-#
-# This program 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.
-#
-# This program 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 this program.  If not, see <http://www.gnu.org/licenses/>.
-#
-# Original author: Mohit Agarwal.
-# Send bug reports and any other correspondence to bug-gnulib@gnu.org.
-#
-# The latest version of this script, and the companion template, is
-# available from the Gnulib repository:
-#
-# http://git.savannah.gnu.org/cgit/gnulib.git/tree/build-aux/gendocs.sh
-# http://git.savannah.gnu.org/cgit/gnulib.git/tree/doc/gendocs_template
-
-# TODO:
-# - image importing was only implemented for HTML generated by
-#   makeinfo.  But it should be simple enough to adjust.
-# - images are not imported in the source tarball.  All the needed
-#   formats (PDF, PNG, etc.) should be included.
-
-prog=`basename "$0"`
-srcdir=`pwd`
-
-scripturl="http://git.savannah.gnu.org/cgit/gnulib.git/plain/build-aux/gendocs.sh"
-templateurl="http://git.savannah.gnu.org/cgit/gnulib.git/plain/doc/gendocs_template"
-
-: ${SETLANG="env LANG= LC_MESSAGES= LC_ALL= LANGUAGE="}
-: ${MAKEINFO="makeinfo"}
-: ${TEXI2DVI="texi2dvi"}
-: ${DOCBOOK2HTML="docbook2html"}
-: ${DOCBOOK2PDF="docbook2pdf"}
-: ${DOCBOOK2TXT="docbook2txt"}
-: ${GENDOCS_TEMPLATE_DIR="."}
-: ${PERL='perl'}
-: ${TEXI2HTML="texi2html"}
-unset CDPATH
-unset use_texi2html
-
-MANUAL_TITLE=
-PACKAGE=
-EMAIL=webmasters@gnu.org  # please override with --email
-commonarg= # passed to all makeinfo/texi2html invcations.
-dirargs=   # passed to all tools (-I dir).
-dirs=      # -I directories.
-htmlarg="--css-ref=/software/gnulib/manual.css -c TOP_NODE_UP_URL=/manual"
-infoarg=--no-split
-generate_ascii=true
-generate_html=true
-generate_info=true
-generate_tex=true
-outdir=manual
-source_extra=
-split=node
-srcfile=
-texarg="-t @finalout"
-
-version="gendocs.sh $scriptversion
-
-Copyright 2016 Free Software Foundation, Inc.
-There is NO warranty.  You may redistribute this software
-under the terms of the GNU General Public License.
-For more information about these matters, see the files named COPYING."
-
-usage="Usage: $prog [OPTION]... PACKAGE MANUAL-TITLE
-
-Generate output in various formats from PACKAGE.texinfo (or .texi or
-.txi) source.  See the GNU Maintainers document for a more extensive
-discussion:
-  http://www.gnu.org/prep/maintain_toc.html
-
-Options:
-  --email ADR use ADR as contact in generated web pages; always give this.
-
-  -s SRCFILE   read Texinfo from SRCFILE, instead of PACKAGE.{texinfo|texi|txi}
-  -o OUTDIR    write files into OUTDIR, instead of manual/.
-  -I DIR       append DIR to the Texinfo search path.
-  --common ARG pass ARG in all invocations.
-  --html ARG   pass ARG to makeinfo or texi2html for HTML targets,
-                 instead of '$htmlarg'.
-  --info ARG   pass ARG to makeinfo for Info, instead of --no-split.
-  --no-ascii   skip generating the plain text output.
-  --no-html    skip generating the html output.
-  --no-info    skip generating the info output.
-  --no-tex     skip generating the dvi and pdf output.
-  --source ARG include ARG in tar archive of sources.
-  --split HOW  make split HTML by node, section, chapter; default node.
-  --tex ARG    pass ARG to texi2dvi for DVI and PDF, instead of -t @finalout.
-
-  --texi2html  use texi2html to make HTML target, with all split versions.
-  --docbook    convert through DocBook too (xml, txt, html, pdf).
-
-  --help       display this help and exit successfully.
-  --version    display version information and exit successfully.
-
-Simple example: $prog --email bug-gnu-emacs@gnu.org emacs \"GNU Emacs Manual\"
-
-Typical sequence:
-  cd PACKAGESOURCE/doc
-  wget \"$scripturl\"
-  wget \"$templateurl\"
-  $prog --email BUGLIST MANUAL \"GNU MANUAL - One-line description\"
-
-Output will be in a new subdirectory \"manual\" (by default;
-use -o OUTDIR to override).  Move all the new files into your web CVS
-tree, as explained in the Web Pages node of maintain.texi.
-
-Please use the --email ADDRESS option so your own bug-reporting
-address will be used in the generated HTML pages.
-
-MANUAL-TITLE is included as part of the HTML <title> of the overall
-manual/index.html file.  It should include the name of the package being
-documented.  manual/index.html is created by substitution from the file
-$GENDOCS_TEMPLATE_DIR/gendocs_template.  (Feel free to modify the
-generic template for your own purposes.)
-
-If you have several manuals, you'll need to run this script several
-times with different MANUAL values, specifying a different output
-directory with -o each time.  Then write (by hand) an overall index.html
-with links to them all.
-
-If a manual's Texinfo sources are spread across several directories,
-first copy or symlink all Texinfo sources into a single directory.
-(Part of the script's work is to make a tar.gz of the sources.)
-
-As implied above, by default monolithic Info files are generated.
-If you want split Info, or other Info options, use --info to override.
-
-You can set the environment variables MAKEINFO, TEXI2DVI, TEXI2HTML,
-and PERL to control the programs that get executed, and
-GENDOCS_TEMPLATE_DIR to control where the gendocs_template file is
-looked for.  With --docbook, the environment variables DOCBOOK2HTML,
-DOCBOOK2PDF, and DOCBOOK2TXT are also consulted.
-
-By default, makeinfo and texi2dvi are run in the default (English)
-locale, since that's the language of most Texinfo manuals.  If you
-happen to have a non-English manual and non-English web site, see the
-SETLANG setting in the source.
-
-Email bug reports or enhancement requests to bug-gnulib@gnu.org.
-"
-
-while test $# -gt 0; do
-  case $1 in
-    -s)          shift; srcfile=$1;;
-    -o)          shift; outdir=$1;;