Don't link gpgv with libreadline

Also add a useful .gitignore file.

.gitignore

@@ -0,0 +1,74 @@
+Makefile.in
+aclocal.m4
+autom4te.cache/
+configure
+config.h.in
+config.h
+config.log
+config.status
+doc/stamp-vti
+po/POTFILES
+stamp-h1
+Makefile
+.deps/
+tools/gpg-zip
+*.o
+po/en@boldquot.insert-header
+po/en@boldquot.po
+po/en@quot.insert-header
+po/en@quot.po
+po/stamp-po
+po/gnupg.pot
+g10/gpg
+g10/gpgv
+mpi/sysdep.h
+mpi/asm-syntax.h
+mpi/mpi-asm-defs.h
+mpi/mpih-add1.S
+mpi/mpih-lshift.S
+mpi/mpih-mul1.S
+mpi/mpih-mul2.S
+mpi/mpih-mul3.S
+mpi/mpih-rshift.S
+mpi/mpih-sub1.S
+mpi/_mpih-add1.s
+mpi/_mpih-lshift.s
+mpi/_mpih-mul1.s
+mpi/_mpih-mul2.s
+mpi/_mpih-mul3.s
+mpi/_mpih-rshift.s
+mpi/_mpih-sub1.s
+keyserver/gpgkeys_curl
+keyserver/gpgkeys_finger
+keyserver/gpgkeys_hkp
+keyserver/gpgkeys_ldap
+keyserver/gpgkeys_mailto
+keyserver/gpgkeys_test
+checks/data-32000
+checks/data-500
+checks/data-80000
+checks/data-9000
+checks/gpg_dearmor
+checks/plain-1
+checks/plain-2
+checks/plain-3
+checks/plain-large
+checks/prepared.stamp
+checks/pubring.gpg
+checks/pubring.pkr
+checks/secring.gpg
+checks/secring.skr
+cipher/libcipher.a
+doc/gnupg1.info
+doc/gpg.1
+doc/gpg.ru.1
+doc/gpgv.1
+doc/version.texi
+po/gnupg2.pot
+tools/bftest
+tools/gpgtar
+tools/mpicalc
+tools/shmtest
+mpi/libmpi.a
+util/libcompat.a
+util/libutil.a

g10/ChangeLog

@@ -1,3 +1,9 @@
+2011-02-23  Werner Koch  <wk@g10code.com>
+
+	* Makefile.am (LDADD): Move LIBREADLINE to ..
+	(gpg_LDADD): here.  Fixes bug#1318.
+	* gpgv.c (rl_cleanup_after_signal, rl_free_line_state): New stubs.
+
 2010-10-29  David Shaw  <dshaw@jabberwocky.com>
 
 	* gpg.c (main): Do not provide a default for
@@ -13725,7 +13731,7 @@ Thu Feb 12 22:24:42 1998  Werner Koch  (wk@frodo)
 
 
  Copyright 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006,
-	   2007, 2008, 2009, 2010 Free Software Foundation, Inc.
+	   2007, 2008, 2009, 2010, 2011 Free Software Foundation, Inc.
 
  This file is free software; as a special exception the author gives
  unlimited permission to copy and/or distribute it, with or without

g10/Makefile.am

@@ -126,8 +126,8 @@ gpgv_SOURCES = gpgv.c           \
 	      $(common_source)  \
 	      verify.c
 
-LDADD =  $(needed_libs) $(other_libs) @ZLIBS@ @W32LIBS@ @LIBREADLINE@
+LDADD =  $(needed_libs) $(other_libs) @ZLIBS@ @W32LIBS@
-gpg_LDADD = $(LDADD) @DLLIBS@ @NETLIBS@ @LIBUSB@
+gpg_LDADD = $(LDADD) @LIBREADLINE@ @DLLIBS@ @NETLIBS@ @LIBUSB@
 
 $(PROGRAMS): $(needed_libs)
 

g10/gpgv.c

@@ -425,6 +425,8 @@ void init_ttyfp (void) { }
 #ifdef HAVE_LIBREADLINE
 void tty_enable_completion(rl_completion_func_t *completer) {}
 void tty_disable_completion(void) {}
+void rl_cleanup_after_signal (void) {}
+void rl_free_line_state (void) {}
 #endif
 
 /* We do not do any locking, so use these stubs here */

po/.gitattributes

@@ -0,0 +1,7 @@
+# You should add
+#[filter "cleanpo"]
+#        clean = "awk '/^\"POT-Creation-Date:/&&!s{s=1;next};!/^#: /{print}'"
+# to your config file.  Normally, autogen.sh does this for you.
+
+/??.po     filter=cleanpo
+/??_??.po  filter=cleanpo

po/remove-potcdate.sed

@@ -1,11 +0,0 @@
-/^"POT-Creation-Date: .*"$/{
-x
-s/P/P/
-ta
-g
-d
-bb
-:a
-x
-:b
-}

scripts/ChangeLog

@@ -1,3 +1,7 @@
+2011-02-23  Werner Koch  <wk@g10code.com>
+
+	* autogen.sh: Add git setup checking.
+
 2010-10-18  Werner Koch  <wk@g10code.com>
 
 	* config.guess: Update to version 2010-09-24.

scripts/autogen.sh

@@ -262,13 +262,36 @@ 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 <<EOF >&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 ${ACLOCAL_FLAGS:+$ACLOCAL_FLAGS }..."
 $ACLOCAL -I m4 $ACLOCAL_FLAGS
 echo "Running autoheader..."
 $AUTOHEADER
 echo "Running automake --gnu --add-missing..."
-$AUTOMAKE --gnu --add-missing;
+$AUTOMAKE --gnu --add-missing
 echo "Running autoconf..."
 $AUTOCONF
 
-echo "You may now run \"./configure --enable-maintainer-mode && make\"."
+echo "You may now run
+  ./configure --enable-maintainer-mode && make
+"