From 3f5a0af50bdd5302dfc3a7dd37a3008672d52ca5 Mon Sep 17 00:00:00 2001 From: Matthieu Herrb Date: Thu, 15 Mar 2007 23:28:28 +0000 Subject: regen --- proto/xf86bigfontproto/aclocal.m4 | 20 +++++++++++++++++++- proto/xf86bigfontproto/configure | 23 +++++++++++++++++++++++ 2 files changed, 42 insertions(+), 1 deletion(-) (limited to 'proto/xf86bigfontproto') diff --git a/proto/xf86bigfontproto/aclocal.m4 b/proto/xf86bigfontproto/aclocal.m4 index c47ab9c68..8a4a26e4f 100644 --- a/proto/xf86bigfontproto/aclocal.m4 +++ b/proto/xf86bigfontproto/aclocal.m4 @@ -568,7 +568,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, @@ -581,5 +582,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/proto/xf86bigfontproto/configure b/proto/xf86bigfontproto/configure index 3d4080bfb..65e18bc60 100644 --- a/proto/xf86bigfontproto/configure +++ b/proto/xf86bigfontproto/configure @@ -1694,6 +1694,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 xf86bigfontproto.pc" cat >confcache <<\_ACEOF -- cgit v1.2.3