From 58751f7e8fffbd862b4166b71510082fb7b2497d Mon Sep 17 00:00:00 2001 From: matthieu Date: Sat, 3 Mar 2007 09:36:13 +0000 Subject: [PATCH] regen --- driver/xf86-video-fbdev/Makefile.in | 1 - driver/xf86-video-fbdev/aclocal.m4 | 22 +++++++++++-- driver/xf86-video-fbdev/configure | 43 +++++++++++++++++++------ driver/xf86-video-fbdev/src/Makefile.in | 1 - 4 files changed, 53 insertions(+), 14 deletions(-) diff --git a/driver/xf86-video-fbdev/Makefile.in b/driver/xf86-video-fbdev/Makefile.in index 5f7831b43..549e9f1d9 100644 --- a/driver/xf86-video-fbdev/Makefile.in +++ b/driver/xf86-video-fbdev/Makefile.in @@ -157,7 +157,6 @@ PACKAGE_VERSION = @PACKAGE_VERSION@ PATH_SEPARATOR = @PATH_SEPARATOR@ PKG_CONFIG = @PKG_CONFIG@ RANLIB = @RANLIB@ -SED = @SED@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ STRIP = @STRIP@ diff --git a/driver/xf86-video-fbdev/aclocal.m4 b/driver/xf86-video-fbdev/aclocal.m4 index f34a583e8..579980ea6 100644 --- a/driver/xf86-video-fbdev/aclocal.m4 +++ b/driver/xf86-video-fbdev/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.5 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-fbdev/configure b/driver/xf86-video-fbdev/configure index 61f713bdf..edd63aaa5 100644 --- a/driver/xf86-video-fbdev/configure +++ b/driver/xf86-video-fbdev/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-fbdev 0.3.0. +# Generated by GNU Autoconf 2.59 for xf86-video-fbdev 0.3.1. # # Report bugs to . # @@ -423,8 +423,8 @@ SHELL=${CONFIG_SHELL-/bin/sh} # Identity of this package. PACKAGE_NAME='xf86-video-fbdev' PACKAGE_TARNAME='xf86-video-fbdev' -PACKAGE_VERSION='0.3.0' -PACKAGE_STRING='xf86-video-fbdev 0.3.0' +PACKAGE_VERSION='0.3.1' +PACKAGE_STRING='xf86-video-fbdev 0.3.1' 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-fbdev 0.3.0 to adapt to many kinds of systems. +\`configure' configures xf86-video-fbdev 0.3.1 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-fbdev 0.3.0:";; + short | recursive ) echo "Configuration of xf86-video-fbdev 0.3.1:";; esac cat <<\_ACEOF @@ -1181,7 +1181,7 @@ fi test -n "$ac_init_help" && exit 0 if $ac_init_version; then cat <<\_ACEOF -xf86-video-fbdev configure 0.3.0 +xf86-video-fbdev configure 0.3.1 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-fbdev $as_me 0.3.0, which was +It was created by xf86-video-fbdev $as_me 0.3.1, 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-fbdev' - VERSION='0.3.0' + VERSION='0.3.1' cat >>confdefs.h <<_ACEOF @@ -20057,6 +20057,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 @@ -20456,7 +20479,7 @@ _ASBOX } >&5 cat >&5 <<_CSEOF -This file was extended by xf86-video-fbdev $as_me 0.3.0, which was +This file was extended by xf86-video-fbdev $as_me 0.3.1, which was generated by GNU Autoconf 2.59. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -20519,7 +20542,7 @@ _ACEOF cat >>$CONFIG_STATUS <<_ACEOF ac_cs_version="\\ -xf86-video-fbdev config.status 0.3.0 +xf86-video-fbdev config.status 0.3.1 configured by $0, generated by GNU Autoconf 2.59, with options \\"`echo "$ac_configure_args" | sed 's/[\\""\`\$]/\\\\&/g'`\\" diff --git a/driver/xf86-video-fbdev/src/Makefile.in b/driver/xf86-video-fbdev/src/Makefile.in index 81ea279df..0cf626a04 100644 --- a/driver/xf86-video-fbdev/src/Makefile.in +++ b/driver/xf86-video-fbdev/src/Makefile.in @@ -159,7 +159,6 @@ PACKAGE_VERSION = @PACKAGE_VERSION@ PATH_SEPARATOR = @PATH_SEPARATOR@ PKG_CONFIG = @PKG_CONFIG@ RANLIB = @RANLIB@ -SED = @SED@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ STRIP = @STRIP@