This commit is contained in:
matthieu 2006-12-17 21:02:39 +00:00
parent 045ee1ff2b
commit f196da6015
5 changed files with 54 additions and 2 deletions

View File

@ -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])
])

View File

@ -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

View File

@ -1773,6 +1773,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 semantics/Makefile keycodes/Makefile keycodes/sgi/Makefile keycodes/digital/Makefile keymap/Makefile keymap/sun/Makefile keymap/digital/Makefile keymap/sgi/Makefile geometry/Makefile geometry/digital/Makefile geometry/sgi/Makefile geometry/ibm/Makefile compat/Makefile rules/Makefile symbols/Makefile symbols/pc/Makefile symbols/nec/Makefile symbols/xfree68/Makefile symbols/sony/Makefile symbols/sgi/Makefile symbols/macintosh/Makefile symbols/sun/Makefile symbols/fujitsu/Makefile symbols/digital/Makefile symbols/hp/Makefile torture/Makefile types/Makefile"
cat >confcache <<\_ACEOF

View File

@ -244,7 +244,8 @@ dist_xkbdata_symbols_DATA = \
us_intl \
uz \
vn \
yu
yu \
zaurus
xkbdatadir = $(datadir)/X11/xkb
xkbdata_DATA = symbols.dir

View File

@ -116,6 +116,7 @@ sysconfdir = @sysconfdir@
target_alias = @target_alias@
xkbdata_symbols_sundir = $(datadir)/X11/xkb/symbols/sun
dist_xkbdata_symbols_sun_DATA = \
lkeys \
se \
us \
usb