[git] GnuPG - branch, master, updated. gnupg-2.1.0beta3-282-ge7973d3

by Werner Koch cvs at cvs.gnupg.org
Fri Jan 10 14:04:12 CET 2014


This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "The GNU Privacy Guard".

The branch, master has been updated
       via  e7973d36d88178b4b0a977e3fcc0d62600777618 (commit)
       via  99a48b2fcdf7c33fe553511c12f2ebb8eea5c634 (commit)
      from  a55ffb9da9a844bd2bd73a4a2ea65bf18b21c57f (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit e7973d36d88178b4b0a977e3fcc0d62600777618
Author: Werner Koch <wk at gnupg.org>
Date:   Thu Jan 9 19:14:09 2014 +0100

    Turn autogen.sh into a generic script.
    
    * autogen.sh: Revamp.
    * autogen.rc: New.
    * Makefile.am (EXTRA_DIST): Add autogen.rc.
    --
    
    Signed-off-by: Werner Koch <wk at gnupg.org>

diff --git a/Makefile.am b/Makefile.am
index 7cf6d38..cf84134 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -23,7 +23,7 @@ DISTCHECK_CONFIGURE_FLAGS = --enable-symcryptrun --enable-mailto --enable-gpgtar
 
 GITLOG_TO_CHANGELOG=gitlog-to-changelog
 
-EXTRA_DIST = build-aux/config.rpath build-aux/potomo autogen.sh
+EXTRA_DIST = build-aux/config.rpath build-aux/potomo autogen.sh autogen.rc
 	     ChangeLog-2011 po/ChangeLog-2011 build-aux/ChangeLog-2011 \
 	     build-aux/gitlog-to-changelog \
 	     build-aux/git-log-fix build-aux/git-log-footer \
diff --git a/autogen.rc b/autogen.rc
new file mode 100644
index 0000000..0f3d9d8
--- /dev/null
+++ b/autogen.rc
@@ -0,0 +1,43 @@
+# autogen.sh configuration for GnuPG                           -*- sh -*-
+
+case "$myhost:$myhostsub" in
+  w32:ce)
+    extraoptions="--enable-dirmngr-auto-start --disable-scdaemon "
+    extraoptions="$extraoptions --disable-zip --enable-gpg2-is-gpg"
+    ;;
+  w32:)
+    extraoptions="--enable-gpgtar"
+    ;;
+esac
+
+case "$myhost" in
+  w32)
+    configure_opts="
+      --with-gpg-error-prefix=@SYSROOT@
+      --with-ksba-prefix=@SYSROOT@
+      --with-libgcrypt-prefix=@SYSROOT@
+      --with-libassuan-prefix=@SYSROOT@
+      --with-zlib=@SYSROOT@
+      --with-regex=@SYSROOT@
+      --with-npth-prefix=@SYSROOT@
+      --with-adns=@SYSROOT@
+      --disable-g13
+      "
+    ;;
+
+  amd64)
+    configure_opts="
+      --with-gpg-error-prefix=@SYSROOT@
+      --with-ksba-prefix=@SYSROOT@
+      --with-libgcrypt-prefix=@SYSROOT@
+      --with-libassuan-prefix=@SYSROOT@
+      --with-zlib=/usr/x86_64-linux-gnu/usr
+      --with-pth-prefix=/usr/x86_64-linux-gnu/usr
+     "
+    ;;
+esac
+
+
+extra_aclocal_flags="-I gl/m4"
+
+final_info="./configure --sysconfdir=/etc --enable-maintainer-mode --enable-symcryptrun --enable-mailto --enable-gpgtar && make"
diff --git a/autogen.sh b/autogen.sh
index 712e070..ea3d5fc 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -1,7 +1,6 @@
 #! /bin/sh
-# Run this to generate all the initial makefiles, etc.
-#
-# Copyright (C) 2003 g10 Code GmbH
+# autogen.sh
+# Copyright (C) 2003, 2014 g10 Code GmbH
 #
 # This file is free software; as a special exception the author gives
 # unlimited permission to copy and/or distribute it, with or without
@@ -10,6 +9,13 @@
 # This program is distributed in the hope that it will be useful, but
 # WITHOUT ANY WARRANTY, to the extent permitted by law; without even the
 # implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+#
+# This is a generic script to create the configure script and handle cross
+# build environments.  It requires the presence of a autogen.rc file to
+# configure it for the respective package.  It is maintained as part of
+# GnuPG and source copied by other packages.
+#
+# Version: 2014-01-10
 
 configure_ac="configure.ac"
 
@@ -28,12 +34,28 @@ check_version () {
     return 1
 }
 
