diff options
| author | Jelmer Vernooij <jelmer@samba.org> | 2008-09-12 12:38:54 +0200 |
|---|---|---|
| committer | Jelmer Vernooij <jelmer@samba.org> | 2008-09-12 12:38:54 +0200 |
| commit | fe36d83508a6b1a8de5ad58ec1d0c80cda7b4a21 (patch) | |
| tree | 579a3737022c8cc628e49fec948faa18fd2fc88c | |
| parent | 3111428dd42abf856f646f2a3aa2ee78ff3d3702 (diff) | |
| download | samba-fe36d83508a6b1a8de5ad58ec1d0c80cda7b4a21.tar.gz | |
Reorder defines for version for consistency with Samba 4.
| -rw-r--r-- | source/lib/version.c | 13 | ||||
| -rwxr-xr-x | source/script/mkversion.sh | 16 |
2 files changed, 16 insertions, 13 deletions
diff --git a/source/lib/version.c b/source/lib/version.c index 3982646f567..55fb53c5db7 100644 --- a/source/lib/version.c +++ b/source/lib/version.c @@ -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; } diff --git a/source/script/mkversion.sh b/source/script/mkversion.sh index 695fc7dd9cd..a55aafcd0c2 100755 --- a/source/script/mkversion.sh +++ b/source/script/mkversion.sh @@ -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}\")" |