dch: close a bug and refresh timestamp.

[mirror_spl-debian.git] / config / spl-meta.m4

diff --git a/config/spl-meta.m4 b/config/spl-meta.m4
index a51fa797eefb7f89e9eb0478dbfde37313f0a23a..fbfaec4ab5192267dfbb7e4bcfae3e8919774eb4 100644 (file)
--- a/config/spl-meta.m4
+++ b/config/spl-meta.m4
@@ -57,12 +57,20 @@ AC_DEFUN([SPL_AC_META], [
 
                SPL_META_RELEASE=_SPL_AC_META_GETVAL([Release]);
                if test ! -f ".nogitrelease" && git rev-parse --git-dir > /dev/null 2>&1; then
-                       _match="${SPL_META_NAME}-${SPL_META_VERSION}*"
+                       _match="${SPL_META_NAME}-${SPL_META_VERSION}"
                        _alias=$(git describe --match=${_match} 2>/dev/null)
                        _release=$(echo ${_alias}|cut -f3- -d'-'|sed 's/-/_/g')
                        if test -n "${_release}"; then
                                SPL_META_RELEASE=${_release}
                                _spl_ac_meta_type="git describe"
+                       else
+                               _match="${SPL_META_NAME}-${SPL_META_VERSION}-${SPL_META_RELEASE}"
+                               _alias=$(git describe --match=${_match} 2>/dev/null)
+                               _release=$(echo ${_alias}|cut -f3- -d'-'|sed 's/-/_/g')
+                               if test -n "${_release}"; then
+                                       SPL_META_RELEASE=${_release}
+                                       _spl_ac_meta_type="git describe"
+                               fi
                        fi
                fi
 
@@ -76,6 +84,14 @@ AC_DEFUN([SPL_AC_META], [
                        AC_SUBST([RELEASE])
                fi
 
+               SPL_META_LICENSE=_SPL_AC_META_GETVAL([License]);
+               if test -n "$SPL_META_LICENSE"; then
+                       AC_DEFINE_UNQUOTED([SPL_META_LICENSE], ["$SPL_META_LICENSE"],
+                               [Define the project license.]
+                       )
+                       AC_SUBST([SPL_META_LICENSE])
+               fi
+
                if test -n "$SPL_META_NAME" -a -n "$SPL_META_VERSION"; then
                                SPL_META_ALIAS="$SPL_META_NAME-$SPL_META_VERSION"
                                test -n "$SPL_META_RELEASE" &&