diff options
| -rw-r--r-- | driver/xf86-video-rendition/Makefile.in | 2 | ||||
| -rw-r--r-- | driver/xf86-video-rendition/aclocal.m4 | 22 | ||||
| -rw-r--r-- | driver/xf86-video-rendition/configure | 43 |
3 files changed, 54 insertions, 13 deletions
diff --git a/driver/xf86-video-rendition/Makefile.in b/driver/xf86-video-rendition/Makefile.in index 5b4c257c6..ddaf77dc9 100644 --- a/driver/xf86-video-rendition/Makefile.in +++ b/driver/xf86-video-rendition/Makefile.in @@ -667,7 +667,7 @@ uninstall-info: uninstall-info-recursive .PHONY: ChangeLog ChangeLog: - git-log > ChangeLog + (GIT_DIR=$(top_srcdir)/.git git-log > .changelog.tmp && mv .changelog.tmp ChangeLog; rm -f .changelog.tmp) || (touch ChangeLog; echo 'git directory not found: installing possibly empty changelog.' >&2) dist-hook: ChangeLog # Tell versions [3.59,3.63) of GNU make to not export all variables. diff --git a/driver/xf86-video-rendition/aclocal.m4 b/driver/xf86-video-rendition/aclocal.m4 index f34a583e8..05f8a42b4 100644 --- a/driver/xf86-video-rendition/aclocal.m4 +++ b/driver/xf86-video-rendition/aclocal.m4 @@ -7445,7 +7445,7 @@ AC_DEFUN([XORG_MACROS_VERSION],[ XORG_MACROS_needed_major=`echo $XORG_MACROS_needed_version | sed 's/\..*$//'` XORG_MACROS_needed_minor=`echo $XORG_MACROS_needed_version | sed -e 's/^[0-9]*\.//' -e 's/\..*$//'`] AC_MSG_CHECKING([if xorg-macros used to generate configure is at least ${XORG_MACROS_needed_major}.${XORG_MACROS_needed_minor}]) - [XORG_MACROS_version=1.1.2 + [XORG_MACROS_version=1.1.4 XORG_MACROS_major=`echo $XORG_MACROS_version | sed 's/\..*$//'` XORG_MACROS_minor=`echo $XORG_MACROS_version | sed -e 's/^[0-9]*\.//' -e 's/\..*$//'`] if test $XORG_MACROS_major -ne $XORG_MACROS_needed_major ; then @@ -7898,7 +7898,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, @@ -7911,5 +7912,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/driver/xf86-video-rendition/configure b/driver/xf86-video-rendition/configure index f84be1031..ceb5d133e 100644 --- a/driver/xf86-video-rendition/configure +++ b/driver/xf86-video-rendition/configure @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.59 for xf86-video-rendition 4.1.2. +# Generated by GNU Autoconf 2.59 for xf86-video-rendition 4.1.3. # # Report bugs to <https://bugs.freedesktop.org/enter_bug.cgi?product=xorg>. # @@ -423,8 +423,8 @@ SHELL=${CONFIG_SHELL-/bin/sh} # Identity of this package. PACKAGE_NAME='xf86-video-rendition' PACKAGE_TARNAME='xf86-video-rendition' -PACKAGE_VERSION='4.1.2' -PACKAGE_STRING='xf86-video-rendition 4.1.2' +PACKAGE_VERSION='4.1.3' +PACKAGE_STRING='xf86-video-rendition 4.1.3' PACKAGE_BUGREPORT='https://bugs.freedesktop.org/enter_bug.cgi?product=xorg' ac_unique_file="Makefile.am" @@ -966,7 +966,7 @@ if test "$ac_init_help" = "long"; then # Omit some internal or obsolete options to make the list less imposing. # This message is too long to be a string in the A/UX 3.1 sh. cat <<_ACEOF -\`configure' configures xf86-video-rendition 4.1.2 to adapt to many kinds of systems. +\`configure' configures xf86-video-rendition 4.1.3 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1032,7 +1032,7 @@ fi if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of xf86-video-rendition 4.1.2:";; + short | recursive ) echo "Configuration of xf86-video-rendition 4.1.3:";; esac cat <<\_ACEOF @@ -1181,7 +1181,7 @@ fi test -n "$ac_init_help" && exit 0 if $ac_init_version; then cat <<\_ACEOF -xf86-video-rendition configure 4.1.2 +xf86-video-rendition configure 4.1.3 generated by GNU Autoconf 2.59 Copyright (C) 2003 Free Software Foundation, Inc. @@ -1195,7 +1195,7 @@ cat >&5 <<_ACEOF This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by xf86-video-rendition $as_me 4.1.2, which was +It was created by xf86-video-rendition $as_me 4.1.3, which was generated by GNU Autoconf 2.59. Invocation command line was $ $0 $@ @@ -1843,7 +1843,7 @@ fi # Define the identity of the package. PACKAGE='xf86-video-rendition' - VERSION='4.1.2' + VERSION='4.1.3' cat >>confdefs.h <<_ACEOF @@ -20208,6 +20208,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 + + XORG_SGML_PATH=$prefix/share/sgml @@ -20784,7 +20807,7 @@ _ASBOX } >&5 cat >&5 <<_CSEOF -This file was extended by xf86-video-rendition $as_me 4.1.2, which was +This file was extended by xf86-video-rendition $as_me 4.1.3, which was generated by GNU Autoconf 2.59. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -20847,7 +20870,7 @@ _ACEOF cat >>$CONFIG_STATUS <<_ACEOF ac_cs_version="\\ -xf86-video-rendition config.status 4.1.2 +xf86-video-rendition config.status 4.1.3 configured by $0, generated by GNU Autoconf 2.59, with options \\"`echo "$ac_configure_args" | sed 's/[\\""\`\$]/\\\\&/g'`\\" |