X-Git-Url: https://git.whamcloud.com/?p=fs%2Flustre-release.git;a=blobdiff_plain;f=config%2Flustre-version.m4;h=d5485afb559e7eb2a75ad7fc174bbc9e8321c841;hp=9507a50d01419d9fff61c400b6765dfa8008341d;hb=6d5fe29066af5f8e40055fd89b285853c363e947;hpb=ee813dbaa2a2b86f4873c4c289f62a0243aa9809

diff --git a/config/lustre-version.m4 b/config/lustre-version.m4
index 9507a50..d5485af 100644
--- a/config/lustre-version.m4
+++ b/config/lustre-version.m4
@@ -1,23 +1,20 @@
 #
-# LUSTRE_VERSION_VARIABLES
+# LUSTRE_VERSION_CPP_MACROS
 #
-AC_DEFUN([LUSTRE_VERSION_VARIABLES], [
-
+AC_DEFUN([LUSTRE_VERSION_CPP_MACROS], [
 LUSTRE_MAJOR=`echo AC_PACKAGE_VERSION | sed -re ['s/([0-9]+)\.([0-9]+)\.([0-9]+)(\.([0-9]+))?.*/\1/']`
 LUSTRE_MINOR=`echo AC_PACKAGE_VERSION | sed -re ['s/([0-9]+)\.([0-9]+)\.([0-9]+)(\.([0-9]+))?.*/\2/']`
 LUSTRE_PATCH=`echo AC_PACKAGE_VERSION | sed -re ['s/([0-9]+)\.([0-9]+)\.([0-9]+)(\.([0-9]+))?.*/\3/']`
 LUSTRE_FIX=`echo AC_PACKAGE_VERSION | sed -re ['s/([0-9]+)\.([0-9]+)\.([0-9]+)(\.([0-9]+))?.*/\5/']`
 AS_IF([test -z "$LUSTRE_FIX"], [LUSTRE_FIX="0"])
 
-m4_pattern_allow(AC_LUSTRE)
-[AC_LUSTRE_MAJOR]=$LUSTRE_MAJOR
-[AC_LUSTRE_MINOR]=$LUSTRE_MINOR
-[AC_LUSTRE_PATCH]=$LUSTRE_PATCH
-[AC_LUSTRE_FIX]=$LUSTRE_FIX
-
-AC_SUBST([AC_LUSTRE_MAJOR])
-AC_SUBST([AC_LUSTRE_MINOR])
-AC_SUBST([AC_LUSTRE_PATCH])
-AC_SUBST([AC_LUSTRE_FIX])
+AC_DEFINE_UNQUOTED([LUSTRE_MAJOR], [$LUSTRE_MAJOR], [First number in the Lustre version])
+AC_DEFINE_UNQUOTED([LUSTRE_MINOR], [$LUSTRE_MINOR], [Second number in the Lustre version])
+AC_DEFINE_UNQUOTED([LUSTRE_PATCH], [$LUSTRE_PATCH], [Third number in the Lustre version])
+AC_DEFINE_UNQUOTED([LUSTRE_FIX], [$LUSTRE_FIX], [Fourth number in the Lustre version])
+# Even though the code could just use VERSION or PACKAGE_VERSION directly,
+# we use this copy named LUSTRE_VERSION_STRING instead to maintain less
+# divergence from the Lustre client code in the upstream Linux kernel code.
+AC_DEFINE_UNQUOTED([LUSTRE_VERSION_STRING], ["$PACKAGE_VERSION"], [A copy of PACKAGE_VERSION])
 
 ])