+fatal () {
+    echo "autogen.sh:" "$*" >&2
+    DIE=yes
+}
+
 info () {
     if [ -z "${SILENT}" ]; then
-      echo "autogen.sh:" $*
+      echo "autogen.sh:" "$*"
     fi
 }
 
+die_p () {
+  if [ "$DIE" = "yes" ]; then
+    echo "autogen.sh: Stop." >&2
+    exit 1
+  fi
+}
+
+replace_sysroot () {
+    configure_opts=$(echo $configure_opts | sed "s#@SYSROOT@#${w32root}#g")
+    extraoptions=$(echo $extraoptions | sed "s#@SYSROOT@#${w32root}#g")
+}
 
 # Allow to override the default tool names
 AUTOCONF=${AUTOCONF_PREFIX}${AUTOCONF:-autoconf}${AUTOCONF_SUFFIX}
@@ -48,15 +70,20 @@ MSGMERGE=${GETTEXT_PREFIX}${MSGMERGE:-msgmerge}${GETTEXT_SUFFIX}
 DIE=no
 FORCE=
 SILENT=
-tmp=`dirname $0`
-tsdir=`cd "$tmp"; pwd`
+tmp=$(dirname "$0")
+tsdir=$(cd "${tmp}"; pwd)
+
 if [ -n "${AUTOGEN_SH_SILENT}" ]; then
   SILENT=" --silent"
 fi
 if test x"$1" = x"--help"; then
-  echo "usage: ./autogen.sh [--force] [--build-TYPE] [ARGS]"
+  echo "usage: ./autogen.sh [--silent] [--force] [--build-TYPE] [ARGS]"
   exit 0
 fi
+if test x"$1" = x"--silent"; then
+  SILENT=" --silent"
+  shift
+fi
 if test x"$1" = x"--force"; then
   FORCE=" --force"
   shift
@@ -69,88 +96,108 @@ am_lf='
 '
 case `pwd` in
   *[\;\\\"\#\$\&\'\`$am_lf\ \	]*)
-    echo "unsafe working directory name"; DIE=yes;;
+    fatal "unsafe working directory name" ;;
 esac
 case $tsdir in
   *[\;\\\"\#\$\&\'\`$am_lf\ \	]*)
-    echo "unsafe source directory: \`$tsdir'"; DIE=yes;;
+    fatal "unsafe source directory: \`$tsdir'" ;;
 esac
 case $HOME in
   *[\;\\\"\#\$\&\'\`$am_lf\ \	]*)
-    echo "unsafe home directory: \`$HOME'"; DIE=yes;;
+    fatal "unsafe home directory: \`$HOME'" ;;
 esac
-if test "$DIE" = "yes"; then
-  exit 1
-fi
+die_p
+
 
-# Begin list of optional variables sourced from ~/.gnupg-autogen.rc
+# List of variables sourced from autogen.rc.  The strings '@SYSROOT@' in
+# these variables are replaced by the actual system root.
+configure_opts=
+extraoptions=
+# List of optional variables sourced from autogen.rc and ~/.gnupg-autogen.rc
 w32_toolprefixes=
 w32_extraoptions=
 w32ce_toolprefixes=
 w32ce_extraoptions=
+w64_toolprefixes=
+w64_extraoptions=
 amd64_toolprefixes=
 # End list of optional variables sourced from ~/.gnupg-autogen.rc
 # What follows are variables which are sourced but default to
 # environment variables or lacking them hardcoded values.
 #w32root=
 #w32ce_root=
+#w64root=
 #amd64root=
 
-if [ -f "$HOME/.gnupg-autogen.rc" ]; then
-    info "sourcing extra definitions from $HOME/.gnupg-autogen.rc"
-    . "$HOME/.gnupg-autogen.rc"
-fi
-
 # Convenience option to use certain configure options for some hosts.
 myhost=""
 myhostsub=""
 case "$1" in
     --build-w32)
         myhost="w32"
+        shift
         ;;
     --build-w32ce)
         myhost="w32"
         myhostsub="ce"
+        shift
+        ;;
+    --build-w64)
+        myhost="w32"
+        myhostsub="64"
+        shift
         ;;
     --build-amd64)
         myhost="amd64"
+        shift
         ;;
     --build*)
-        echo "**Error**: invalid build option $1" >&2
-        exit 1
+        fatal "**Error**: invalid build option $1"
+        shift
         ;;
     *)
         ;;
 esac
+die_p
+
 
+# Source our configuration
+if [ -f "${tsdir}/autogen.rc" ]; then
+    . "${tsdir}/autogen.rc"
+fi
+
+# Source optional site specific configuration
+if [ -f "$HOME/.gnupg-autogen.rc" ]; then
+    info "sourcing extra definitions from $HOME/.gnupg-autogen.rc"
+    . "$HOME/.gnupg-autogen.rc"
+fi
 
