diff options
| author | Matthieu Herrb <matthieu@cvs.openbsd.org> | 2006-12-16 20:59:17 +0000 |
|---|---|---|
| committer | Matthieu Herrb <matthieu@cvs.openbsd.org> | 2006-12-16 20:59:17 +0000 |
| commit | 0f89778bb91852ec3345e971c072341ccc662853 (patch) | |
| tree | d36727f30a62a75a023ea805029be8afc5ddd006 /xserver/aclocal.m4 | |
| parent | 3303f04e5d0542a9fb093f27c34331b7693c9ad2 (diff) | |
- merge xserver 1.1.99.903
- regen generated files
Diffstat (limited to 'xserver/aclocal.m4')
| -rw-r--r-- | xserver/aclocal.m4 | 22 |
1 files changed, 20 insertions, 2 deletions
diff --git a/xserver/aclocal.m4 b/xserver/aclocal.m4 index bc8eb1e75..e278c1797 100644 --- a/xserver/aclocal.m4 +++ b/xserver/aclocal.m4 @@ -7454,7 +7454,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 @@ -7858,7 +7858,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, @@ -7871,6 +7872,23 @@ 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 | cut -d . -f 1`], + [Major version of this package]) + PVM=`echo $PACKAGE_VERSION | cut -d . -f 2` + 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 | cut -d . -f 3` + if test "x$PVP" = "x"; then + PVP="0" + fi + AC_DEFINE_UNQUOTED([PACKAGE_VERSION_PATCHLEVEL], + [$PVP], + [Patch version of this package]) ]) dnl $XdotOrg: lib/xtrans/xtrans.m4,v 1.6 2005/07/26 18:59:11 alanc Exp $ |