Remove user_path_dir() wrapper

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

diff --git a/config/spl-meta.m4 b/config/spl-meta.m4
index ccda74d870dd78732fa0797675dc89eca6e413df..0561fbbc580ec2d23b6e9076ea105cc2630e0676 100644 (file)
--- a/config/spl-meta.m4
+++ b/config/spl-meta.m4
@@ -56,8 +56,8 @@ AC_DEFUN([SPL_AC_META], [
                fi
 
                SPL_META_RELEASE=_SPL_AC_META_GETVAL([Release]);
-               if git rev-parse --git-dir > /dev/null 2>&1; then
-                       _match="${SPL_META_NAME}-${SPL_META_VERSION}*"
+               if test ! -f ".nogitrelease" && git rev-parse --git-dir > /dev/null 2>&1; then
+                       _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
@@ -76,6 +76,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" &&