summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGaetan Nadon <memsize@videotron.ca>2010-05-17 07:37:28 -0400
committerGaetan Nadon <memsize@videotron.ca>2010-05-27 09:01:52 -0400
commit2dd06a9bcfa6868260421ae803fa7d34a5d3a0c9 (patch)
tree4664cf716d58162103a1dcad005a145ac4cc8477
parent99f9a3efe2ba46f9ba446b72a402f239e3357c12 (diff)
XORG_RELEASE_VERSION: remove option --with-release-version #24816
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 Reviewed-by: Alan Coopersmith <alan.coopersmith@oracle.com> Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
-rw-r--r--xorgversion.m415
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])