summaryrefslogtreecommitdiff
path: root/source3/VERSION
diff options
context:
space:
mode:
authorAndreas Schneider <anschneider@suse.de>2008-07-17 12:25:31 +0200
committerStefan Metzmacher <metze@samba.org>2008-07-17 14:16:19 +0200
commit2a8ebdca535aed431d51270a2bdcafce0b55bb12 (patch)
tree58ed9b0cb4cc500a80e267a9ce584ff4bda3e3b4 /source3/VERSION
parent848558026f8c10366db07053714557a9840e8bc9 (diff)
downloadsamba-2a8ebdca535aed431d51270a2bdcafce0b55bb12.tar.gz
samba-2a8ebdca535aed431d51270a2bdcafce0b55bb12.tar.bz2
samba-2a8ebdca535aed431d51270a2bdcafce0b55bb12.zip
Simplify samba_version_string.
This adds a new macro for a vender version function which will be returned by the samba_version_string() function if defined. Signed-off-by: Andreas Schneider <anschneider@suse.de> Signed-off-by: Stefan Metzmacher <metze@samba.org> (This used to be commit 8b9301fbc73f28c657ec81c605760a0ff7a1973a)
Diffstat (limited to 'source3/VERSION')
-rw-r--r--source3/VERSION30
1 files changed, 18 insertions, 12 deletions
diff --git a/source3/VERSION b/source3/VERSION
index c8206c804f..758956e9f7 100644
--- a/source3/VERSION
+++ b/source3/VERSION
@@ -72,8 +72,6 @@ SAMBA_VERSION_IS_GIT_SNAPSHOT=yes
########################################################
# This can be set by vendors if they want... #
-# This can be a string constant or a function which #
-# returns a string (const char *) #
# #
# <MAJOR>.<MINOR>.<RELEASE>[...]-<VENDOR_SUFFIX> #
# #
@@ -82,18 +80,26 @@ SAMBA_VERSION_IS_GIT_SNAPSHOT=yes
# e.g. SAMBA_VERSION_VENDOR_SUFFIX="VendorVersion" #
# -> "CVS 3.0.0rc2-VendorVersion" #
# #
-# Note: If you want to use a function, #
-# then patch lib/version.c and add this function #
-# there, because the symbol must be available in #
-# binary. #
+# Note: If you want to use a function, take a look at #
+# SAMBA_VERSION_VENDOR_FUNCTION #
# #
-# const char *vendor_version(void) #
+########################################################
+SAMBA_VERSION_VENDOR_SUFFIX="test"
+SAMBA_VERSION_VENDOR_PATCH=
+
+########################################################
+# This can be set by vendors if they want.. #
+# This have to be a function which returns a string #
+# (const char *). #
+# #
+# Patch for example lib/version.c and add something #
+# like the following example: #
+# #
+# const char *samba_vendor_version(void) #
# { #
-# return "VendorVersion"; #
+# return SAMBA_VERSION_OFFICIAL_STRING "-ENREDO-1.0" #
# } #
# #
-# e.g. SAMBA_VERSION_VENDOR_SUFFIX=vendor_version() #
-# -> "CVS 3.0.0rc2-VendorVersion" #
+# -> "Version 3.2.0-ENREDO-1.0 #
########################################################
-SAMBA_VERSION_VENDOR_SUFFIX="test"
-SAMBA_VERSION_VENDOR_PATCH=
+SAMBA_VERSION_VENDOR_FUNCTION=