8 files changed, 165 insertions, 8 deletions

diff --git a/Makefile.am b/Makefile.am
index a2e7189..e6bec2f 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -33,14 +33,14 @@ AM_LDFLAGS				= @LTLIBINTL@
 AM_CFLAGS                               = -O2 -W -Wall -Werror
 AM_CXXFLAGS                             = -O2 -W -Wall -Werror
 AM_OBJCFLAGS                            = -O2 -W -Wall -Werror
-AM_CPPFLAGS                             = -O2 -W -Wall -Werror -DHAVE_COMMON_H=1 -I$(top_srcdir)/include
+AM_CPPFLAGS                             = -O2 -W -Wall -Werror -DHAVE_COMMON_H=1 -I$(top_builddir)/include -I$(top_srcdir)/include
 ACLOCAL_AMFLAGS                         = -I m4
 DEFS                                    = -DLOCALEDIR="\"$(localedir)\"" @DEFS@
 
 
 # automake targets
 bin_PROGRAMS                            = src/bindump src/bitcopy src/bitops src/dmsversion src/numconvert src/typedef-info
-include_HEADERS                         = include/dms.h
+include_HEADERS                         = include/dms.h include/dmsversion.h
 lib_LTLIBRARIES                         = lib/libdms.la
 noinst_PROGRAMS                         =
 noinst_HEADERS                          = src/common.h
@@ -57,6 +57,7 @@ lib_libdms_la_LDFLAGS			= -rpath '$(libdir)' \
                                           -pthread \
                                           -export-symbols $(srcdir)/lib/libdms.sym
 lib_libdms_la_SOURCES                   = include/dms.h \
+                                          include/dmsversion.h \
                                           lib/libdms.h \
                                           lib/libdms_version.c \
                                           lib/libdms_version.h
@@ -141,10 +142,12 @@ src_typedef_info_SOURCES		= $(noinst_HEADERS) \
 
 
 # lists
+BUILT_SOURCES                           = include/dmsversion.h
 TESTS                                   =
 XFAIL_TESTS                             =
 EXTRA_DIST                              = build-aux/config.rpath \
                                           build-aux/git-package-version \
+                                          include/dmsversion.h.in \
                                           include/gettext.h \
                                           lib/libdms.sym \
                                           $(srcdir)/dmstools.tags \
@@ -164,6 +167,7 @@ CLEANFILES				= \
                                           $(builddir)/*/a.out $(srcdir)/*/a.out \
                                           config.h.in~ $(srcdir)/config.h.in~ \
                                           $(man_MANS) \
+                                          include/dmsversion.h \
                                           @PACKAGE_TARNAME@-*.tar.* \
                                           @PACKAGE_TARNAME@-*.zip
 
@@ -176,12 +180,22 @@ do_subst = sed \
         -e 's,[@]PACKAGE_TARNAME[@],@PACKAGE_TARNAME@,g' \
         -e 's,[@]PACKAGE_BUGREPORT[@],@PACKAGE_BUGREPORT@,g' \
         -e 's|[@]PACKAGE_COPYRIGHT[@]|@PACKAGE_COPYRIGHT@|g' \
+        -e 's,[@]LIB_VERSION_CURRENT[@],@LIB_VERSION_CURRENT@,g' \
+        -e 's,[@]LIB_VERSION_REVISION[@],@LIB_VERSION_REVISION@,g' \
+        -e 's,[@]LIB_VERSION_AGE[@],@LIB_VERSION_AGE@,g' \
+        -e 's,[@]LIB_VERSION_INFO[@],@LIB_VERSION_INFO@,g' \
+        -e 's,[@]LIB_RELEASE_INFO[@],@LIB_RELEASE_INFO@,g' \
         -e 's,[@]RELEASE_MONTH[@],@RELEASE_MONTH@,g'
 do_subst_fn = \
                 echo "do_subst < ${@}.in > ${@}"; \
                 mkdir -p `dirname ${@}` || exit 1; \
                 ${do_subst} < $(srcdir)/${@}.in > ${@} || exit 1; \
                 chmod 0755 ${@}
