diff options
| author | Matthieu Herrb <matthieu@cvs.openbsd.org> | 2007-03-17 11:25:46 +0000 |
|---|---|---|
| committer | Matthieu Herrb <matthieu@cvs.openbsd.org> | 2007-03-17 11:25:46 +0000 |
| commit | c74e7df1725c1312bcd9bfaa3989140117fe2fe7 (patch) | |
| tree | 48604524cb43263b5571274fa4f199e66ef02e1d /data | |
| parent | d50db7c5e37fc749d9f57a084e850e2fdffcf623 (diff) | |
regen
Diffstat (limited to 'data')
| -rw-r--r-- | data/bitmaps/aclocal.m4 | 20 | ||||
| -rw-r--r-- | data/bitmaps/config.h.in | 9 | ||||
| -rw-r--r-- | data/bitmaps/configure | 23 |
3 files changed, 51 insertions, 1 deletions
diff --git a/data/bitmaps/aclocal.m4 b/data/bitmaps/aclocal.m4 index 7e9d5ba9b..ef4de9192 100644 --- a/data/bitmaps/aclocal.m4 +++ b/data/bitmaps/aclocal.m4 @@ -642,7 +642,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, @@ -655,5 +656,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/data/bitmaps/config.h.in b/data/bitmaps/config.h.in index c364eda45..1ca40928b 100644 --- a/data/bitmaps/config.h.in +++ b/data/bitmaps/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/data/bitmaps/configure b/data/bitmaps/configure index 64ddbc372..9fcba8b9d 100644 --- a/data/bitmaps/configure +++ b/data/bitmaps/configure @@ -1727,6 +1727,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 xbitmaps.pc" cat >confcache <<\_ACEOF |