version: fix handling of SAMBA_VERSION_VENDOR_PATCH.

We need a string version of this, or else version.c does not compile.

Michael

diff --git a/source/lib/version.c b/source/lib/version.c
index 3982646f567b93d1fc06a732c8f29b7cc93ffc56..271a3c4f77f829c891c196886a6b485d930c3b20 100644 (file)
--- 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 695fc7dd9cd6ae65b928797f2a931feb8671273f..08b3a382227ff0d9e179122757ec3e55bf6364c4 100755 (executable)
--- 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