diff options
| author | Matthieu Herrb <matthieu@cvs.openbsd.org> | 2007-03-16 00:03:55 +0000 |
|---|---|---|
| committer | Matthieu Herrb <matthieu@cvs.openbsd.org> | 2007-03-16 00:03:55 +0000 |
| commit | f41e5c719f41d4bc243f3a8b295042d214625cac (patch) | |
| tree | b380acbd3462dd4ad103afd3aa1dd01b94258509 /app/xkbutils | |
| parent | 3f5a0af50bdd5302dfc3a7dd37a3008672d52ca5 (diff) | |
regen
Diffstat (limited to 'app/xkbutils')
| -rw-r--r-- | app/xkbutils/aclocal.m4 | 20 | ||||
| -rw-r--r-- | app/xkbutils/config.h.in | 9 | ||||
| -rw-r--r-- | app/xkbutils/configure | 23 |
3 files changed, 51 insertions, 1 deletions
diff --git a/app/xkbutils/aclocal.m4 b/app/xkbutils/aclocal.m4 index e447613ca..215937597 100644 --- a/app/xkbutils/aclocal.m4 +++ b/app/xkbutils/aclocal.m4 @@ -1116,7 +1116,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, @@ -1129,5 +1130,22 @@ 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]) ]) diff --git a/app/xkbutils/config.h.in b/app/xkbutils/config.h.in index c364eda45..1ca40928b 100644 --- a/app/xkbutils/config.h.in +++ b/app/xkbutils/config.h.in @@ -18,5 +18,14 @@ /* Define to the version of this package. */ #undef PACKAGE_VERSION +/* Major version of this package */ +#undef PACKAGE_VERSION_MAJOR + +/* Minor version of this package */ +#undef PACKAGE_VERSION_MINOR + +/* Patch version of this package */ +#undef PACKAGE_VERSION_PATCHLEVEL + /* Version number of package */ #undef VERSION diff --git a/app/xkbutils/configure b/app/xkbutils/configure index 0b91db57f..0edad4bbf 100644 --- a/app/xkbutils/configure +++ b/app/xkbutils/configure @@ -3462,6 +3462,29 @@ fi; echo "$as_me: Building with package name set to $PACKAGE" >&6;} fi +cat >>confdefs.h <<_ACEOF +#define PACKAGE_VERSION_MAJOR `echo $PACKAGE_VERSION | cut -d . -f 1` +_ACEOF + + PVM=`echo $PACKAGE_VERSION | cut -d . -f 2` + if test "x$PVM" = "x"; then + PVM="0" + fi + +cat >>confdefs.h <<_ACEOF +#define PACKAGE_VERSION_MINOR $PVM +_ACEOF + + PVP=`echo $PACKAGE_VERSION | cut -d . -f 3` + if test "x$PVP" = "x"; then + PVP="0" + fi + +cat >>confdefs.h <<_ACEOF +#define PACKAGE_VERSION_PATCHLEVEL $PVP +_ACEOF + + ac_config_files="$ac_config_files Makefile" cat >confcache <<\_ACEOF |