+do_subst_dt = \
+                echo "do_subst < ${@}.in > ${@}"; \
+                mkdir -p `dirname ${@}` || exit 1; \
+                ${do_subst} < $(srcdir)/${@}.in > ${@} || exit 1; \
+                chmod 0644 ${@}
 
 
 # custom targets
@@ -203,7 +217,11 @@ build-aux/git-package-version:
         $(top_builddir)/config.status --recheck
 
 doc/codetagger.1: Makefile $(srcdir)/doc/codetagger.1.in
-        @$(do_subst_fn)
+        @$(do_subst_dt)
+
+include/dmsversion.h: Makefile $(srcdir)/include/dmsversion.h.in
+        $(mkdir_p) include
+        @$(do_subst_dt)
 
 license-tags: $(srcdir)/dmstools.tags $(builddir)/src/codetagger
         $(builddir)/src/codetagger -f $(srcdir)/dmstools.tags $(srcdir)/AUTHORS
diff --git a/configure.ac b/configure.ac
index 57319e1..1186cf4 100644
--- a/configure.ac
+++ b/configure.ac
@@ -38,8 +38,11 @@ AC_DEFINE_UNQUOTED(PACKAGE_COPYRIGHT, ["$PACKAGE_COPYRIGHT"], ["Copyright info"]
 #    Age        -- How many seqential past API versions is supported by
 #                  this implementation
 # Format => Current:Revision:Age
-AC_SUBST(LIB_VERSION_INFO, 2:1:1)
-AC_SUBST(LIB_RELEASE_INFO, 2) # used by Win32 DLLs
+AC_SUBST([LIB_VERSION_CURRENT],  [0])
+AC_SUBST([LIB_VERSION_REVISION], [0])
+AC_SUBST([LIB_VERSION_AGE],      [0])
+AC_SUBST([LIB_VERSION_INFO], [${LIB_VERSION_CURRENT}:${LIB_VERSION_REVISION}:${LIB_VERSION_AGE}])
+AC_SUBST([LIB_RELEASE_INFO], [${LIB_VERSION_CURRENT}]) # used by Win32 DLLs
 
 AC_CONFIG_AUX_DIR([build-aux])
 AC_CONFIG_SRCDIR([dmstools.tags])
diff --git a/dmstools.xcodeproj/project.pbxproj b/dmstools.xcodeproj/project.pbxproj
index 368e3ad..afb91c5 100644
--- a/dmstools.xcodeproj/project.pbxproj
+++ b/dmstools.xcodeproj/project.pbxproj
@@ -30,9 +30,11 @@
                 A07BC6F10F0210CF00219629 /* bitops.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = bitops.c; sourceTree = "<group>"; };
                 A08B43A010FCD1580091D7C8 /* dms.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = dms.h; sourceTree = "<group>"; };
                 A08B43A310FCD1670091D7C8 /* libdms.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = libdms.h; sourceTree = "<group>"; };
-                A08B43A410FCD1670091D7C8 /* libdms.sym */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = libdms.sym; sourceTree = "<group>"; };
+                A08B43A410FCD1670091D7C8 /* libdms.sym */ = {isa = PBXFileReference; explicitFileType = text.script; fileEncoding = 4; path = libdms.sym; sourceTree = "<group>"; };
                 A08B43A710FCD1670091D7C8 /* libdms_version.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = libdms_version.c; sourceTree = "<group>"; };
                 A08B43A810FCD1670091D7C8 /* libdms_version.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = libdms_version.h; sourceTree = "<group>"; };
+                A08B43AD10FCD73F0091D7C8 /* dmsversion.h.in */ = {isa = PBXFileReference; explicitFileType = sourcecode.c; fileEncoding = 4; path = dmsversion.h.in; sourceTree = "<group>"; };
+                A08B43D110FD0B280091D7C8 /* dmsversion.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = dmsversion.c; sourceTree = "<group>"; };
                 A0AE375510EAAA3C006B1ADB /* typedef-info.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = "typedef-info.c"; sourceTree = "<group>"; };
                 A0AF031210F540EB00CBC28C /* bindump.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = bindump.c; sourceTree = "<group>"; };
                 A0B6D45D1033A3BA004E87EE /* numconvert.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = numconvert.c; sourceTree = "<group>"; };
@@ -75,6 +77,7 @@
                                 A07BC6F10F0210CF00219629 /* bitops.c */,
                                 A004228B0E0E3C4200B0ED60 /* codetagger.c */,
                                 A004228C0E0E3C4200B0ED60 /* common.h */,
