3 files changed, 71 insertions, 2 deletions

diff --git a/Makefile.am b/Makefile.am
index df529a9..caab36e 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -148,6 +148,8 @@ EXTRA_DIST				= build-aux/config.rpath \
                                           include/dmsversion.h.in \
                                           include/gettext.h \
                                           lib/libdms.sym \
+                                          m4/dmstools_gcc.m4 \
+                                          m4/dmstools_git.m4 \
                                           $(srcdir)/dmstools.tags \
                                           $(srcdir)/doc/Doxyfile \
                                           $(srcdir)/doc/codetagger.1.in \
diff --git a/dmstools.xcodeproj/project.pbxproj b/dmstools.xcodeproj/project.pbxproj
index 399d5c3..da41810 100644
--- a/dmstools.xcodeproj/project.pbxproj
+++ b/dmstools.xcodeproj/project.pbxproj
@@ -32,7 +32,6 @@
                 A03242690E0E453700D5D5CA /* Makefile.am */ = {isa = PBXFileReference; explicitFileType = text.script.sh; fileEncoding = 4; indentWidth = 8; path = Makefile.am; sourceTree = "<group>"; tabWidth = 8; usesTabs = 1; };
                 A051283C10D987300013335E /* bitcopy.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = bitcopy.c; sourceTree = "<group>"; };
                 A07BC6F10F0210CF00219629 /* bitops.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = bitops.c; sourceTree = "<group>"; };
-                A081550411054BF3006932F1 /* .gitignore */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = .gitignore; sourceTree = "<group>"; };
                 A081550511054BF3006932F1 /* dmstools_gcc.m4 */ = {isa = PBXFileReference; explicitFileType = text.script; fileEncoding = 4; path = dmstools_gcc.m4; 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>"; };
@@ -41,6 +40,7 @@
                 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>"; };
+                A09650C01187AD83000BB8AF /* dmstools_git.m4 */ = {isa = PBXFileReference; explicitFileType = text.script; fileEncoding = 4; path = dmstools_git.m4; 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>"; };
@@ -117,7 +117,7 @@
                 A081550311054BF3006932F1 /* m4 */ = {
                         isa = PBXGroup;
                         children = (
-                                A081550411054BF3006932F1 /* .gitignore */,
+                                A09650C01187AD83000BB8AF /* dmstools_git.m4 */,
                                 A081550511054BF3006932F1 /* dmstools_gcc.m4 */,
                         );
                         path = m4;
diff --git a/m4/dmstools_git.m4 b/m4/dmstools_git.m4
new file mode 100644
index 0000000..a48a0a3
--- /dev/null
+++ b/m4/dmstools_git.m4
@@ -0,0 +1,67 @@
+#
+#   DMS Tools and Utilities
+#   Copyright (C) 2008 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@
+#
+#   acinclude.m4 - custom m4 macros used by configure.ac
+#
+
+# AC_DMS_GIT_PACKAGE_VERSION()
+# -----------------------------------
+AC_DEFUN([AC_DMS_GIT_PACKAGE_VERSION],[dnl
+
+   if test -f ${srcdir}/.git/config;then
+      GPV=$(git describe --abbrev=7 HEAD 2>/dev/null)
+      GPV=$(echo "$GPV" | sed -e 's/-/./g')
+      GPV=$(echo "$GPV" | sed -e 's/^v//g')
+      if test "x${GPV}" != "x";then
+         AC_MSG_NOTICE([using git package version ${GPV}])
+         if test -d ${ac_aux_dir};then 
+            echo ${GPV} > ${ac_aux_dir}/git-package-version
+         fi
+      fi
+   elif test -f ${ac_aux_dir}/git-package-version;then
+      GPV=$(cat ${ac_aux_dir}/git-package-version)
+      if test -d ${ac_aux_dir};then
+         AC_MSG_NOTICE([using cached git package version ${GPV}])
+      fi
+   fi
+
+   if test "x${GPV}" = "x";then
+      AC_MSG_WARN([unable to determine package version from Git tags])
+   else
+      #
+      # set internal variables
+      GIT_PACKAGE_VERSION=${GPV}
+      PACKAGE_VERSION=${GPV}
+      VERSION=${GPV}
+      #
+      # set substitution variables
+      AC_SUBST([GIT_PACKAGE_VERSION], [${GPV}])
+      AC_SUBST([PACKAGE_VERSION], [${GPV}])
+      AC_SUBST([VERSION], [${GPV}])
+      #
+      # set C/C++/Objc preprocessor macros
+      AC_DEFINE_UNQUOTED([GIT_PACKAGE_VERSION], ["${GIT_PACKAGE_VERSION}"], [package version determined from git repository])
+      AC_DEFINE_UNQUOTED([PACKAGE_VERSION], ["${GIT_PACKAGE_VERSION}"], [package version determined from git repository])
+      AC_DEFINE_UNQUOTED([VERSION], ["${GIT_PACKAGE_VERSION}"], [package version determined from git repository])
+   fi
+])dnl
+
+# end of M4 file