-# ***** W32 build script *******
-# Used to cross-compile for Windows.
+# ******************
+#  W32 build script
+# ******************
 if [ "$myhost" = "w32" ]; then
-    shift
-    if [ ! -f $tsdir/scripts/config.guess ]; then
-        echo "$tsdir/scripts/config.guess not found" >&2
+    if [ ! -f "$tsdir/build-aux/config.guess" ]; then
+        fatal "$tsdir/build-aux/config.guess not found"
         exit 1
     fi
-    build=`$tsdir/scripts/config.guess`
+    build=`$tsdir/build-aux/config.guess`
 
     case $myhostsub in
         ce)
           w32root="$w32ce_root"
           [ -z "$w32root" ] && w32root="$HOME/w32ce_root"
           toolprefixes="$w32ce_toolprefixes arm-mingw32ce"
-          extraoptions="--enable-dirmngr-auto-start --disable-scdaemon "
-          extraoptions="$extraoptions --disable-zip --enable-gpg2-is-gpg"
           extraoptions="$extraoptions $w32ce_extraoptions"
           ;;
         *)
           [ -z "$w32root" ] && w32root="$HOME/w32root"
           toolprefixes="$w32_toolprefixes i686-w64-mingw32 i586-mingw32msvc"
           toolprefixes="$toolprefixes i386-mingw32msvc mingw32"
-          extraoptions="--enable-gpgtar $w32_extraoptions"
+          extraoptions="$extraoptions $w32_extraoptions"
           ;;
     esac
     info "Using $w32root as standard install directory"
+    replace_sysroot
 
     # Locate the cross compiler
     crossbindir=
@@ -162,34 +209,25 @@ if [ "$myhost" = "w32" ]; then
         fi
     done
     if [ -z "$crossbindir" ]; then
-        echo "Cross compiler kit not installed" >&2
-        if [ -z "$sub" ]; then
-          echo "Under Debian GNU/Linux, you may install it using" >&2
-          echo "  apt-get install mingw32 mingw32-runtime mingw32-binutils" >&2
+        fatal "cross compiler kit not installed"
+        if [ -z "$myhostsub" ]; then
+          info "Under Debian GNU/Linux, you may install it using"
+          info "  apt-get install mingw32 mingw32-runtime mingw32-binutils"
         fi
-        echo "Stop." >&2
-        exit 1
+        die_p
     fi
 
     if [ -f "$tsdir/config.log" ]; then
         if ! head $tsdir/config.log | grep "$host" >/dev/null; then
-            echo "Please run a 'make distclean' first" >&2
-            exit 1
+            fatal "Please run a 'make distclean' first"
+            die_p
         fi
     fi
 
     $tsdir/configure --enable-maintainer-mode ${SILENT} \
              --prefix=${w32root}  \
              --host=${host} --build=${build} \
-             --with-gpg-error-prefix=${w32root} \
-	     --with-ksba-prefix=${w32root} \
-	     --with-libgcrypt-prefix=${w32root} \
-	     --with-libassuan-prefix=${w32root} \
-	     --with-zlib=${w32root} \
-	     --with-regex=${w32root} \
-             --with-npth-prefix=${w32root} \
-             --with-adns=${w32root} \
-             ${extraoptions} --disable-g13 "$@"
+             ${configure_opts} ${extraoptions} "$@"
     rc=$?
     exit $rc
 fi
@@ -199,14 +237,15 @@ fi
 # Used to cross-compile for AMD64 (for testing)
 if [ "$myhost" = "amd64" ]; then
     shift
-    if [ ! -f $tsdir/scripts/config.guess ]; then
-        echo "$tsdir/scripts/config.guess not found" >&2
+    if [ ! -f $tsdir/build-aux/config.guess ]; then
+        echo "$tsdir/build-aux/config.guess not found" >&2
         exit 1
     fi
-    build=`$tsdir/scripts/config.guess`
+    build=`$tsdir/build-aux/config.guess`
 
     [ -z "$amd64root" ] && amd64root="$HOME/amd64root"
     info "Using $amd64root as standard install directory"
+    replace_sysroot
 
     toolprefixes="$amd64_toolprefixes x86_64-linux-gnu amd64-linux-gnu"
 
@@ -235,12 +274,7 @@ if [ "$myhost" = "amd64" ]; then
     $tsdir/configure --enable-maintainer-mode ${SILENT} \
              --prefix=${amd64root}  \
              --host=${host} --build=${build} \
