summaryrefslogtreecommitdiff
path: root/configure.ac
diff options
context:
space:
mode:
authorPeter Breitenlohner <peb@mppmu.mpg.de>2008-11-14 22:26:06 +0100
committerPaulo Cesar Pereira de Andrade <pcpa@mandriva.com.br>2008-11-29 05:13:32 -0200
commitb8a5186c585b4f01971457f0d59cc7480cf528e8 (patch)
tree8cab6c2b3a6acb78a0a2ed26f76343d255f01c1d /configure.ac
parenta3a533044de7c8c360d0de312ac75b32db04e35e (diff)
reorganize autoconf macro files
append xorgversion.m4 to xorg-macros.m4.in, instead of installing it as separate file. Avoid copying some code from xorgversion.m4 to configure.ac.
Diffstat (limited to 'configure.ac')
-rw-r--r--configure.ac20
1 files changed, 6 insertions, 14 deletions
diff --git a/configure.ac b/configure.ac
index 676a70d..78daa0d 100644
--- a/configure.ac
+++ b/configure.ac
@@ -27,18 +27,10 @@ AC_INIT([util-macros],
[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
+
+AC_OUTPUT([Makefile xorg-macros.m4:xorg-macros.m4.in:xorgversion.m4])