diff options
| author | Matthieu Herrb <matthieu@cvs.openbsd.org> | 2007-03-15 23:28:28 +0000 |
|---|---|---|
| committer | Matthieu Herrb <matthieu@cvs.openbsd.org> | 2007-03-15 23:28:28 +0000 |
| commit | 3f5a0af50bdd5302dfc3a7dd37a3008672d52ca5 (patch) | |
| tree | 2c545202b91d6e161a03c0e6f18b904e56ac3b71 /lib/libXcomposite | |
| parent | 9f8b198dcc8e573fc819bd15cd5214e9213ea14c (diff) | |
regen
Diffstat (limited to 'lib/libXcomposite')
| -rw-r--r-- | lib/libXcomposite/aclocal.m4 | 20 | ||||
| -rw-r--r-- | lib/libXcomposite/config.h.in | 9 | ||||
| -rw-r--r-- | lib/libXcomposite/configure | 23 |
3 files changed, 51 insertions, 1 deletions
diff --git a/lib/libXcomposite/aclocal.m4 b/lib/libXcomposite/aclocal.m4 index e237be1fa..5c281f9e7 100644 --- a/lib/libXcomposite/aclocal.m4 +++ b/lib/libXcomposite/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,5 +7441,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/lib/libXcomposite/config.h.in b/lib/libXcomposite/config.h.in index 09ee04cec..14da6e208 100644 --- a/lib/libXcomposite/config.h.in +++ b/lib/libXcomposite/config.h.in @@ -48,6 +48,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 to 1 if you have the ANSI C header files. */ #undef STDC_HEADERS diff --git a/lib/libXcomposite/configure b/lib/libXcomposite/configure index 9dfc95719..37b9e6b53 100644 --- a/lib/libXcomposite/configure +++ b/lib/libXcomposite/configure @@ -18774,6 +18774,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 xcomposite.pc" cat >confcache <<\_ACEOF |