From 61b7c3743f5c7fb2bdc3c3bc82deaf1e2db648ea Mon Sep 17 00:00:00 2001 From: Werner Koch Date: Fri, 4 Feb 2011 20:45:41 +0100 Subject: [PATCH] Add autogen.sh magic to install git hooks. --- ChangeLog | 63 ++++++++++++++++++++++++++++-------------------------- autogen.sh | 23 ++++++++++++++++++++ 2 files changed, 56 insertions(+), 30 deletions(-) diff --git a/ChangeLog b/ChangeLog index 0c906acd7..95c16c649 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2011-02-04 Werner Koch + + * autogen.sh: Ensure that the git pre-commit hoom has been + enabled. Add a cleanpo filter if not yet set. + 2011-01-13 Werner Koch Release 2.0.17. @@ -433,7 +438,7 @@ 2006-09-18 Werner Koch Released 1.9.23. - + * configure.ac (--enable-agent-only): Donot build tools and doc (--disable-tools,--disable-doc): New. * Makefile.am (SUBDIRS): Allow to conditional build tools and doc. @@ -442,7 +447,7 @@ Replaced all call gpg_error_from_errno(errno) by gpg_error_from_syserror(). - + * configure.ac: Build gpg by default. (GNUPG_SYS_SO_PEERCRED): Removed. @@ -457,7 +462,7 @@ 2006-09-06 Werner Koch * configure.ac: Define _ASSUAN_ONLY_GPG_ERRORS. Require Assuan - 0.9 and libgpg-error 1.4 + 0.9 and libgpg-error 1.4 2006-08-31 Werner Koch @@ -499,7 +504,7 @@ 2006-07-03 Werner Koch - * configure.ac: Test for ksba_dn_teststr. + * configure.ac: Test for ksba_dn_teststr. 2006-06-30 Werner Koch @@ -507,7 +512,7 @@ * Makefile.am (SUBDIRS): Include keyserver/. * configure.ac: Include keyserver/. (FAKE_CURL, GPGKEYS_CURL): New. - + 2006-06-20 Werner Koch Released 1.9.21. @@ -561,7 +566,7 @@ 2005-08-01 Werner Koch Released 1.9.18. - + * configure.ac: Require libksba 0.9.12 to match new features in gpgsm. 2005-06-20 Werner Koch @@ -598,7 +603,7 @@ 2005-04-21 Werner Koch Released 1.9.16. - + * configure.ac: Do not build gpg by default. 2005-04-20 Werner Koch @@ -613,7 +618,7 @@ 2005-04-15 Marcus Brinkmann * configure.ac: Check for /usr/bin/shred and define SHRED. - + * configure.ac: Add --enable-symcryptrun, disabled by default. Define automake variable BUILD_SYMCRYPTRUN. Check for openpty -lutil, define LIBUTIL_LIBS. @@ -656,8 +661,8 @@ 2004-12-20 Werner Koch * configure.ac: Add PATHSEP_C and PATHSEP_S. For W32 let all - directories default to c:/gnupg. Require libassuan 0.6.9. - + directories default to c:/gnupg. Require libassuan 0.6.9. + 2004-12-18 Werner Koch * configure.ac (AH_BOTTOM): Define EXEEXT_S. @@ -687,7 +692,7 @@ * configure.ac: Replace strsep. Replaced use of "target" by "host". - + 2004-10-22 Werner Koch Released 1.9.12. @@ -710,7 +715,7 @@ * configure.ac: Build Makefile for tests/pkits. New option --with-pkits-tests. - + 2004-08-05 Werner Koch * configure.ac: Changed tests for libusb to also suuport the @@ -775,7 +780,7 @@ 2004-03-06 Werner Koch Released 1.9.6. - + * configure.ac: Check the Libgcrypt API. 2004-02-25 Werner Koch @@ -863,7 +868,7 @@ 2003-11-17 Werner Koch Release 1.9.2. - + * configure.ac: Requires now libassuan 0.6.1. 2003-10-31 Werner Koch @@ -879,12 +884,12 @@ 2003-10-01 Werner Koch - * configure.ac (AH_BOTTOM): Define GNUPG_MAJOR_VERSION. + * configure.ac (AH_BOTTOM): Define GNUPG_MAJOR_VERSION. 2003-09-23 Werner Koch Merged most of David Shaw's changes in 1.3 since 2003-06-03. - + * configure.ac: Drop all TIGER/192 support. (uint64_t): Check for UINT64_C to go along with uint64_t. (getaddrinfo): Check for it. @@ -898,7 +903,7 @@ 2003-09-06 Werner Koch Released 1.9.1. - + * configure.ac: Require newer versions of some libraries. 2003-09-02 Werner Koch @@ -919,9 +924,9 @@ 2003-08-05 Werner Koch Released 1.9.0. - + * configure.ac (GNUPG_DEFAULT_HONMEDIR): Changed back to ~/.gnupg. - + 2003-07-31 Werner Koch * Makefile.am (DISTCLEANFILES): Add g10defs.h @@ -944,7 +949,7 @@ * configure.ac: Build a limited version of scdaemon if libopensc is not available. - + * configure.ac (ALL_LINUGAS): Removed. * Makefile.am (ACLOCAL_AMFLAGS): New. @@ -966,10 +971,10 @@ 2003-01-09 Werner Koch - * configure.ac (GNUPG_PROTECT_TOOL): New option --with-protect-tool. + * configure.ac (GNUPG_PROTECT_TOOL): New option --with-protect-tool. (NEED_KSBA_VERSION): Does now require 0.4.6. - * README: Noted where to find gpg-protect-tool. + * README: Noted where to find gpg-protect-tool. 2002-10-31 Neal H. Walfield @@ -1025,7 +1030,7 @@ 2002-08-10 Werner Koch Released 0.3.10. - + * configure.ac (NEED_LIBKSBA_VERSION): Require 0.4.4. Add support for gettext. @@ -1036,7 +1041,7 @@ 2002-07-01 Werner Koch Released 0.3.9. - + * README: Short note on how to export in pkcs-12 format. 2002-06-29 Werner Koch @@ -1053,7 +1058,7 @@ 2002-06-25 Werner Koch Released 0.3.8. - + * configure.ac (NEED_LIBGCRYPT_VERSION): Set to 1.1.8. 2002-06-12 Werner Koch @@ -1071,7 +1076,7 @@ 2002-05-14 Werner Koch * doc/: New - * configure.ac, Makefile.am: Added doc/ + * configure.ac, Makefile.am: Added doc/ 2002-05-03 Werner Koch @@ -1088,9 +1093,9 @@ 2002-04-15 Werner Koch Released 0.3.5. - + * NEWS: Started to describe release notes. - + * configure.ac (NEED_LIBKSBA_VERSION, NEED_LIBGCRYPT_VERSION): Defined 2002-04-01 Werner Koch @@ -1186,5 +1191,3 @@ This file 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. - - diff --git a/autogen.sh b/autogen.sh index be284594c..69cf5ec2a 100755 --- a/autogen.sh +++ b/autogen.sh @@ -199,6 +199,29 @@ EOF fi +# Check the git setup. +if [ -d .git ]; then + if [ -f .git/hooks/pre-commit.sample -a ! -f .git/hooks/pre-commit ] ; then + cat <&2 +*** Activating trailing whitespace git pre-commit hook. *** + For more information see this thread: + http://mail.gnome.org/archives/desktop-devel-list/2009-May/msg00084html + To deactivate this pre-commit hook again move .git/hooks/pre-commit + and .git/hooks/pre-commit.sample out of the way. +EOF + cp -av .git/hooks/pre-commit.sample .git/hooks/pre-commit + chmod -c +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 + echo "*** Adding GIT filter.cleanpo.clean configuration." >&2 + git config --add filter.cleanpo.clean \ + "awk '/^\"POT-Creation-Date:/&&!s{s=1;next};!/^#: /{print}'" + fi +fi + + echo "Running aclocal -I m4 -I gl/m4 ${ACLOCAL_FLAGS:+$ACLOCAL_FLAGS }..." $ACLOCAL -I m4 -I gl/m4 $ACLOCAL_FLAGS echo "Running autoheader..."