Move all helper scripts to build-aux/

* scripts/: Rename to build-aux/.
* compile, config.guess, config.rpath, config.sub
* depcomp, doc/mdate-sh, doc/texinfo.tex
* install-sh, ltmain.sh, missing: Move to build-aux/.
* Makefile.am (EXTRA_DIST): Adjust.
* configure.ac (AC_CONFIG_AUX_DIR): New.
(AM_SILENT_RULES): New.

Signed-off-by: Werner Koch <wk@gnupg.org>

18 files changed, 58 insertions, 54 deletions

diff --git a/Makefile.am b/Makefile.am
index 7fb7b502..8458dd07 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -27,11 +27,12 @@ GITLOG_TO_CHANGELOG=gitlog-to-changelog
 
 DIST_SUBDIRS = m4 compat mpi cipher random src doc tests
 SUBDIRS =         compat mpi cipher random src doc tests
-EXTRA_DIST = autogen.sh README.GIT LICENSES      			\
-             ChangeLog-2011 scripts/ChangeLog-2011 doc/ChangeLog-2011 	\
-             m4/ChangeLog-2011 cipher/ChangeLog-2011 src/ChangeLog-2011 \
+
+EXTRA_DIST = autogen.sh README.GIT LICENSES      		           \
+             ChangeLog-2011 build-aux/ChangeLog-2011 doc/ChangeLog-2011    \
+             m4/ChangeLog-2011 cipher/ChangeLog-2011 src/ChangeLog-2011    \
              random/ChangeLog-2011 tests/ChangeLog-2011 mpi/ChangeLog-2011 \
-             scripts/git-log-footer scripts/git-log-fix
+             build-aux/git-log-footer build-aux/git-log-fix
 
 DISTCLEANFILES =
 
@@ -59,9 +60,9 @@ gen-ChangeLog:
 	if test -d $(top_srcdir)/.git; then				\
 	  (cd $(top_srcdir) &&                      			\
 	    $(GITLOG_TO_CHANGELOG) --append-dot --tear-off		\
-	    --amend=scripts/git-log-fix	 				\
+	    --amend=build-aux/git-log-fix	 			\
 	    --since=$(gen_start_date) ) > $(distdir)/cl-t;		\
-          cat $(top_srcdir)/scripts/git-log-footer >> $(distdir)/cl-t;  \
+          cat $(top_srcdir)/build-aux/git-log-footer >> $(distdir)/cl-t;\
 	  rm -f $(distdir)/ChangeLog;					\
 	  mv $(distdir)/cl-t $(distdir)/ChangeLog;			\
 	fi
diff --git a/scripts/ChangeLog-2011 b/build-aux/ChangeLog-2011
index 85032cd3..85032cd3 100644
--- a/scripts/ChangeLog-2011
+++ b/build-aux/ChangeLog-2011
diff --git a/compile b/build-aux/compile
index 1b1d2321..1b1d2321 100755
--- a/compile
+++ b/build-aux/compile
diff --git a/config.guess b/build-aux/config.guess
index 9afd6762..9afd6762 100755
--- a/config.guess
+++ b/build-aux/config.guess
diff --git a/config.rpath b/build-aux/config.rpath
index c547c688..c547c688 100755
--- a/config.rpath
+++ b/build-aux/config.rpath
diff --git a/config.sub b/build-aux/config.sub
index 61cb4bc2..61cb4bc2 100755
--- a/config.sub
+++ b/build-aux/config.sub
diff --git a/scripts/db2any b/build-aux/db2any
index 96606f8c..a240aaa0 100755
--- a/scripts/db2any
+++ b/build-aux/db2any
@@ -438,7 +438,7 @@ render_texinfo () {
     sgml2xml -x lower $input > $tmpxml
     [ $verbose = yes ] && echo "running docbook2texi on '$tmpxml' ..." >&2
     docbook2texi $tmpxml | sed 's,--,---,' >$output
-    rm $tmpxml 
+    rm $tmpxml
     [ $verbose = yes ] && echo "texinfo '$output' created" >&2
 
 }
