From 5a0d2a5abc0a707c20449b6afd37daa9fd373a18 Mon Sep 17 00:00:00 2001
From: Werner Koch <wk@gnupg.org>
Date: Thu, 1 Dec 2011 15:48:55 +0100
Subject: Fix for newer autoconf version.

* Makefile.am (EXTRA_DIST): Fix filename.
* configure.ac (my_full_version): New.
(AC_INIT):  Use new macro.  Change bug address to the bug tracker URL.
---
 .gitignore   | 39 +++++++++++++++++++++++++++++++++++++++
 Makefile.am  |  2 +-
 configure.ac |  9 ++++-----
 3 files changed, 44 insertions(+), 6 deletions(-)

diff --git a/.gitignore b/.gitignore
index 6b8851e..e7fc0df 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,9 @@
+*.lo
+*.o
+.deps/
+.libs/
+po/*.gmo
+po/messages.mo
 Makefile.in
 aclocal.m4
 autom4te.cache/
@@ -5,3 +11,36 @@ configure
 config.h.in
 src/err-codes.h
 src/err-sources.h
+/lang/Makefile
+/lang/cl/Makefile
+/lang/cl/gpg-error-codes.lisp
+/lang/cl/gpg-error.asd
+/libtool
+/m4/Makefile
+/po/Makefile
+/po/POTFILES
+/po/stamp-po
+/config.log
+/config.status
+/config.h
+/Makefile
+/src/Makefile
+/src/code-from-errno.h
+/src/code-to-errno.h
+/src/err-codes-sym.h
+/src/err-sources-sym.h
+/src/errnos-sym.h
+/src/extra-h.in
+/src/gpg-error
+/src/gpg-error-config
+/src/gpg-error.def
+/src/gpg-error.h
+/src/libgpg-error.la
+/src/mkerrcodes
+/src/mkerrcodes.h
+/src/mkw32errmap.map.c
+/src/versioninfo.rc
+/stamp-h1
+/tests/Makefile
+/tests/t-strerror
+/tests/t-syserror
diff --git a/Makefile.am b/Makefile.am
index e92925b..7c92ff6 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -22,7 +22,7 @@ AUTOMAKE_OPTIONS = dist-bzip2
 
 EXTRA_DIST = autogen.sh config.rpath libgpg-error.spec.in 		\
              COPYING COPYING.LIB potomo doc/HACKING ChangeLog-2011   	\
-	     po/ChangeLog-2011m4/ChangeLog-2011 contrib/ChangeLog-2011 	\
+	     po/ChangeLog-2011 m4/ChangeLog-2011 contrib/ChangeLog-2011 \
              build-aux/gitlog-to-changelog build-aux/git-log-footer	\
              build-aux/git-log-fix
 
diff --git a/configure.ac b/configure.ac
index a2ad1dd..ee42f9e 100644
--- a/configure.ac
+++ b/configure.ac
@@ -31,10 +31,9 @@ m4_define([svn_revision], m4_esyscmd([printf "%d" $(svn info 2>/dev/null \
           | sed -n '/^Revision:/ s/[^0-9]//gp'|head -1)]))
 m4_define([git_revision], m4_esyscmd([git branch -v 2>/dev/null \
           | awk '/^\* / {printf "%s",$3}']))
-AC_INIT([libgpg-error],
-        [my_version[]m4_if(my_issvn,[yes],
-        [m4_if(git_revision,[],[-svn[]svn_revision],[-git[]git_revision])])],
-        [bug-gnupg@gnupg.org])
+m4_define([my_full_version], [my_version[]m4_if(my_issvn,[yes],
+          [m4_if(git_revision,[],[-svn[]svn_revision],[-git[]git_revision])])])
+AC_INIT([libgpg-error],[my_full_version], [http://bugs.gnupg.org])
 # LT Version numbers, remember to change them just *before* a release.
 #   (Code changed:			REVISION++)
 #   (Interfaces added/removed/changed:	CURRENT++, REVISION=0)
@@ -150,7 +149,6 @@ AC_SUBST(GPG_ERROR_CONFIG_LIBS)
 AC_SUBST(GPG_ERROR_CONFIG_CFLAGS)
 AC_SUBST(GPG_ERROR_CONFIG_ISUBDIRAFTER)
 AC_SUBST(GPG_ERROR_CONFIG_HOST)
-AC_CONFIG_FILES([src/gpg-error-config], [chmod +x src/gpg-error-config])
 
 
 # Special defines for certain platforms
@@ -193,6 +191,7 @@ AC_CONFIG_FILES([po/Makefile.in m4/Makefile])
 AC_CONFIG_FILES([src/Makefile tests/Makefile])
 AC_CONFIG_FILES([lang/Makefile lang/cl/Makefile lang/cl/gpg-error.asd])
 AC_CONFIG_FILES([src/versioninfo.rc])
+AC_CONFIG_FILES([src/gpg-error-config], [chmod +x src/gpg-error-config])
 
 AC_OUTPUT
 
-- 
cgit v1.2.3