+                                A08B43D110FD0B280091D7C8 /* dmsversion.c */,
                                 A0B6D45D1033A3BA004E87EE /* numconvert.c */,
                                 A004228D0E0E3C4200B0ED60 /* posixregex.c */,
                                 A007E66F0EB09C51008A1261 /* recurse.c */,
@@ -104,6 +107,7 @@
                         isa = PBXGroup;
                         children = (
                                 A08B43A010FCD1580091D7C8 /* dms.h */,
+                                A08B43AD10FCD73F0091D7C8 /* dmsversion.h.in */,
                         );
                         path = include;
                         sourceTree = "<group>";
diff --git a/include/dms.h b/include/dms.h
index 1c9a5dd..2aa3374 100644
--- a/include/dms.h
+++ b/include/dms.h
@@ -106,6 +106,7 @@
 ///////////////
 
 #include <inttypes.h>
+#include <dmsversion.h>
 
 
 ///////////////////
@@ -134,6 +135,24 @@
 //////////////////
 BEGIN_C_DECLS
 
+// returns the binary GNU Libtool LIB_VERSION_INFO value
+DMS_F(int) dms_lib_version PARAMS((void));
+
+// returns the GNU Libtool LIB_VERSION_AGE value
+DMS_F(int) dms_lib_version_age PARAMS((void));
+
+// checks for library binary compatability
+DMS_F(int) dms_lib_version_check PARAMS((int version));
+
+// returns the GNU Libtool LIB_VERSION_CURRENT value
+DMS_F(int) dms_lib_version_current PARAMS((void));
+
+// returns the GNU Libtool LIB_VERSION_INFO string
+DMS_F(const char *) dms_lib_version_info PARAMS((void));
+
+// returns the GNU Libtool LIB_VERSION_REVISION value
+DMS_F(int) dms_lib_version_revision PARAMS((void));
+
 // returns version info string for library
 DMS_F(const char *) dms_version PARAMS((void));
 
diff --git a/include/dmsversion.h.in b/include/dmsversion.h.in
new file mode 100644
index 0000000..646d547
--- /dev/null
+++ b/include/dmsversion.h.in
@@ -0,0 +1,48 @@
+/*
+ *  DMS Tools and Utilities
+ *  Copyright (C) 2010 David M. Syzdek <david@syzdek.net>.
+ *
+ *  @SYZDEK_LICENSE_HEADER_START@
+ *
+ *  This program is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License Version 2 as
+ *  published by the Free Software Foundation.
+ *
+ *  This program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with this program; if not, write to the Free Software
+ *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ *
+ *  @SYZDEK_LICENSE_HEADER_END@
+ */
+/**
+ *  @file lib/dms.h defines API for libdms.la
+ */
+#ifndef _DMSVERSION_H
+#define _DMSVERSION_H 1
+
+///////////////////
+//               //
+//  Definitions  //
+//               //
+///////////////////
+
+// Module Version Info (similar to libtool's library version)
+//    Current    -- the current version number of this API
+//    Revision   -- the software revision of this API version
+//    Age        -- How many seqential past API versions is supported by
+//                  this API version
+#define DMS_LIB_VERSION_CURRENT   @LIB_VERSION_CURRENT@
+#define DMS_LIB_VERSION_REVISION  @LIB_VERSION_REVISION@
+#define DMS_LIB_VERSION_AGE       @LIB_VERSION_AGE@
+#define DMS_LIB_VERSION_INFO      "@LIB_VERSION_INFO@"
+#define DMS_LIB_VERSION  ( ((@LIB_VERSION_CURRENT@  & 0xFFFF) << 16) | \
+                           ((@LIB_VERSION_REVISION@ & 0xFF)   << 8) | \
+                            (@LIB_VERSION_AGE@      & 0xFF) )
+
+
+#endif /* end of header file */
diff --git a/lib/libdms.sym b/lib/libdms.sym
index 5334bd1..65aa576 100644
--- a/lib/libdms.sym
+++ b/lib/libdms.sym
@@ -38,5 +38,11 @@
 #   Clean:
 #      libtool --mode=clean rm -f libdms.la libdms_version.lo
 #