diff --git a/depcomp b/build-aux/depcomp
index ca5ea4e1..ca5ea4e1 100755
--- a/depcomp
+++ b/build-aux/depcomp
diff --git a/scripts/distfiles b/build-aux/distfiles
index 80e4f791..80e4f791 100644
--- a/scripts/distfiles
+++ b/build-aux/distfiles
diff --git a/scripts/git-log-fix b/build-aux/git-log-fix
index 3e3fd95c..3e3fd95c 100644
--- a/scripts/git-log-fix
+++ b/build-aux/git-log-fix
diff --git a/scripts/git-log-footer b/build-aux/git-log-footer
index c31fe936..c31fe936 100644
--- a/scripts/git-log-footer
+++ b/build-aux/git-log-footer
diff --git a/install-sh b/build-aux/install-sh
index 6781b987..6781b987 100755
--- a/install-sh
+++ b/build-aux/install-sh
diff --git a/ltmain.sh b/build-aux/ltmain.sh
index 24e3fd33..859599aa 100644
--- a/ltmain.sh
+++ b/build-aux/ltmain.sh
@@ -9662,4 +9662,3 @@ build_old_libs=`case $build_libtool_libs in yes) echo no;; *) echo yes;; esac`
 # sh-indentation:2
 # End:
 # vi:sw=2
-
diff --git a/doc/mdate-sh b/build-aux/mdate-sh
index cd916c0a..cd916c0a 100755
--- a/doc/mdate-sh
+++ b/build-aux/mdate-sh
diff --git a/missing b/build-aux/missing
index 894e786e..894e786e 100755
--- a/missing
+++ b/build-aux/missing
diff --git a/doc/texinfo.tex b/build-aux/texinfo.tex
index 80836223..8f994185 100644
--- a/doc/texinfo.tex
+++ b/build-aux/texinfo.tex
@@ -310,7 +310,7 @@
                % We don't want .vr (or whatever) entries like this:
                % \entry{{\tt \indexbackslash }acronym}{32}{\code {\acronym}}
                % "\acronym" won't work when it's read back in;
