[git] Scute - branch, master, updated. scute-1.3.0-50-g4983f77

[by Oleg Gurevich]

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 "PKCS#11 token on top of gpg-agent".

The branch, master has been updated
       via  4983f77cfbc810795f24e7452363413597bbe2e4 (commit)
      from  be53b88aa2b3d9e8952d89251d40bca0059bab40 (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 4983f77cfbc810795f24e7452363413597bbe2e4
Author: Oleg Gurevich <oleg at gurevich.de>
Date:   Mon Jan 11 13:50:17 2016 +0100

    Fix Windows build
    
    * configure.ac: Require newer automake version. Print configuration
    summary.
    (BUILD_REVISION): Fix.
    (BUILD_REVISION_DEC): Add and use the decimal revision where required.
    * src/scute.def: Add required 'LIBRARY' statement.
    * src/versioninfo.rc.in: Use decimal revision.
    
    Signed-off-by: Justus Winter <justus at g10code.com>

diff --git a/configure.ac b/configure.ac
index 43f1ebd..598f437 100644
--- a/configure.ac
+++ b/configure.ac
@@ -28,8 +28,8 @@
 
 # Process this file with autoconf to produce a configure script.
 
-AC_PREREQ(2.59)
-min_automake_version="1.9.3"
+AC_PREREQ(2.61)
+min_automake_version="1.14"
 
 # To build a release you need to create a tag with the version number
 # (git tag -s scute-1.n.m) and run "./autogen.sh --force".  Please
@@ -80,7 +80,12 @@ NEED_GPGSM_VERSION=1.9.6
 have_gpg_error=no
 have_libassuan=no
 
-BUILD_REVISION=svn_revision
+#
+# Provide information about the build.
+#
+BUILD_REVISION="mym4_revision"
+BUILD_REVISION_DEC="mym4_revision_dec"
+
 PACKAGE=$PACKAGE_NAME
 VERSION=$PACKAGE_VERSION
 
@@ -250,9 +255,10 @@ if test "$have_w32_system" = yes; then
     changequote(,)dnl 
     BUILD_FILEVERSION=`echo "$VERSION" | sed 's/\([0-9.]*\).*/\1./;s/\./,/g'`
     changequote([,])dnl
-    BUILD_FILEVERSION="${BUILD_FILEVERSION}${BUILD_REVISION}"
+    BUILD_FILEVERSION="${BUILD_FILEVERSION}${BUILD_REVISION_DEC}"
 fi
 AC_SUBST(BUILD_REVISION)
+AC_SUBST(BUILD_REVISION_DEC)
 AC_SUBST(BUILD_TIMESTAMP)
 AC_SUBST(BUILD_FILEVERSION)
 
@@ -467,3 +473,10 @@ AC_CONFIG_FILES([Makefile
 		 doc/Makefile
                  src/versioninfo.rc])
 AC_OUTPUT
+
+echo "
+        Scute v${VERSION} has been configured as follows:
+
+        Revision: mym4_revision  (mym4_revision_dec)
+        Platform: $host
+"
diff --git a/src/scute.def b/src/scute.def
index d0cae3f..a74a027 100644
--- a/src/scute.def
+++ b/src/scute.def
@@ -27,6 +27,8 @@
 ; not obligated to do so.  If you do not wish to do so, delete this
 ; exception statement from your version.
 
+LIBRARY scute.dll
+
 EXPORTS
     C_CancelFunction			@1
     C_CloseAllSessions			@2
diff --git a/src/versioninfo.rc.in b/src/versioninfo.rc.in
index d4f534e..6968473 100644
--- a/src/versioninfo.rc.in
+++ b/src/versioninfo.rc.in
@@ -18,7 +18,7 @@
 
 
 VS_VERSION_INFO VERSIONINFO
- FILEVERSION @LIBSCUTE_LT_CURRENT@, at LIBSCUTE_LT_AGE@, at LIBSCUTE_LT_REVISION@, at BUILD_REVISION@
+ FILEVERSION @LIBSCUTE_LT_CURRENT@, at LIBSCUTE_LT_AGE@, at LIBSCUTE_LT_REVISION@, at BUILD_REVISION_DEC@
  PRODUCTVERSION @BUILD_FILEVERSION@
  FILEFLAGSMASK 0x3fL
 #ifdef _DEBUG

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

Summary of changes:
 configure.ac          | 21 +++++++++++++++++----
 src/scute.def         |  2 ++
 src/versioninfo.rc.in |  2 +-
 3 files changed, 20 insertions(+), 5 deletions(-)


hooks/post-receive
-- 
PKCS#11 token on top of gpg-agent
http://git.gnupg.org