-             --with-gpg-error-prefix=${amd64root} \
-	     --with-ksba-prefix=${amd64root} \
-	     --with-libgcrypt-prefix=${amd64root} \
-	     --with-libassuan-prefix=${amd64root} \
-	     --with-zlib=/usr/x86_64-linux-gnu/usr \
-             --with-pth-prefix=/usr/x86_64-linux-gnu/usr
+             ${configure_opts} ${extraoptions} "$@"
     rc=$?
     exit $rc
 fi
@@ -260,12 +294,15 @@ q
 }' ${configure_ac}`
 automake_vers_num=`echo "$automake_vers" | cvtver`
 
-gettext_vers=`sed -n '/^AM_GNU_GETTEXT_VERSION(/ {
+if [ -d "${tsdir}/po" ]; then
+  gettext_vers=`sed -n '/^AM_GNU_GETTEXT_VERSION(/ {
 s/^.*\[\(.*\)])/\1/p
 q
 }' ${configure_ac}`
-gettext_vers_num=`echo "$gettext_vers" | cvtver`
-
+  gettext_vers_num=`echo "$gettext_vers" | cvtver`
+else
+  gettext_vers="n/a"
+fi
 
 if [ -z "$autoconf_vers" -o -z "$automake_vers" -o -z "$gettext_vers" ]
 then
@@ -280,18 +317,20 @@ fi
 if check_version $AUTOMAKE $automake_vers_num $automake_vers; then
   check_version $ACLOCAL $automake_vers_num $autoconf_vers automake
 fi
-if check_version $GETTEXT $gettext_vers_num $gettext_vers; then
-  check_version $MSGMERGE $gettext_vers_num $gettext_vers gettext
+if [ "$gettext_vers" != "n/a" ]; then
+  if check_version $GETTEXT $gettext_vers_num $gettext_vers; then
+    check_version $MSGMERGE $gettext_vers_num $gettext_vers gettext
+  fi
 fi
 
-if test "$DIE" = "yes"; then
+if [ "$DIE" = "yes" ]; then
     cat <<EOF
 
 Note that you may use alternative versions of the tools by setting
-the corresponding environment variables; see README.SVN for details.
+the corresponding environment variables; see README.GIT for details.
 
 EOF
-    exit 1
+    die_p
 fi
 
 # Check the git setup.
@@ -309,24 +348,35 @@ EOF
       $CP .git/hooks/pre-commit.sample .git/hooks/pre-commit
       chmod +x  .git/hooks/pre-commit
   fi
-  tmp=$(git config --get filter.cleanpo.clean)
-  if [ "$tmp" != "awk '/^\"POT-Creation-Date:/&&!s{s=1;next};!/^#: /{print}'" ]
-  then
-    info "*** Adding GIT filter.cleanpo.clean configuration."
-    git config --add filter.cleanpo.clean \
+
+  if [ "$gettext_vers" != "n/a" ]; then
+    tmp=$(git config --get filter.cleanpo.clean)
+    if [ "$tmp" != \
+          "awk '/^\"POT-Creation-Date:/&&!s{s=1;next};!/^#: /{print}'" ]
+    then
+      info "*** Adding GIT filter.cleanpo.clean configuration."
+      git config --add filter.cleanpo.clean \
         "awk '/^\"POT-Creation-Date:/&&!s{s=1;next};!/^#: /{print}'"
+    fi
   fi
-  if [ -f scripts/git-hooks/commit-msg -a ! -f .git/hooks/commit-msg ] ; then
+  if [ -f build-aux/git-hooks/commit-msg -a ! -f .git/hooks/commit-msg ] ; then
       [ -z "${SILENT}" ] && cat <<EOF
 *** Activating commit log message check hook. ***
 EOF
-      $CP scripts/git-hooks/commit-msg .git/hooks/commit-msg
+      $CP build-aux/git-hooks/commit-msg .git/hooks/commit-msg
       chmod +x  .git/hooks/commit-msg
   fi
 fi
 
-info "Running aclocal -I m4 -I gl/m4 ${ACLOCAL_FLAGS:+$ACLOCAL_FLAGS }..."
-$ACLOCAL -I m4 -I gl/m4 $ACLOCAL_FLAGS
+aclocal_flags="-I m4"
+if [ -n "${extra_aclocal_flags}" ]; then
+  aclocal_flags="${aclocal_flags} ${extra_aclocal_flags}"
+fi
+if [ -n "${ACLOCAL_FLAGS}" ]; then
+  aclocal_flags="${aclocal_flags} ${ACLOCAL_FLAGS}"
+fi
+info "Running $ACLOCAL ${aclocal_flags} ..."
+$ACLOCAL ${aclocal_flags}
 info "Running autoheader..."
 $AUTOHEADER
 info "Running automake --gnu ..."
