sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2025-02-03 13:47:25 +03:00
Code

Reorder defines for version for consistency with Samba 4.

Browse Source 
(This used to be commit fe36d83508a6b1a8de5ad58ec1d0c80cda7b4a21)
This commit is contained in:
Jelmer Vernooij 2008-09-12 12:38:54 +02:00
parent 9c28ca2b6c
commit 41ebc6fe73
2 changed files with 16 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
source3/lib/version.c
View File

@ -23,16 +23,5 @@
const char *samba_version_string(void)
{
#ifdef SAMBA_VERSION_VENDOR_FUNCTION
return SAMBA_VERSION_VENDOR_FUNCTION;
#else /* SAMBA_VERSION_VENDOR_FUNCTION */
#ifdef SAMBA_VERSION_VENDOR_SUFFIX
#ifdef SAMBA_VERSION_VENDOR_PATCH
return SAMBA_VERSION_OFFICIAL_STRING "-" SAMBA_VERSION_VENDOR_SUFFIX \
"-" SAMBA_VERSION_VENDOR_PATCH;
#endif /* SAMBA_VERSION_VENDOR_PATCH */
return SAMBA_VERSION_OFFICIAL_STRING "-" SAMBA_VERSION_VENDOR_SUFFIX;
#endif /* SAMBA_VERSION_VENDOR_SUFFIX */
#endif /* SAMBA_VERSION_VENDOR_FUNCTION */
return SAMBA_VERSION_OFFICIAL_STRING;
return SAMBA_VERSION_STRING;
}

16
source3/script/mkversion.sh
View File

@ -124,7 +124,21 @@ if test -n "${SAMBA_VERSION_RELEASE_NICKNAME}";then
SAMBA_VERSION_STRING="${SAMBA_VERSION_STRING} (${SAMBA_VERSION_RELEASE_NICKNAME})"
fi
echo "#define SAMBA_VERSION_STRING samba_version_string()" >> $OUTPUT_FILE
cat >>$OUTPUT_FILE<<CEOF
#ifdef SAMBA_VERSION_VENDOR_FUNCTION
# define SAMBA_VERSION_STRING SAMBA_VERSION_VENDOR_FUNCTION
#else /* SAMBA_VERSION_VENDOR_FUNCTION */
# ifdef SAMBA_VERSION_VENDOR_SUFFIX
# ifdef SAMBA_VERSION_VENDOR_PATCH
# define SAMBA_VERSION_STRING SAMBA_VERSION_OFFICIAL_STRING "-" SAMBA_VERSION_VENDOR_SUFFIX "-" SAMBA_VERSION_VENDOR_PATCH
# else /* SAMBA_VERSION_VENDOR_PATCH */
# define SAMBA_VERSION_STRING SAMBA_VERSION_OFFICIAL_STRING "-" SAMBA_VERSION_VENDOR_SUFFIX
# endif /* SAMBA_VERSION_VENDOR_SUFFIX */
# else /* SAMBA_VERSION_VENDOR_FUNCTION */
# define SAMBA_VERSION_STRING SAMBA_VERSION_OFFICIAL_STRING
# endif
#endif
CEOF
echo "$0: '$OUTPUT_FILE' created for Samba(\"${SAMBA_VERSION_STRING}\")"