[PATCH util-macros] XORG_RELEASE_VERSION: remove option --with-release-version #24816

[Alan Coopersmith]

Gaetan Nadon wrote:
> The short story:
> - this option has never been used by OS builders as intended
> - the implementation changes automake internals
> - the implementation breaks a few makefiles (if used)
> - one less option for the user to be confused with on all 240 xorg modules
> 
> The long story:
> https://bugs.freedesktop.org/show_bug.cgi?id=24816
> 
> Signed-off-by: Gaetan Nadon <memsize at videotron.ca>
> ---
>  xorgversion.m4 |   15 +--------------
>  1 files changed, 1 insertions(+), 14 deletions(-)
> 
> diff --git a/xorgversion.m4 b/xorgversion.m4
> index ff4f796..017fb51 100644
> --- a/xorgversion.m4
> +++ b/xorgversion.m4
> @@ -25,22 +25,9 @@ dnl
>  
>  # XORG_RELEASE_VERSION
>  # --------------------
> -# Adds --with/without-release-string and changes the PACKAGE and
> -# PACKAGE_TARNAME to use "$PACKAGE{_TARNAME}-$RELEASE_VERSION".  If
> -# no option is given, PACKAGE and PACKAGE_TARNAME are unchanged.  Also
> -# defines PACKAGE_VERSION_{MAJOR,MINOR,PATCHLEVEL} for modules to use.
> +# Defines PACKAGE_VERSION_{MAJOR,MINOR,PATCHLEVEL} for modules to use.
>   
>  AC_DEFUN([XORG_RELEASE_VERSION],[
> -	AC_ARG_WITH(release-version,
> -			AS_HELP_STRING([--with-release-version=STRING],
> -				[Use release version string in package name]),
> -			[RELEASE_VERSION="$withval"],
> -			[RELEASE_VERSION=""])
> -	if test "x$RELEASE_VERSION" != "x"; then
> -		PACKAGE="$PACKAGE-$RELEASE_VERSION"
> -		PACKAGE_TARNAME="$PACKAGE_TARNAME-$RELEASE_VERSION"
> -		AC_MSG_NOTICE([Building with package name set to $PACKAGE])
> -	fi
>  	AC_DEFINE_UNQUOTED([PACKAGE_VERSION_MAJOR],
>  		[`echo $PACKAGE_VERSION | cut -d . -f 1`],
>  		[Major version of this package])

Reviewed-by: Alan Coopersmith <alan.coopersmith at oracle.com>

-- 
	-Alan Coopersmith-        alan.coopersmith at oracle.com
	 Oracle Solaris Platform Engineering: X Window System