@@ -334,6 +384,4 @@ $AUTOMAKE --gnu;
 info "Running autoconf${FORCE} ..."
 $AUTOCONF${FORCE}
 
-info "You may now run:
-  ./configure --sysconfdir=/etc --enable-maintainer-mode --enable-symcryptrun --enable-mailto --enable-gpgtar && make
-"
+info "You may now run:${am_lf}  ${final_info}"

commit 99a48b2fcdf7c33fe553511c12f2ebb8eea5c634
Author: Werner Koch <wk at gnupg.org>
Date:   Thu Jan 9 19:14:09 2014 +0100

    Rename scripts/ to build-aux/
    
    * scripts/: Rename to build-aux/
    * Makefile.am: Adjust accordingly.
    * configure.ac (AC_CONFIG_AUX_DIR): Change to build-aux.

diff --git a/Makefile.am b/Makefile.am
index 08b5d32..7cf6d38 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -23,11 +23,12 @@ DISTCHECK_CONFIGURE_FLAGS = --enable-symcryptrun --enable-mailto --enable-gpgtar
 
 GITLOG_TO_CHANGELOG=gitlog-to-changelog
 
-EXTRA_DIST = scripts/config.rpath scripts/potomo autogen.sh README.GIT \
-	     ChangeLog-2011 po/ChangeLog-2011 scripts/ChangeLog-2011 \
-	     scripts/gitlog-to-changelog \
-	     scripts/git-log-fix scripts/git-log-footer \
-	     scripts/speedo.mk
+EXTRA_DIST = build-aux/config.rpath build-aux/potomo autogen.sh
+	     ChangeLog-2011 po/ChangeLog-2011 build-aux/ChangeLog-2011 \
+	     build-aux/gitlog-to-changelog \
+	     build-aux/git-log-fix build-aux/git-log-footer \
+	     build-aux/speedo.mk README.GIT
+
 DISTCLEANFILES = g10defs.h
 
 if BUILD_GPGSM
@@ -101,12 +102,12 @@ dist-hook: gen-ChangeLog
 if HAVE_W32_SYSTEM
 install-data-hook:
 	set -e; \
-	for i in $$($(top_srcdir)/scripts/potomo \
+	for i in $$($(top_srcdir)/build-aux/potomo \
                      --get-linguas $(top_srcdir)/po) ; do \
            $(MKDIR_P) "$(DESTDIR)$(localedir)/$$i/LC_MESSAGES" || true; \
            rm -f "$(DESTDIR)$(localedir)/$$i/LC_MESSAGES/gnupg2.mo" \
                                                  2>/dev/null || true; \
-           $(top_srcdir)/scripts/potomo $(top_srcdir)/po/$$i.po \
+           $(top_srcdir)/build-aux/potomo $(top_srcdir)/po/$$i.po \
               "$(DESTDIR)$(localedir)/$$i/LC_MESSAGES/gnupg2.mo" ; \
 	done
 endif
@@ -118,9 +119,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
similarity index 100%
rename from scripts/ChangeLog-2011
rename to build-aux/ChangeLog-2011
diff --git a/scripts/build-all.sh b/build-aux/build-all.sh
similarity index 100%
rename from scripts/build-all.sh
rename to build-aux/build-all.sh
diff --git a/scripts/compile b/build-aux/compile
similarity index 100%
rename from scripts/compile
rename to build-aux/compile
diff --git a/scripts/config.guess b/build-aux/config.guess
similarity index 100%
rename from scripts/config.guess
rename to build-aux/config.guess
diff --git a/scripts/config.rpath b/build-aux/config.rpath
similarity index 100%
rename from scripts/config.rpath
rename to build-aux/config.rpath
diff --git a/scripts/config.sub b/build-aux/config.sub
similarity index 100%
rename from scripts/config.sub
rename to build-aux/config.sub
diff --git a/scripts/depcomp b/build-aux/depcomp
similarity index 100%
rename from scripts/depcomp
rename to build-aux/depcomp
diff --git a/scripts/git-hooks/commit-msg b/build-aux/git-hooks/commit-msg
similarity index 100%
rename from scripts/git-hooks/commit-msg
rename to build-aux/git-hooks/commit-msg
diff --git a/scripts/git-log-fix b/build-aux/git-log-fix
similarity index 100%
rename from scripts/git-log-fix
rename to build-aux/git-log-fix
diff --git a/scripts/git-log-footer b/build-aux/git-log-footer
similarity index 100%
rename from scripts/git-log-footer
rename to build-aux/git-log-footer
diff --git a/scripts/gitlog-to-changelog b/build-aux/gitlog-to-changelog
similarity index 100%
rename from scripts/gitlog-to-changelog
rename to build-aux/gitlog-to-changelog
diff --git a/scripts/install-sh b/build-aux/install-sh
similarity index 100%
rename from scripts/install-sh
rename to build-aux/install-sh
diff --git a/scripts/mail-to-translators b/build-aux/mail-to-translators
similarity index 95%
rename from scripts/mail-to-translators
rename to build-aux/mail-to-translators
index c01e89e..6937b59 100755
--- a/scripts/mail-to-translators
+++ b/build-aux/mail-to-translators
@@ -13,12 +13,12 @@ for file in *.po; do
     if [ -z "$addr" ]; then
     addr=$(awk '/Last-Translator:/ { printf "%s", $0; exit 0}' $file | sed 's/.*\(<.*>\).*/\1/')
     fi
-    ll=$(basename $file .po)    
+    ll=$(basename $file .po)
 
     if ! msgfmt -vc $file 2>&1| egrep -q 'fuzzy|untranslated|error'; then
         echo "$file: okay" >&2
         continue;
-    fi    
+    fi
 
     if ! echo "$addr" | grep -q @ ; then
         echo "$file: no translator known" >&2
@@ -40,7 +40,7 @@ Content-Type: multipart/mixed; boundary="=-=-="
 Hi!
 
 We are preparing for a new 2.0 release of GnuPG and like you to ask to
-update your translation. 
+update your translation.
 
 Please find attached the very latest version of the PO file for your
 GnuPG translation ($file).
@@ -76,7 +76,7 @@ Content-Transfer-Encoding: base64
 
 EOF
 
-bzip2 <$file | mimencode 
+bzip2 <$file | mimencode
 
 echo ""
 echo "--=-=-=--"
@@ -84,4 +84,3 @@ echo ""
     ) | $SENDMAIL -oi "$addr"
 
 done
