From 3f5a0af50bdd5302dfc3a7dd37a3008672d52ca5 Mon Sep 17 00:00:00 2001 From: Matthieu Herrb Date: Thu, 15 Mar 2007 23:28:28 +0000 Subject: regen --- lib/libSM/aclocal.m4 | 20 +++++++++++++++++++- lib/libSM/config.h.in | 9 +++++++++ lib/libSM/configure | 23 +++++++++++++++++++++++ 3 files changed, 51 insertions(+), 1 deletion(-) (limited to 'lib/libSM') diff --git a/lib/libSM/aclocal.m4 b/lib/libSM/aclocal.m4 index 8a51bd3aa..a9e7b3a3c 100644 --- a/lib/libSM/aclocal.m4 +++ b/lib/libSM/aclocal.m4 @@ -7427,7 +7427,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, @@ -7440,6 +7441,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 $ diff --git a/lib/libSM/config.h.in b/lib/libSM/config.h.in index 10d85f84a..e76df5d53 100644 --- a/lib/libSM/config.h.in +++ b/lib/libSM/config.h.in @@ -57,6 +57,15 @@ /* 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 + /* Define as the return type of signal handlers (`int' or `void'). */ #undef RETSIGTYPE diff --git a/lib/libSM/configure b/lib/libSM/configure index 92457b790..9a7622761 100644 --- a/lib/libSM/configure +++ b/lib/libSM/configure @@ -20511,6 +20511,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 src/Makefile sm.pc" cat >confcache <<\_ACEOF -- cgit v1.2.3