diff options
Diffstat (limited to 'util-macros/configure.ac')
| -rw-r--r-- | util-macros/configure.ac | 23 |
1 files changed, 8 insertions, 15 deletions
diff --git a/util-macros/configure.ac b/util-macros/configure.ac index 676a70d..36153dc 100644 --- a/util-macros/configure.ac +++ b/util-macros/configure.ac @@ -23,22 +23,15 @@ dnl Process this file with autoconf to create configure. AC_PREREQ([2.57]) AC_INIT([util-macros], - [1.1.6], + [1.2.1], [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg]) AM_INIT_AUTOMAKE([foreign dist-bzip2]) -# Since this is the package that installs the xorgversion.m4 file, we -# cannot use it here. Therefore, we copy the code from the m4 file. -# Please try to keep them in sync. -AC_ARG_WITH(release-version, - AC_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 +# This is the package that installs xorgversion.m4 as part of xorg-macros.m4. +# In order to use xorgversion.m4 here, we include it explicitly. +m4_include([xorgversion.m4]) -AC_OUTPUT([Makefile xorg-macros.m4]) +XORG_RELEASE_VERSION +XORG_CHANGELOG + +AC_OUTPUT([Makefile xorg-macros.m4:xorg-macros.m4.in:xorgversion.m4]) |