+dms_lib_version
+dms_lib_version_age
+dms_lib_version_check
+dms_lib_version_current
+dms_lib_version_info
+dms_lib_version_revision
 dms_version
 # end of symbol export file
diff --git a/lib/libdms_version.c b/lib/libdms_version.c
index 1ce7745..19c8663 100644
--- a/lib/libdms_version.c
+++ b/lib/libdms_version.c
@@ -40,10 +40,61 @@
 //             //
 /////////////////
 
+/// returns the binary GNU Libtool LIB_VERSION_INFO value
+int dms_lib_version(void)
+{
+   return(DMS_LIB_VERSION);
+}
+
+
+/// returns the GNU Libtool LIB_VERSION_AGE value
+int dms_lib_version_age(void)
+{
+   return(DMS_LIB_VERSION_AGE);
+}
+
+
+/// checks for library binary compatability
+/// @param[in]  info    version info to compare
+int dms_lib_version_check(int version)
+{
+   int lib_cur = ((DMS_LIB_VERSION_CURRENT  >> 16) & 0xFFFF);
+   int lib_age = ((DMS_LIB_VERSION_AGE      >>  0) & 0xFF);
+   int ver_cur = ((version >> 16) & 0xFFFF);
+   int ver_age = ((version >>  0) & 0xFF);
+   if (ver_cur < (lib_cur-lib_age))
+      return(1);
+   if (lib_cur < (ver_cur-ver_age))
+      return(1);
+   return(0);
+}
+
+
+/// returns the GNU Libtool LIB_VERSION_CURRENT value
+int dms_lib_version_current(void)
+{
+   return(DMS_LIB_VERSION_CURRENT);
+}
+
+
+/// returns the GNU Libtool LIB_VERSION_INFO string
+const char * dms_lib_version_info(void)
+{
+   return(DMS_LIB_VERSION_INFO);
+}
+
+
+/// returns the GNU Libtool LIB_VERSION_REVISION value
+int dms_lib_version_revision(void)
+{
+   return(DMS_LIB_VERSION_REVISION);
+}
+
+
 /// returns version info string for library
 const char * dms_version(void)
 {
-   return("libdms.la (" PACKAGE_NAME ") " PACKAGE_VERSION);
+   return("libdms.la (" PACKAGE_NAME ") " DMS_LIB_VERSION_INFO);
 }
 
 /* end of source code */
diff --git a/src/dmsversion.c b/src/dmsversion.c
index d95eaab..865a984 100644
--- a/src/dmsversion.c
+++ b/src/dmsversion.c
@@ -123,7 +123,15 @@ int main(int argc, char * argv[])
 {
    if (argc == -1)
       printf("%s\n", argv[0]);
-   printf("%s\n", dms_version());
+   printf(_("%s (%s) %s\n"
+          "%s\n"
+          "Written by David M. Syzdek\n"
+          "\n"
+          "Copyright (C) 2010 David M. Syzdek\n"
+          "This is free software; see the source for copying conditions.  There is NO\n"
+          "warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.\n"
+      ), PROGRAM_NAME, PACKAGE_NAME, PACKAGE_VERSION, dms_version()
+   );
    return(0);
 }