qbit/xenocara
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

util-macros 1.1.3 from X.Org 7.2RC3

Browse Source
This commit is contained in:
matthieu 2006-12-16 18:18:29 +00:00
parent 98ee6405c2
commit e16ebbdea2
4 changed files with 35 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
util/macros/ChangeLog
View File

@ -1,3 +1,17 @@
commit e091014e3c7573a49ce51d67f359bd0f3d3e1893
Author: Daniel Stone <daniel@fooishbar.org>
Date: Thu Nov 30 22:05:27 2006 +0200
bump to 1.1.3
commit f15961997e9f5986857ed0b143cbaafda1a84cb8
Author: Andres Salomon <dilinger@debian.org>
Date: Thu Nov 30 22:05:13 2006 +0200
xorgversion: automatic PACKAGE_VERSION_* (bug #8590)
Automatically define PACKAGE_VERSION_{MAJOR,MINOR,PATCHLEVEL} when
XORG_RELEASE_VERSION is called.
commit 0d92c7e31df95c09a9cf1215e9ccb069da97f27a
Author: Daniel Stone <daniel@fooishbar.org>
Date: Wed Nov 8 16:38:16 2006 +0200

2
util/macros/configure.ac
View File

@ -23,7 +23,7 @@ dnl Process this file with autoconf to create configure.
AC_PREREQ([2.57])
AC_INIT([util-macros],
[1.1.2],
[1.1.3],
[https://bugs.freedesktop.org/enter_bug.cgi?product=xorg])
AM_INIT_AUTOMAKE([foreign dist-bzip2])

2
util/macros/xorg-macros.m4
View File

@ -45,7 +45,7 @@ AC_DEFUN([XORG_MACROS_VERSION],[
XORG_MACROS_needed_major=`echo $XORG_MACROS_needed_version | sed 's/\..*$//'`
XORG_MACROS_needed_minor=`echo $XORG_MACROS_needed_version | sed -e 's/^[0-9]*\.//' -e 's/\..*$//'`]
AC_MSG_CHECKING([if xorg-macros used to generate configure is at least ${XORG_MACROS_needed_major}.${XORG_MACROS_needed_minor}])
[XORG_MACROS_version=1.1.2
[XORG_MACROS_version=1.1.3
XORG_MACROS_major=`echo $XORG_MACROS_version | sed 's/\..*$//'`
XORG_MACROS_minor=`echo $XORG_MACROS_version | sed -e 's/^[0-9]*\.//' -e 's/\..*$//'`]
if test $XORG_MACROS_major -ne $XORG_MACROS_needed_major ; then

20
util/macros/xorgversion.m4
View File

@ -27,7 +27,8 @@ dnl
# --------------------
# 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.
# no option is given, PACKAGE and PACKAGE_TARNAME are unchanged. Also
# defines PACKAGE_VERSION_{MAJOR,MINOR,PATCHLEVEL} for modules to use.
AC_DEFUN([XORG_RELEASE_VERSION],[
AC_ARG_WITH(release-version,
@ -40,4 +41,21 @@ AC_DEFUN([XORG_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 | sed -ne 's/^\([[^\.]]\+\).*/\1/p'`],
[Major version of this package])
PVM=`echo $PACKAGE_VERSION | sed -ne 's/^\([[^\.]]\+\)\.\([[^\.]]\+\).*/\2/p'`
if test "x$PVM" = "x"; then
PVM="0"
fi
AC_DEFINE_UNQUOTED([PACKAGE_VERSION_MINOR],
[$PVM],
[Minor version of this package])
PVP=`echo $PACKAGE_VERSION | sed -ne 's/^\([[^\.]]\+\)\.\([[^\.]]\+\)\.\([[^\.]]\+\).*/\3/p'`
if test "x$PVP" = "x"; then
PVP="0"
fi
AC_DEFINE_UNQUOTED([PACKAGE_VERSION_PATCHLEVEL],
[$PVP],
[Patch version of this package])
])