-
diff --git a/scripts/mdate-sh b/build-aux/mdate-sh
similarity index 100%
rename from scripts/mdate-sh
rename to build-aux/mdate-sh
diff --git a/scripts/missing b/build-aux/missing
similarity index 100%
rename from scripts/missing
rename to build-aux/missing
diff --git a/scripts/mkinstalldirs b/build-aux/mkinstalldirs
similarity index 100%
rename from scripts/mkinstalldirs
rename to build-aux/mkinstalldirs
diff --git a/scripts/potomo b/build-aux/potomo
similarity index 100%
rename from scripts/potomo
rename to build-aux/potomo
diff --git a/scripts/speedo.mk b/build-aux/speedo.mk
similarity index 100%
rename from scripts/speedo.mk
rename to build-aux/speedo.mk
diff --git a/scripts/texinfo.tex b/build-aux/texinfo.tex
similarity index 99%
rename from scripts/texinfo.tex
rename to build-aux/texinfo.tex
index 5063065..a181898 100644
--- a/scripts/texinfo.tex
+++ b/build-aux/texinfo.tex
@@ -20,7 +20,7 @@
 % General Public License for more details.
 %
 % You should have received a copy of the GNU General Public License
-% along with this texinfo.tex file; see the file COPYING.  If not, 
+% along with this texinfo.tex file; see the file COPYING.  If not,
 % see <http://www.gnu.org/licenses/>.
 %
 % As a special exception, when this file is read by TeX when processing
@@ -309,7 +309,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.
@@ -660,7 +660,7 @@
 \def\?{?\spacefactor=\endofsentencespacefactor\space}
 
 % @frenchspacing on|off  says whether to put extra space after punctuation.
-% 
+%
 \def\onword{on}
 \def\offword{off}
 %
@@ -1215,7 +1215,7 @@ where each line of input produces a line of output.}
 % that's what we do).
 
 % double active backslashes.