-               % it needs to be 
+               % it needs to be
                % {\code {{\tt \backslashcurfont }acronym}
     \shipout\vbox{%
       % Do this early so pdf references go to the beginning of the page.
@@ -661,7 +661,7 @@
 \def\?{?\spacefactor=\endofsentencespacefactor\space}
 
 % @frenchspacing on|off  says whether to put extra space after punctuation.
-% 
+%
 \def\onword{on}
 \def\offword{off}
 %
@@ -1216,7 +1216,7 @@ where each line of input produces a line of output.}
 % that's what we do).
 
 % double active backslashes.
-% 
+%
 {\catcode`\@=0 \catcode`\\=\active
  @gdef@activebackslashdouble{%
    @catcode`@\=@active
@@ -1227,11 +1227,11 @@ where each line of input produces a line of output.}
 % not active characters.  hyperref.dtx (which has the same problem as
 % us) handles it with this amazing macro to replace tokens.  I've
 % tinkered with it a little for texinfo, but it's definitely from there.
-% 
+%
 % #1 is the tokens to replace.
 % #2 is the replacement.
 % #3 is the control sequence with the string.
-% 
+%
 \def\HyPsdSubst#1#2#3{%
   \def\HyPsdReplace##1#1##2\END{%
     ##1%
@@ -1420,7 +1420,7 @@ where each line of input produces a line of output.}
       % tried to figure out what each command should do in the context
       % of @url.  for now, just make @/ a no-op, that's the only one
       % people have actually reported a problem with.
-      % 
+      %
       \normalturnoffactive
       \def\@{@}%
       \let\/=\empty
@@ -1547,7 +1547,7 @@ where each line of input produces a line of output.}
 
 % Definitions for a main text size of 11pt.  This is the default in
 % Texinfo.
-% 
+%
 \def\definetextfontsizexi{
 % Text fonts (11.2pt, magstep1).
 \def\textnominalsize{11pt}
@@ -1672,7 +1672,7 @@ where each line of input produces a line of output.}
 % section, chapter, etc., sizes following suit.  This is for the GNU
 % Press printing of the Emacs 22 manual.  Maybe other manuals in the
 % future.  Used with @smallbook, which sets the leading to 12pt.
-% 
+%
 \def\definetextfontsizex{%
 % Text fonts (10pt).
 \def\textnominalsize{10pt}
@@ -1758,7 +1758,7 @@ where each line of input produces a line of output.}
 \setfont\secsf\sfbshape{12}{1000}
 \let\secbf\secrm
 \setfont\secsc\scbshape{10}{\magstep1}
-\font\seci=cmmi12 
+\font\seci=cmmi12
 \font\secsy=cmsy10 scaled \magstep1
 
 % Subsection fonts (10pt).
@@ -1799,7 +1799,7 @@ where each line of input produces a line of output.}
 % We provide the user-level command
 %   @fonttextsize 10
 % (or 11) to redefine the text font size.  pt is assumed.
-% 
+%
 \def\xword{10}
 \def\xiword{11}
 %
@@ -1809,7 +1809,7 @@ where each line of input produces a line of output.}
   %
   % Set \globaldefs so that documents can use this inside @tex, since
   % makeinfo 4.8 does not support it, but we need it nonetheless.
-  % 
+  %
  \begingroup \globaldefs=1
   \ifx\textsizearg\xword \definetextfontsizex
   \else \ifx\textsizearg\xiword \definetextfontsizexi
@@ -2094,7 +2094,7 @@ where each line of input produces a line of output.}
 % each of the four underscores in __typeof__.  This is undesirable in
 % some manuals, especially if they don't have long identifiers in
 % general.  @allowcodebreaks provides a way to control this.
-% 
+%
 \newif\ifallowcodebreaks  \allowcodebreakstrue
 
 \def\keywordtrue{true}
@@ -2225,7 +2225,7 @@ where each line of input produces a line of output.}
 % @acronym for "FBI", "NATO", and the like.
 % We print this one point size smaller, since it's intended for
 % all-uppercase.
-% 
+%
 \def\acronym#1{\doacronym #1,,\finish}
 \def\doacronym#1,#2,#3\finish{%
   {\selectfonts\lsize #1}%
@@ -2237,7 +2237,7 @@ where each line of input produces a line of output.}
 
 % @abbr for "Comput. J." and the like.
 % No font change, but don't do end-of-sentence spacing.
-% 
+%
 \def\abbr#1{\doabbr #1,,\finish}
 \def\doabbr#1,#2,#3\finish{%
   {\plainfrenchspacing #1}%
@@ -2256,43 +2256,43 @@ where each line of input produces a line of output.}
 % Theiling, which support regular, slanted, bold and bold slanted (and
 % "outlined" (blackboard board, sort of) versions, which we don't need).
 % It is available from http://www.ctan.org/tex-archive/fonts/eurosym.
-% 
+%
 % Although only regular is the truly official Euro symbol, we ignore
 % that.  The Euro is designed to be slightly taller than the regular
 % font height.
-% 
+%
 % feymr - regular
 % feymo - slanted
 % feybr - bold
 % feybo - bold slanted
-% 
+%
 % There is no good (free) typewriter version, to my knowledge.
 % A feymr10 euro is ~7.3pt wide, while a normal cmtt10 char is ~5.25pt wide.
 % Hmm.
-% 
+%
 % Also doesn't work in math.  Do we need to do math with euro symbols?
 % Hope not.
-% 
-% 
+%
+%
 \def\euro{{\eurofont e}}
 \def\eurofont{%
   % We set the font at each command, rather than predefining it in
   % \textfonts and the other font-switching commands, so that
   % installations which never need the symbol don't have to have the
   % font installed.
-  % 
+  %
   % There is only one designed size (nominal 10pt), so we always scale
   % that to the current nominal size.
-  % 
+  %
   % By the way, simply using "at 1em" works for cmr10 and the like, but
   % does not work for cmbx10 and other extended/shrunken fonts.
-  % 
+  %
   \def\eurosize{\csname\curfontsize nominalsize\endcsname}%
   %
-  \ifx\curfontstyle\bfstylename 
+  \ifx\curfontstyle\bfstylename
     % bold:
     \font\thiseurofont = \ifusingit{feybo10}{feybr10} at \eurosize
-  \else 
+  \else
     % regular:
     \font\thiseurofont = \ifusingit{feymo10}{feymr10} at \eurosize
   \fi
@@ -2316,7 +2316,7 @@ where each line of input produces a line of output.}
 % Laurent Siebenmann reports \Orb undefined with:
 %  Textures 1.7.7 (preloaded format=plain 93.10.14)  (68K)  16 APR 2004 02:38
 % so we'll define it if necessary.
-% 
+%
 \ifx\Orb\undefined
 \def\Orb{\mathhexbox20D}
 \fi
@@ -2632,7 +2632,7 @@ where each line of input produces a line of output.}
     % cause the example and the item to crash together.  So we use this
     % bizarre value of 10001 as a signal to \aboveenvbreak to insert
     % \parskip glue after all.  Section titles are handled this way also.
-    % 
+    %
     \penalty 10001
     \endgroup
     \itemxneedsnegativevskipfalse
@@ -3428,7 +3428,7 @@ where each line of input produces a line of output.}
   % processing continues to some further point.  On the other hand, it
   % seems \endinput does not hurt in the printed index arg, since that
   % is still getting written without apparent harm.
-  % 
+  %
   % Sample source (mac-idx3.tex, reported by Graham Percival to
   % help-texinfo, 22may06):
   % @macro funindex {WORD}
@@ -3436,12 +3436,12 @@ where each line of input produces a line of output.}
   % @end macro
   % ...
   % @funindex commtest
-  % 
+  %
   % The above is not enough to reproduce the bug, but it gives the flavor.
-  % 
+  %
   % Sample whatsit resulting:
   % .@write3{\entry{xyz}{@folio }{@code {xyz@endinput }}}
-  % 
+  %
   % So:
   \let\endinput = \empty
   %
@@ -3677,11 +3677,11 @@ where each line of input produces a line of output.}
   % makeinfo does not expand macros in the argument to @deffn, which ends up
   % writing an index entry, and texindex isn't prepared for an index sort entry
   % that starts with \.
-  % 
+  %
   % Since macro invocations are followed by braces, we can just redefine them
   % to take a single TeX argument.  The case of a macro invocation that
   % goes to end-of-line is not handled.
-  % 
+  %
   \macrolist
 }
 
@@ -3807,7 +3807,7 @@ where each line of input produces a line of output.}
     % to re-insert the same penalty (values >10000 are used for various
     % signals); since we just inserted a non-discardable item, any
     % following glue (such as a \parskip) would be a breakpoint.  For example:
-    % 
+    %
     %   @deffn deffn-whatever
     %   @vindex index-whatever
     %   Description.
@@ -4759,11 +4759,11 @@ where each line of input produces a line of output.}
   % glue accumulate.  (Not a breakpoint because it's preceded by a
   % discardable item.)
   \vskip-\parskip
-  % 
+  %
   % This is purely so the last item on the list is a known \penalty >
   % 10000.  This is so \startdefun can avoid allowing breakpoints after
   % section headings.  Otherwise, it would insert a valid breakpoint between:
-  % 
+  %
   %   @section sec-whatever
   %   @deffn def-whatever
   \penalty 10001
@@ -4821,7 +4821,7 @@ where each line of input produces a line of output.}
 % These characters do not print properly in the Computer Modern roman
 % fonts, so we must take special care.  This is more or less redundant
 % with the Texinfo input format setup at the end of this file.
-% 
+%
 \def\activecatcodes{%
   \catcode`\"=\active
   \catcode`\$=\active
@@ -5416,8 +5416,8 @@ where each line of input produces a line of output.}
 % from cmtt (char 0x0d).  The undirected quote is ugly, so don't make it
 % the default, but it works for pasting with more pdf viewers (at least
 % evince), the lilypond developers report.  xpdf does work with the
-% regular 0x27.  
-% 
+% regular 0x27.
+%
 \def\codequoteright{%
   \expandafter\ifx\csname SETcodequoteundirected\endcsname\relax
     '%
@@ -5429,7 +5429,7 @@ where each line of input produces a line of output.}
 % and a similar option for the left quote char vs. a grave accent.
 % Modern fonts display ASCII 0x60 as a grave accent, so some people like
 % the code environments to do likewise.
-% 
+%
 \def\codequoteleft{%
   \expandafter\ifx\csname SETcodequotebacktick\endcsname\relax
     `%
@@ -5572,7 +5572,7 @@ where each line of input produces a line of output.}
     % by \defargscommonending, instead of 10000, since the sectioning
     % commands also insert a nobreak penalty, and we don't want to allow
     % a break between a section heading and a defun.
-    % 
+    %
     \ifnum\lastpenalty=10002 \penalty2000 \fi
     %
     % Similarly, after a section heading, do not allow a break.
@@ -5950,7 +5950,7 @@ where each line of input produces a line of output.}
 % This does \let #1 = #2, with \csnames; that is,
 %   \let \csname#1\endcsname = \csname#2\endcsname
 % (except of course we have to play expansion games).
-% 
+%
 \def\cslet#1#2{%
   \expandafter\let
   \csname#1\expandafter\endcsname
@@ -7420,7 +7420,7 @@ should work if nowhere else does.}
 
 % Same as @turnoffactive except outputs \ as {\tt\char`\\} instead of
 % the literal character `\'.
-% 
+%
 @def@normalturnoffactive{%
   @let\=@normalbackslash
   @let"=@normaldoublequote
diff --git a/configure.ac b/configure.ac
index 1715161b..05cdaf8e 100644
--- a/configure.ac
+++ b/configure.ac
@@ -72,6 +72,7 @@ NEED_GPG_ERROR_VERSION=1.11
 PACKAGE=$PACKAGE_NAME
 VERSION=$PACKAGE_VERSION
 
+AC_CONFIG_AUX_DIR([build-aux])
 AC_CONFIG_SRCDIR([src/libgcrypt.vers])
 AM_INIT_AUTOMAKE
 AC_CONFIG_HEADER(config.h)
@@ -79,6 +80,7 @@ AC_CONFIG_MACRO_DIR([m4])
 AC_CONFIG_LIBOBJ_DIR([compat])
 AC_CANONICAL_HOST
 AM_MAINTAINER_MODE
+AM_SILENT_RULES
 
 AH_TOP([
 #ifndef _GCRYPT_CONFIG_H_INCLUDED
diff --git a/doc/gcrypt.texi b/doc/gcrypt.texi
index dfff1b19..cef6318f 100644
--- a/doc/gcrypt.texi
+++ b/doc/gcrypt.texi
@@ -2798,9 +2798,11 @@ supported parameters are:
 
 @table @code
 @item nbits
-This is always required to specify the length of the key.  The argument
-is a string with a number in C-notation.  The value should be a multiple
-of 8.
+This is always required to specify the length of the key.  The
+argument is a string with a number in C-notation.  The value should be
+a multiple of 8.  Note that the S-expression syntax requires that a
+number is prefixed with its string length; thus the @code{4:} in the
+above example.
 
 @item curve @var{name}
 For ECC a named curve may be used instead of giving the number of