From 83ea0c2a3656f6dd50e71ab706eeedc892c9a8ee Mon Sep 17 00:00:00 2001 From: Michael Adam Date: Thu, 19 Mar 2009 18:29:09 +0100 Subject: [PATCH] version: fix handling of SAMBA_VERSION_VENDOR_PATCH. We need a string version of this, or else version.c does not compile. Michael (cherry picked from commit f846e0fcdf62333b44a16e5a392930189b512f9b) --- source/lib/version.c | 2 +- source/script/mkversion.sh | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/source/lib/version.c b/source/lib/version.c index 3982646f567..271a3c4f77f 100644 --- a/source/lib/version.c +++ b/source/lib/version.c @@ -29,7 +29,7 @@ const char *samba_version_string(void) #ifdef SAMBA_VERSION_VENDOR_SUFFIX #ifdef SAMBA_VERSION_VENDOR_PATCH return SAMBA_VERSION_OFFICIAL_STRING "-" SAMBA_VERSION_VENDOR_SUFFIX \ - "-" SAMBA_VERSION_VENDOR_PATCH; + "-" SAMBA_VERSION_VENDOR_PATCH_STRING; #endif /* SAMBA_VERSION_VENDOR_PATCH */ return SAMBA_VERSION_OFFICIAL_STRING "-" SAMBA_VERSION_VENDOR_SUFFIX; #endif /* SAMBA_VERSION_VENDOR_SUFFIX */ diff --git a/source/script/mkversion.sh b/source/script/mkversion.sh index 695fc7dd9cd..08b3a382227 100755 --- a/source/script/mkversion.sh +++ b/source/script/mkversion.sh @@ -112,6 +112,7 @@ if test -n "${SAMBA_VERSION_VENDOR_SUFFIX}";then SAMBA_VERSION_STRING="${SAMBA_VERSION_STRING}-${SAMBA_VERSION_VENDOR_SUFFIX}" if test -n "${SAMBA_VERSION_VENDOR_PATCH}";then echo "#define SAMBA_VERSION_VENDOR_PATCH ${SAMBA_VERSION_VENDOR_PATCH}" >> $OUTPUT_FILE + echo "#define SAMBA_VERSION_VENDOR_PATCH_STRING \"${SAMBA_VERSION_VENDOR_PATCH}\"" >> $OUTPUT_FILE SAMBA_VERSION_STRING="${SAMBA_VERSION_STRING}-${SAMBA_VERSION_VENDOR_PATCH}" fi fi -- 2.11.4.GIT