-% 
+%
 {\catcode`\@=0 \catcode`\\=\active
  @gdef at activebackslashdouble{%
    @catcode`@\=@active
@@ -1227,11 +1227,11 @@ where each line of input produces a line of output.}
 % us) handles it with this amazing macro to replace tokens, with minor
 % changes for Texinfo.  It is included here under the GPL by permission
 % from the author, Heiko Oberdiek.
-% 
+%
 % #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%
@@ -1459,7 +1459,7 @@ output) for that.)}
       % 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
@@ -1851,7 +1851,7 @@ end
 
 % Definitions for a main text size of 11pt.  This is the default in
 % Texinfo.
-% 
+%
 \def\definetextfontsizexi{%
 % Text fonts (11.2pt, magstep1).
 \def\textnominalsize{11pt}
@@ -1976,7 +1976,7 @@ end
 % 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}
@@ -2062,7 +2062,7 @@ end
 \setfont\secsf\sfbshape{12}{1000}{OT1}
 \let\secbf\secrm
 \setfont\secsc\scbshape{10}{\magstep1}{OT1}
-\font\seci=cmmi12 
+\font\seci=cmmi12
 \font\secsy=cmsy10 scaled \magstep1
 
 % Subsection fonts (10pt).
@@ -2103,7 +2103,7 @@ end
 % 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}
 %
@@ -2113,7 +2113,7 @@ end
   %
   % 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
@@ -2399,7 +2399,7 @@ end
 % 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}
@@ -2530,7 +2530,7 @@ end
 % @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}%
@@ -2542,7 +2542,7 @@ end
 
 % @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}%
@@ -2561,43 +2561,43 @@ end
 % 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
@@ -2621,7 +2621,7 @@ end
 % 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
@@ -2937,7 +2937,7 @@ end
     % 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
@@ -3733,7 +3733,7 @@ end
   % 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}
@@ -3741,12 +3741,12 @@ end
   % @end macro
   % ...
   % @funindex commtest
-  % 
+  %
   % The above is not enough to reproduce the bug, but it gives the flavor.
-  % 
+  %
   % Sample whatsit resulting:
   % . at write3{\entry{xyz}{@folio }{@code {xyz at endinput }}}
-  % 
+  %
   % So:
   \let\endinput = \empty
   %
@@ -3982,11 +3982,11 @@ end
   % 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
 }
 
@@ -4114,7 +4114,7 @@ end
     % 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.
@@ -5096,11 +5096,11 @@ end
   % 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
@@ -5158,7 +5158,7 @@ end
 % 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
@@ -5759,8 +5759,8 @@ end
 % 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
     '%
@@ -5772,7 +5772,7 @@ end
 % 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
     `%
@@ -6301,7 +6301,7 @@ end
 % 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
@@ -7483,7 +7483,7 @@ should work if nowhere else does.}
      \setnonasciicharscatcode\active
      \lattwochardefs
   %
-  \else \ifx \declaredencoding \latone 
+  \else \ifx \declaredencoding \latone
      \setnonasciicharscatcode\active
      \latonechardefs
   %
@@ -7495,7 +7495,7 @@ should work if nowhere else does.}
      \setnonasciicharscatcode\active
      \utfeightchardefs
   %
-  \else 
+  \else
     \message{Unknown document encoding #1, ignoring.}%
   %
   \fi % utfeight
@@ -7507,7 +7507,7 @@ should work if nowhere else does.}
 
 % A message to be logged when using a character that isn't available
 % the default font encoding (OT1).
-% 
+%
 \def\missingcharmsg#1{\message{Character missing in OT1 encoding: #1.}}
 
 % Take account of \c (plain) vs. \, (Texinfo) difference.
