From 1f7fc12d9630a3ee785f131ca67bf033b3616f9a Mon Sep 17 00:00:00 2001
From: Ben Kibbey <bjk@luxsci.net>
Date: Tue, 25 May 2010 21:47:45 -0400
Subject: [PATCH] Added LIBPWMD_VERSION_MAJOR, LIBPWMD_VERSION_MINOR and
 LIBPWMD_VERSION_PATCH.

---
 configure.ac           | 8 ++++----
 doc/doxygen.conf.in.in | 2 +-
 src/Makefile.am        | 2 +-
 src/libpwmd.h.in       | 5 ++++-
 4 files changed, 10 insertions(+), 7 deletions(-)

diff --git a/configure.ac b/configure.ac
index ae2bf3cb..24b2bb42 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,6 +1,6 @@
 dnl Process this file with autoconf to produce a configure script.
 AC_PREREQ(2.60)
-AC_INIT(libpwmd, 6.0.3, [Ben Kibbey bjk@luxsci.net])
+AC_INIT(libpwmd, 6.0.3-git, [Ben Kibbey bjk@luxsci.net])
 AC_CONFIG_AUX_DIR(build)
 AC_CANONICAL_TARGET
 AM_INIT_AUTOMAKE([foreign])
@@ -15,12 +15,12 @@ AM_GNU_GETTEXT_VERSION([0.16.1])
 AC_CONFIG_SUBDIRS([assuan])
 
 VER_MAJOR="`echo "$VERSION" | sed 's/\([[0-9]]*\)\.\([[0-9]]*\)\.\([[0-9]]*\).*/\1/'`"
-VER_COMPAT="`echo "$VERSION" | sed 's/\([[0-9]]*\)\.\([[0-9]]*\)\.\([[0-9]]*\).*/\2/'`"
+VER_MINOR="`echo "$VERSION" | sed 's/\([[0-9]]*\)\.\([[0-9]]*\)\.\([[0-9]]*\).*/\2/'`"
 VER_PATCH="`echo "$VERSION" | sed 's/\([[0-9]]*\)\.\([[0-9]]*\)\.\([[0-9]]*\).*/\3/'`"
 AC_SUBST(VER_MAJOR)
-AC_SUBST(VER_COMPAT)
+AC_SUBST(VER_MINOR)
 AC_SUBST(VER_PATCH)
-VER_STRING="\"$VER_MAJOR.$VER_COMPAT.$VER_PATCH\""
+VER_STRING="\"$VERSION\""
 AC_SUBST(VER_STRING)
 
 case "$target_os" in
diff --git a/doc/doxygen.conf.in.in b/doc/doxygen.conf.in.in
index 53ff2629..340094df 100644
--- a/doc/doxygen.conf.in.in
+++ b/doc/doxygen.conf.in.in
@@ -31,7 +31,7 @@ PROJECT_NAME           = libpwmd
 # This could be handy for archiving the generated documentation or 
 # if some version control system is used.
 
-PROJECT_NUMBER         = @VER_MAJOR@.@VER_COMPAT@.@VER_PATCH@
+PROJECT_NUMBER         = @VER_MAJOR@.@VER_MINOR@.@VER_PATCH@
 
 # The OUTPUT_DIRECTORY tag is used to specify the (relative or absolute) 
 # base path where the generated documentation will be put. 
diff --git a/src/Makefile.am b/src/Makefile.am
index 604dfa26..fb1d6daa 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -4,7 +4,7 @@ lib_LTLIBRARIES = libpwmd.la
 libpwmd_ladir = $(includedir)
 libpwmd_la_SOURCES = libpwmd.c libpwmd.h types.h gettext.h mem.h misc.c misc.h
 libpwmd_la_HEADERS = libpwmd.h
-libpwmd_la_LDFLAGS = -version-info @VER_MAJOR@:@VER_PATCH@:@VER_COMPAT@ \
+libpwmd_la_LDFLAGS = -version-info @VER_MAJOR@:@VER_PATCH@:@VER_MINOR@ \
     @GPG_ERROR_LIBS@ @LTLIBINTL@
 libpwmd_la_CFLAGS = -DLOCALEDIR=\"${prefix}/share/locale\" @GPG_ERROR_CFLAGS@
 libpwmd_la_LIBADD = ${top_builddir}/assuan/libassuan.la
diff --git a/src/libpwmd.h.in b/src/libpwmd.h.in
index 63aa8795..e22156ba 100644
--- a/src/libpwmd.h.in
+++ b/src/libpwmd.h.in
@@ -177,7 +177,10 @@ extern "C" {
  *
  * The version of this library.
  */
-#define LIBPWMD_VERSION 0x@VER_MAJOR@@VER_COMPAT@@VER_PATCH@
+#define LIBPWMD_VERSION 0x@VER_MAJOR@@VER_MINOR@@VER_PATCH@
+#define LIBPWMD_VERSION_MAJOR @VER_MAJOR@
+#define LIBPWMD_VERSION_MINOR @VER_MINOR@
+#define LIBPWMD_VERSION_PATCH @VER_PATCH@
 #define LIBPWMD_VERSION_STR @VER_STRING@
 
 
-- 
2.11.4.GIT