From 2a8ebdca535aed431d51270a2bdcafce0b55bb12 Mon Sep 17 00:00:00 2001 From: Andreas Schneider Date: Thu, 17 Jul 2008 12:25:31 +0200 Subject: 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 Signed-off-by: Stefan Metzmacher (This used to be commit 8b9301fbc73f28c657ec81c605760a0ff7a1973a) --- source3/script/mkversion.sh | 6 ++++++ 1 file changed, 6 insertions(+) (limited to 'source3/script') diff --git a/source3/script/mkversion.sh b/source3/script/mkversion.sh index b678476976..695fc7dd9c 100755 --- a/source3/script/mkversion.sh +++ b/source3/script/mkversion.sh @@ -30,6 +30,8 @@ SAMBA_VERSION_RELEASE_NICKNAME=`sed -n 's/^SAMBA_VERSION_RELEASE_NICKNAME=//p' $ SAMBA_VERSION_VENDOR_SUFFIX=`sed -n 's/^SAMBA_VERSION_VENDOR_SUFFIX=//p' $SOURCE_DIR$VERSION_FILE` SAMBA_VERSION_VENDOR_PATCH=`sed -n 's/^SAMBA_VERSION_VENDOR_PATCH=//p' $SOURCE_DIR$VERSION_FILE` +SAMBA_VERSION_VENDOR_FUNCTION=`sed -n 's/^SAMBA_VERSION_VENDOR_FUNCTION=//p' $SOURCE_DIR$VERSION_FILE` + echo "/* Autogenerated by script/mkversion.sh */" > $OUTPUT_FILE echo "#define SAMBA_VERSION_MAJOR ${SAMBA_VERSION_MAJOR}" >> $OUTPUT_FILE @@ -101,6 +103,10 @@ echo "#define SAMBA_VERSION_OFFICIAL_STRING \"${SAMBA_VERSION_STRING}\"" >> $OUT ## ## Add the vendor string if present ## +if test -n "${SAMBA_VERSION_VENDOR_FUNCTION}"; then + echo "#define SAMBA_VERSION_VENDOR_FUNCTION ${SAMBA_VERSION_VENDOR_FUNCTION}" >> $OUTPUT_FILE +fi + if test -n "${SAMBA_VERSION_VENDOR_SUFFIX}";then echo "#define SAMBA_VERSION_VENDOR_SUFFIX ${SAMBA_VERSION_VENDOR_SUFFIX}" >> $OUTPUT_FILE SAMBA_VERSION_STRING="${SAMBA_VERSION_STRING}-${SAMBA_VERSION_VENDOR_SUFFIX}" -- cgit