@@ -7520,21 +7520,21 @@ should work if nowhere else does.}
 %
 % Latin1 (ISO-8859-1) character definitions.
 \def\latonechardefs{%
-  \gdef^^a0{~} 
+  \gdef^^a0{~}
   \gdef^^a1{\exclamdown}
-  \gdef^^a2{\missingcharmsg{CENT SIGN}} 
+  \gdef^^a2{\missingcharmsg{CENT SIGN}}
   \gdef^^a3{{\pounds}}
   \gdef^^a4{\missingcharmsg{CURRENCY SIGN}}
   \gdef^^a5{\missingcharmsg{YEN SIGN}}
-  \gdef^^a6{\missingcharmsg{BROKEN BAR}} 
+  \gdef^^a6{\missingcharmsg{BROKEN BAR}}
   \gdef^^a7{\S}
-  \gdef^^a8{\"{}} 
-  \gdef^^a9{\copyright} 
+  \gdef^^a8{\"{}}
+  \gdef^^a9{\copyright}
   \gdef^^aa{\ordf}
-  \gdef^^ab{\missingcharmsg{LEFT-POINTING DOUBLE ANGLE QUOTATION MARK}} 
+  \gdef^^ab{\missingcharmsg{LEFT-POINTING DOUBLE ANGLE QUOTATION MARK}}
   \gdef^^ac{$\lnot$}
-  \gdef^^ad{\-} 
-  \gdef^^ae{\registeredsymbol} 
+  \gdef^^ad{\-}
+  \gdef^^ae{\registeredsymbol}
   \gdef^^af{\={}}
   %
   \gdef^^b0{\textdegree}
@@ -7561,7 +7561,7 @@ should work if nowhere else does.}
   \gdef^^c2{\^A}
   \gdef^^c3{\~A}
   \gdef^^c4{\"A}
-  \gdef^^c5{\ringaccent A} 
+  \gdef^^c5{\ringaccent A}
   \gdef^^c6{\AE}
   \gdef^^c7{\cedilla C}
   \gdef^^c8{\`E}
@@ -7702,7 +7702,7 @@ should work if nowhere else does.}
   \gdef^^d6{\"O}
   \gdef^^d7{$\times$}
   \gdef^^d8{\v R}
-  \gdef^^d9{\ringaccent U} 
+  \gdef^^d9{\ringaccent U}
   \gdef^^da{\'U}
   \gdef^^db{\H U}
   \gdef^^dc{\"U}
@@ -7746,11 +7746,11 @@ should work if nowhere else does.}
 }
 
 % UTF-8 character definitions.
-% 
+%
 % This code to support UTF-8 is based on LaTeX's utf8.def, with some
 % changes for Texinfo conventions.  It is included here under the GPL by
 % permission from Frank Mittelbach and the LaTeX team.
-% 
+%
 \newcount\countUTFx
 \newcount\countUTFy
 \newcount\countUTFz
@@ -8576,7 +8576,7 @@ should work if nowhere else does.}
 
 % Same as @turnoffactive except outputs \ as {\tt\char`\\} instead of
 % the literal character `\'.
-% 
+%
 @def at normalturnoffactive{%
   @let\=@normalbackslash
   @let"=@normaldoublequote
diff --git a/configure.ac b/configure.ac
index 8bca728..45481cc 100644
--- a/configure.ac
+++ b/configure.ac
@@ -63,7 +63,7 @@ PACKAGE=$PACKAGE_NAME
 PACKAGE_GT=${PACKAGE_NAME}2
 VERSION=$PACKAGE_VERSION
 
-AC_CONFIG_AUX_DIR([scripts])
+AC_CONFIG_AUX_DIR([build-aux])
 AC_CONFIG_SRCDIR([sm/gpgsm.c])
 AC_CONFIG_HEADER([config.h])
 # Note: For automake 1.13 add the option

-----------------------------------------------------------------------

Summary of changes:
 Makefile.am                                 |   19 +--
 autogen.rc                                  |   43 ++++++
 autogen.sh                                  |  200 +++++++++++++++++----------
 {scripts => build-aux}/ChangeLog-2011       |    0
 {scripts => build-aux}/build-all.sh         |    0
 {scripts => build-aux}/compile              |    0
 {scripts => build-aux}/config.guess         |    0
 {scripts => build-aux}/config.rpath         |    0
 {scripts => build-aux}/config.sub           |    0
 {scripts => build-aux}/depcomp              |    0
 {scripts => build-aux}/git-hooks/commit-msg |    0
 {scripts => build-aux}/git-log-fix          |    0
 {scripts => build-aux}/git-log-footer       |    0
 {scripts => build-aux}/gitlog-to-changelog  |    0
 {scripts => build-aux}/install-sh           |    0
 {scripts => build-aux}/mail-to-translators  |    9 +-
 {scripts => build-aux}/mdate-sh             |    0
 {scripts => build-aux}/missing              |    0
 {scripts => build-aux}/mkinstalldirs        |    0
 {scripts => build-aux}/potomo               |    0
 {scripts => build-aux}/speedo.mk            |    0
 {scripts => build-aux}/texinfo.tex          |  116 ++++++++--------
 configure.ac                                |    2 +-
 23 files changed, 240 insertions(+), 149 deletions(-)
 create mode 100644 autogen.rc
 rename {scripts => build-aux}/ChangeLog-2011 (100%)
 rename {scripts => build-aux}/build-all.sh (100%)
 rename {scripts => build-aux}/compile (100%)
 rename {scripts => build-aux}/config.guess (100%)
 rename {scripts => build-aux}/config.rpath (100%)
 rename {scripts => build-aux}/config.sub (100%)
 rename {scripts => build-aux}/depcomp (100%)
 rename {scripts => build-aux}/git-hooks/commit-msg (100%)
 rename {scripts => build-aux}/git-log-fix (100%)
 rename {scripts => build-aux}/git-log-footer (100%)
 rename {scripts => build-aux}/gitlog-to-changelog (100%)
 rename {scripts => build-aux}/install-sh (100%)
 rename {scripts => build-aux}/mail-to-translators (95%)
 rename {scripts => build-aux}/mdate-sh (100%)
 rename {scripts => build-aux}/missing (100%)
 rename {scripts => build-aux}/mkinstalldirs (100%)
 rename {scripts => build-aux}/potomo (100%)
 rename {scripts => build-aux}/speedo.mk (100%)
 rename {scripts => build-aux}/texinfo.tex (99%)


hooks/post-receive
-- 
The GNU Privacy Guard
http://git.gnupg.org




More information about the Gnupg-commits mailing list