diff options
author | Matthieu Herrb <matthieu@cvs.openbsd.org> | 2006-12-16 19:34:40 +0000 |
---|---|---|
committer | Matthieu Herrb <matthieu@cvs.openbsd.org> | 2006-12-16 19:34:40 +0000 |
commit | 1fa76a30edb0d80936b352b85cb4f3fcf7a40a4d (patch) | |
tree | 4ddc66c157e46297e1da785f29feda9284b57770 | |
parent | 6874e8f0198a907b79278692540fb5a95039ad3d (diff) |
regen
-rw-r--r-- | driver/xf86-video-vesa/aclocal.m4 | 22 | ||||
-rw-r--r-- | driver/xf86-video-vesa/config.h.in | 9 | ||||
-rw-r--r-- | driver/xf86-video-vesa/configure | 43 |
3 files changed, 62 insertions, 12 deletions
diff --git a/driver/xf86-video-vesa/aclocal.m4 b/driver/xf86-video-vesa/aclocal.m4 index f34a583e8..d9bb32d8a 100644 --- a/driver/xf86-video-vesa/aclocal.m4 +++ b/driver/xf86-video-vesa/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.3 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-vesa/config.h.in b/driver/xf86-video-vesa/config.h.in index db6ccf22e..a6aea89c9 100644 --- a/driver/xf86-video-vesa/config.h.in +++ b/driver/xf86-video-vesa/config.h.in @@ -50,6 +50,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/driver/xf86-video-vesa/configure b/driver/xf86-video-vesa/configure index c8b29c135..4fce4b2ba 100644 --- a/driver/xf86-video-vesa/configure +++ b/driver/xf86-video-vesa/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-vesa 1.2.2. +# Generated by GNU Autoconf 2.59 for xf86-video-vesa 1.3.0. # # 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-vesa' PACKAGE_TARNAME='xf86-video-vesa' -PACKAGE_VERSION='1.2.2' -PACKAGE_STRING='xf86-video-vesa 1.2.2' +PACKAGE_VERSION='1.3.0' +PACKAGE_STRING='xf86-video-vesa 1.3.0' 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-vesa 1.2.2 to adapt to many kinds of systems. +\`configure' configures xf86-video-vesa 1.3.0 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-vesa 1.2.2:";; + short | recursive ) echo "Configuration of xf86-video-vesa 1.3.0:";; esac cat <<\_ACEOF @@ -1179,7 +1179,7 @@ fi test -n "$ac_init_help" && exit 0 if $ac_init_version; then cat <<\_ACEOF -xf86-video-vesa configure 1.2.2 +xf86-video-vesa configure 1.3.0 generated by GNU Autoconf 2.59 Copyright (C) 2003 Free Software Foundation, Inc. @@ -1193,7 +1193,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-vesa $as_me 1.2.2, which was +It was created by xf86-video-vesa $as_me 1.3.0, which was generated by GNU Autoconf 2.59. Invocation command line was $ $0 $@ @@ -1841,7 +1841,7 @@ fi # Define the identity of the package. PACKAGE='xf86-video-vesa' - VERSION='1.2.2' + VERSION='1.3.0' cat >>confdefs.h <<_ACEOF @@ -20059,6 +20059,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 man/Makefile" cat >confcache <<\_ACEOF @@ -20458,7 +20481,7 @@ _ASBOX } >&5 cat >&5 <<_CSEOF -This file was extended by xf86-video-vesa $as_me 1.2.2, which was +This file was extended by xf86-video-vesa $as_me 1.3.0, which was generated by GNU Autoconf 2.59. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -20521,7 +20544,7 @@ _ACEOF cat >>$CONFIG_STATUS <<_ACEOF ac_cs_version="\\ -xf86-video-vesa config.status 1.2.2 +xf86-video-vesa config.status 1.3.0 configured by $0, generated by GNU Autoconf 2.59, with options \\"`echo "$ac_configure_args" | sed 's/[\\""\`\$]/\\\\&/g'`\\" |