diff options
| author | Matthieu Herrb <matthieu@cvs.openbsd.org> | 2007-03-16 00:19:22 +0000 |
|---|---|---|
| committer | Matthieu Herrb <matthieu@cvs.openbsd.org> | 2007-03-16 00:19:22 +0000 |
| commit | e889f63b0fdd45de06f2be8d7db2f83816835b4a (patch) | |
| tree | b7ca0127ac31e05856f2efddf92c089ce3789e71 /font/encodings | |
| parent | f41e5c719f41d4bc243f3a8b295042d214625cac (diff) | |
regen
Diffstat (limited to 'font/encodings')
| -rw-r--r-- | font/encodings/aclocal.m4 | 20 | ||||
| -rw-r--r-- | font/encodings/configure | 23 |
2 files changed, 42 insertions, 1 deletions
diff --git a/font/encodings/aclocal.m4 b/font/encodings/aclocal.m4 index 07910687f..121c2d971 100644 --- a/font/encodings/aclocal.m4 +++ b/font/encodings/aclocal.m4 @@ -601,7 +601,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, @@ -614,5 +615,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/font/encodings/configure b/font/encodings/configure index 505922935..2f56620bf 100644 --- a/font/encodings/configure +++ b/font/encodings/configure @@ -1851,6 +1851,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 large/Makefile" cat >confcache <<\_ACEOF |