diff options
Diffstat (limited to 'driver')
| -rw-r--r-- | driver/xf86-video-radeonhd/Makefile.in | 45 | ||||
| -rw-r--r-- | driver/xf86-video-radeonhd/configure | 338 | ||||
| -rw-r--r-- | driver/xf86-video-radeonhd/man/Makefile.in | 6 | ||||
| -rw-r--r-- | driver/xf86-video-radeonhd/src/Makefile.in | 4 | ||||
| -rw-r--r-- | driver/xf86-video-radeonhd/utils/conntest/Makefile.in | 8 |
5 files changed, 360 insertions, 41 deletions
diff --git a/driver/xf86-video-radeonhd/Makefile.in b/driver/xf86-video-radeonhd/Makefile.in index 29fb0d5ac..4239f527c 100644 --- a/driver/xf86-video-radeonhd/Makefile.in +++ b/driver/xf86-video-radeonhd/Makefile.in @@ -13,6 +13,29 @@ # PARTICULAR PURPOSE. @SET_MAKE@ + +# Copyright 2007 Luc Verhaegen <lverhaegen@novell.com> +# Copyright 2007 Matthias Hopf <mhopf@novell.com> +# Copyright 2007 Egbert Eich <eich@novell.com> +# Copyright 2007 Advanced Micro Devices, Inc. +# +# Permission is hereby granted, free of charge, to any person obtaining a +# copy of this software and associated documentation files (the "Software"), +# to deal in the Software without restriction, including without limitation +# the rights to use, copy, modify, merge, publish, distribute, sublicense, +# and/or sell copies of the Software, and to permit persons to whom the +# Software is furnished to do so, subject to the following conditions: +# +# The above copyright notice and this permission notice shall be included in +# all copies or substantial portions of the Software. +# +# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL +# THE COPYRIGHT HOLDER(S) OR AUTHOR(S) BE LIABLE FOR ANY CLAIM, DAMAGES OR +# OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, +# ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR +# OTHER DEALINGS IN THE SOFTWARE. srcdir = @srcdir@ top_srcdir = @top_srcdir@ VPATH = @srcdir@ @@ -37,7 +60,7 @@ build_triplet = @build@ host_triplet = @host@ DIST_COMMON = README $(am__configure_deps) $(srcdir)/Makefile.am \ $(srcdir)/Makefile.in $(srcdir)/config.h.in \ - $(top_srcdir)/configure COPYING compile config.guess \ + $(top_srcdir)/configure COPYING ChangeLog compile config.guess \ config.sub depcomp install-sh ltmain.sh missing subdir = . ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 @@ -116,6 +139,8 @@ FILE_MAN_DIR = @FILE_MAN_DIR@ FILE_MAN_SUFFIX = @FILE_MAN_SUFFIX@ HAVE_PCI_PCI_H_FALSE = @HAVE_PCI_PCI_H_FALSE@ HAVE_PCI_PCI_H_TRUE = @HAVE_PCI_PCI_H_TRUE@ +HAVE_XF86_ANSIC_H_FALSE = @HAVE_XF86_ANSIC_H_FALSE@ +HAVE_XF86_ANSIC_H_TRUE = @HAVE_XF86_ANSIC_H_TRUE@ HAVE_ZLIB_FALSE = @HAVE_ZLIB_FALSE@ HAVE_ZLIB_TRUE = @HAVE_ZLIB_TRUE@ INSTALL_DATA = @INSTALL_DATA@ @@ -144,6 +169,8 @@ PACKAGE_STRING = @PACKAGE_STRING@ PACKAGE_TARNAME = @PACKAGE_TARNAME@ PACKAGE_VERSION = @PACKAGE_VERSION@ PATH_SEPARATOR = @PATH_SEPARATOR@ +PCIUTILS_CFLAGS = @PCIUTILS_CFLAGS@ +PCIUTILS_LIBS = @PCIUTILS_LIBS@ PEDANTIC_CFLAGS = @PEDANTIC_CFLAGS@ PKG_CONFIG = @PKG_CONFIG@ RANDR_VERSION = @RANDR_VERSION@ @@ -200,9 +227,10 @@ sbindir = @sbindir@ sharedstatedir = @sharedstatedir@ sysconfdir = @sysconfdir@ target_alias = @target_alias@ -EXTRA_DIST = RadeonHD.tmpl Imakefile git_version.sh AUTOMAKE_OPTIONS = foreign SUBDIRS = man src utils/conntest +EXTRA_DIST = RadeonHD.tmpl Imakefile git_version.sh ChangeLog +MAINTAINERCLEANFILES = ChangeLog all: config.h $(MAKE) $(AM_MAKEFLAGS) all-recursive @@ -444,6 +472,9 @@ distdir: $(DISTFILES) || exit 1; \ fi; \ done + $(MAKE) $(AM_MAKEFLAGS) \ + top_distdir="$(top_distdir)" distdir="$(distdir)" \ + dist-hook -find $(distdir) -type d ! -perm -777 -exec chmod a+rwx {} \; -o \ ! -type d ! -perm -444 -links 1 -exec chmod a+r {} \; -o \ ! -type d ! -perm -400 -exec chmod a+r {} \; -o \ @@ -570,6 +601,7 @@ distclean-generic: maintainer-clean-generic: @echo "This command is intended for maintainers to use" @echo "it deletes files that may require special tools to rebuild." + -test -z "$(MAINTAINERCLEANFILES)" || rm -f $(MAINTAINERCLEANFILES) clean: clean-recursive clean-am: clean-generic clean-libtool mostlyclean-am @@ -625,7 +657,7 @@ uninstall-info: uninstall-info-recursive .PHONY: $(RECURSIVE_TARGETS) CTAGS GTAGS all all-am am--refresh check \ check-am clean clean-generic clean-libtool clean-recursive \ ctags ctags-recursive dist dist-all dist-bzip2 dist-gzip \ - dist-shar dist-tarZ dist-zip distcheck distclean \ + dist-hook dist-shar dist-tarZ dist-zip distcheck distclean \ distclean-generic distclean-hdr distclean-libtool \ distclean-recursive distclean-tags distcleancheck distdir \ distuninstallcheck dvi dvi-am html html-am info info-am \ @@ -637,6 +669,13 @@ uninstall-info: uninstall-info-recursive mostlyclean-libtool mostlyclean-recursive pdf pdf-am ps ps-am \ tags tags-recursive uninstall uninstall-am uninstall-info-am + +.PHONY: ChangeLog + +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. # Otherwise a system limit (for SysV at least) may be exceeded. .NOEXPORT: diff --git a/driver/xf86-video-radeonhd/configure b/driver/xf86-video-radeonhd/configure index b0b04e63a..d464ac24a 100644 --- a/driver/xf86-video-radeonhd/configure +++ b/driver/xf86-video-radeonhd/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-radeonhd 1.0.0. +# Generated by GNU Autoconf 2.59 for xf86-video-radeonhd 1.1.0. # # Report bugs to <https://bugs.freedesktop.org/enter_bug.cgi?product=xorg&component=Driver/radeonhd>. # @@ -423,8 +423,8 @@ SHELL=${CONFIG_SHELL-/bin/sh} # Identity of this package. PACKAGE_NAME='xf86-video-radeonhd' PACKAGE_TARNAME='xf86-video-radeonhd' -PACKAGE_VERSION='1.0.0' -PACKAGE_STRING='xf86-video-radeonhd 1.0.0' +PACKAGE_VERSION='1.1.0' +PACKAGE_STRING='xf86-video-radeonhd 1.1.0' PACKAGE_BUGREPORT='https://bugs.freedesktop.org/enter_bug.cgi?product=xorg&component=Driver/radeonhd' ac_unique_file="Makefile.am" @@ -465,7 +465,7 @@ ac_includes_default="\ # include <unistd.h> #endif" -ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA CYGPATH_W PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM mkdir_p AWK SET_MAKE am__leading_dot AMTAR am__tar am__untar MAINTAINER_MODE_TRUE MAINTAINER_MODE_FALSE MAINT build build_cpu build_vendor build_os host host_cpu host_vendor host_os CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT DEPDIR am__include am__quote AMDEP_TRUE AMDEP_FALSE AMDEPBACKSLASH CCDEPMODE am__fastdepCC_TRUE am__fastdepCC_FALSE EGREP LN_S ECHO AR ac_ct_AR RANLIB ac_ct_RANLIB CPP CXX CXXFLAGS ac_ct_CXX CXXDEPMODE am__fastdepCXX_TRUE am__fastdepCXX_FALSE CXXCPP F77 FFLAGS ac_ct_F77 LIBTOOL PKG_CONFIG ac_pt_PKG_CONFIG XORG_CFLAGS XORG_LIBS HAVE_PCI_PCI_H_TRUE HAVE_PCI_PCI_H_FALSE ATOM_BIOS_TRUE ATOM_BIOS_FALSE ATOM_BIOS_PARSER_TRUE ATOM_BIOS_PARSER_FALSE HAVE_ZLIB_TRUE HAVE_ZLIB_FALSE WARN_CFLAGS PEDANTIC_CFLAGS ATOMBIOS_CFLAGS RANDR_VERSION moduledir DRIVER_NAME APP_MAN_SUFFIX LIB_MAN_SUFFIX FILE_MAN_SUFFIX MISC_MAN_SUFFIX DRIVER_MAN_SUFFIX ADMIN_MAN_SUFFIX APP_MAN_DIR LIB_MAN_DIR FILE_MAN_DIR MISC_MAN_DIR DRIVER_MAN_DIR ADMIN_MAN_DIR LIBOBJS LTLIBOBJS' +ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA CYGPATH_W PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM mkdir_p AWK SET_MAKE am__leading_dot AMTAR am__tar am__untar MAINTAINER_MODE_TRUE MAINTAINER_MODE_FALSE MAINT build build_cpu build_vendor build_os host host_cpu host_vendor host_os CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT DEPDIR am__include am__quote AMDEP_TRUE AMDEP_FALSE AMDEPBACKSLASH CCDEPMODE am__fastdepCC_TRUE am__fastdepCC_FALSE EGREP LN_S ECHO AR ac_ct_AR RANLIB ac_ct_RANLIB CPP CXX CXXFLAGS ac_ct_CXX CXXDEPMODE am__fastdepCXX_TRUE am__fastdepCXX_FALSE CXXCPP F77 FFLAGS ac_ct_F77 LIBTOOL PKG_CONFIG ac_pt_PKG_CONFIG XORG_CFLAGS XORG_LIBS PCIUTILS_CFLAGS PCIUTILS_LIBS HAVE_PCI_PCI_H_TRUE HAVE_PCI_PCI_H_FALSE HAVE_XF86_ANSIC_H_TRUE HAVE_XF86_ANSIC_H_FALSE ATOM_BIOS_TRUE ATOM_BIOS_FALSE ATOM_BIOS_PARSER_TRUE ATOM_BIOS_PARSER_FALSE HAVE_ZLIB_TRUE HAVE_ZLIB_FALSE WARN_CFLAGS PEDANTIC_CFLAGS ATOMBIOS_CFLAGS RANDR_VERSION moduledir DRIVER_NAME APP_MAN_SUFFIX LIB_MAN_SUFFIX FILE_MAN_SUFFIX MISC_MAN_SUFFIX DRIVER_MAN_SUFFIX ADMIN_MAN_SUFFIX APP_MAN_DIR LIB_MAN_DIR FILE_MAN_DIR MISC_MAN_DIR DRIVER_MAN_DIR ADMIN_MAN_DIR LIBOBJS LTLIBOBJS' ac_subst_files='' # Initialize some variables set by options. @@ -958,6 +958,14 @@ ac_env_XORG_LIBS_set=${XORG_LIBS+set} ac_env_XORG_LIBS_value=$XORG_LIBS ac_cv_env_XORG_LIBS_set=${XORG_LIBS+set} ac_cv_env_XORG_LIBS_value=$XORG_LIBS +ac_env_PCIUTILS_CFLAGS_set=${PCIUTILS_CFLAGS+set} +ac_env_PCIUTILS_CFLAGS_value=$PCIUTILS_CFLAGS +ac_cv_env_PCIUTILS_CFLAGS_set=${PCIUTILS_CFLAGS+set} +ac_cv_env_PCIUTILS_CFLAGS_value=$PCIUTILS_CFLAGS +ac_env_PCIUTILS_LIBS_set=${PCIUTILS_LIBS+set} +ac_env_PCIUTILS_LIBS_value=$PCIUTILS_LIBS +ac_cv_env_PCIUTILS_LIBS_set=${PCIUTILS_LIBS+set} +ac_cv_env_PCIUTILS_LIBS_value=$PCIUTILS_LIBS # # Report the --help message. @@ -966,7 +974,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-radeonhd 1.0.0 to adapt to many kinds of systems. +\`configure' configures xf86-video-radeonhd 1.1.0 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1032,7 +1040,7 @@ fi if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of xf86-video-radeonhd 1.0.0:";; + short | recursive ) echo "Configuration of xf86-video-radeonhd 1.1.0:";; esac cat <<\_ACEOF @@ -1084,6 +1092,10 @@ Some influential environment variables: PKG_CONFIG path to pkg-config utility XORG_CFLAGS C compiler flags for XORG, overriding pkg-config XORG_LIBS linker flags for XORG, overriding pkg-config + PCIUTILS_CFLAGS + C compiler flags for PCIUTILS, overriding pkg-config + PCIUTILS_LIBS + linker flags for PCIUTILS, overriding pkg-config Use these variables to override the choices made by `configure' or to help it to find libraries and programs with nonstandard names/locations. @@ -1184,7 +1196,7 @@ fi test -n "$ac_init_help" && exit 0 if $ac_init_version; then cat <<\_ACEOF -xf86-video-radeonhd configure 1.0.0 +xf86-video-radeonhd configure 1.1.0 generated by GNU Autoconf 2.59 Copyright (C) 2003 Free Software Foundation, Inc. @@ -1198,7 +1210,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-radeonhd $as_me 1.0.0, which was +It was created by xf86-video-radeonhd $as_me 1.1.0, which was generated by GNU Autoconf 2.59. Invocation command line was $ $0 $@ @@ -1846,7 +1858,7 @@ fi # Define the identity of the package. PACKAGE='xf86-video-radeonhd' - VERSION='1.0.0' + VERSION='1.1.0' cat >>confdefs.h <<_ACEOF @@ -3728,7 +3740,7 @@ ia64-*-hpux*) ;; *-*-irix6*) # Find out which ABI we are using. - echo '#line 3731 "configure"' > conftest.$ac_ext + echo '#line 3743 "configure"' > conftest.$ac_ext if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? @@ -5327,7 +5339,7 @@ fi # Provide some information about the compiler. -echo "$as_me:5330:" \ +echo "$as_me:5342:" \ "checking for Fortran 77 compiler version" >&5 ac_compiler=`set X $ac_compile; echo $2` { (eval echo "$as_me:$LINENO: \"$ac_compiler --version </dev/null >&5\"") >&5 @@ -6390,11 +6402,11 @@ else -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:6393: $lt_compile\"" >&5) + (eval echo "\"\$as_me:6405: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:6397: \$? = $ac_status" >&5 + echo "$as_me:6409: \$? = $ac_status" >&5 if (exit $ac_status) && test -s "$ac_outfile"; then # The compiler can only warn and ignore the option if not recognized # So say no if there are warnings other than the usual output. @@ -6658,11 +6670,11 @@ else -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:6661: $lt_compile\"" >&5) + (eval echo "\"\$as_me:6673: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:6665: \$? = $ac_status" >&5 + echo "$as_me:6677: \$? = $ac_status" >&5 if (exit $ac_status) && test -s "$ac_outfile"; then # The compiler can only warn and ignore the option if not recognized # So say no if there are warnings other than the usual output. @@ -6762,11 +6774,11 @@ else -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:6765: $lt_compile\"" >&5) + (eval echo "\"\$as_me:6777: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 - echo "$as_me:6769: \$? = $ac_status" >&5 + echo "$as_me:6781: \$? = $ac_status" >&5 if (exit $ac_status) && test -s out/conftest2.$ac_objext then # The compiler can only warn and ignore the option if not recognized @@ -9111,7 +9123,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<EOF -#line 9114 "configure" +#line 9126 "configure" #include "confdefs.h" #if HAVE_DLFCN_H @@ -9211,7 +9223,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<EOF -#line 9214 "configure" +#line 9226 "configure" #include "confdefs.h" #if HAVE_DLFCN_H @@ -11555,11 +11567,11 @@ else -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:11558: $lt_compile\"" >&5) + (eval echo "\"\$as_me:11570: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:11562: \$? = $ac_status" >&5 + echo "$as_me:11574: \$? = $ac_status" >&5 if (exit $ac_status) && test -s "$ac_outfile"; then # The compiler can only warn and ignore the option if not recognized # So say no if there are warnings other than the usual output. @@ -11659,11 +11671,11 @@ else -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:11662: $lt_compile\"" >&5) + (eval echo "\"\$as_me:11674: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 - echo "$as_me:11666: \$? = $ac_status" >&5 + echo "$as_me:11678: \$? = $ac_status" >&5 if (exit $ac_status) && test -s out/conftest2.$ac_objext then # The compiler can only warn and ignore the option if not recognized @@ -13229,11 +13241,11 @@ else -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:13232: $lt_compile\"" >&5) + (eval echo "\"\$as_me:13244: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:13236: \$? = $ac_status" >&5 + echo "$as_me:13248: \$? = $ac_status" >&5 if (exit $ac_status) && test -s "$ac_outfile"; then # The compiler can only warn and ignore the option if not recognized # So say no if there are warnings other than the usual output. @@ -13333,11 +13345,11 @@ else -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:13336: $lt_compile\"" >&5) + (eval echo "\"\$as_me:13348: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 - echo "$as_me:13340: \$? = $ac_status" >&5 + echo "$as_me:13352: \$? = $ac_status" >&5 if (exit $ac_status) && test -s out/conftest2.$ac_objext then # The compiler can only warn and ignore the option if not recognized @@ -15540,11 +15552,11 @@ else -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:15543: $lt_compile\"" >&5) + (eval echo "\"\$as_me:15555: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:15547: \$? = $ac_status" >&5 + echo "$as_me:15559: \$? = $ac_status" >&5 if (exit $ac_status) && test -s "$ac_outfile"; then # The compiler can only warn and ignore the option if not recognized # So say no if there are warnings other than the usual output. @@ -15808,11 +15820,11 @@ else -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:15811: $lt_compile\"" >&5) + (eval echo "\"\$as_me:15823: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:15815: \$? = $ac_status" >&5 + echo "$as_me:15827: \$? = $ac_status" >&5 if (exit $ac_status) && test -s "$ac_outfile"; then # The compiler can only warn and ignore the option if not recognized # So say no if there are warnings other than the usual output. @@ -15912,11 +15924,11 @@ else -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:15915: $lt_compile\"" >&5) + (eval echo "\"\$as_me:15927: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 - echo "$as_me:15919: \$? = $ac_status" >&5 + echo "$as_me:15931: \$? = $ac_status" >&5 if (exit $ac_status) && test -s out/conftest2.$ac_objext then # The compiler can only warn and ignore the option if not recognized @@ -20081,6 +20093,88 @@ _ACEOF fi + +pkg_failed=no +echo "$as_me:$LINENO: checking for PCIUTILS" >&5 +echo $ECHO_N "checking for PCIUTILS... $ECHO_C" >&6 + +if test -n "$PKG_CONFIG"; then + if test -n "$PCIUTILS_CFLAGS"; then + pkg_cv_PCIUTILS_CFLAGS="$PCIUTILS_CFLAGS" + else + if test -n "$PKG_CONFIG" && \ + { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"libpci\"") >&5 + ($PKG_CONFIG --exists --print-errors "libpci") 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; then + pkg_cv_PCIUTILS_CFLAGS=`$PKG_CONFIG --cflags "libpci" 2>/dev/null` +else + pkg_failed=yes +fi + fi +else + pkg_failed=untried +fi +if test -n "$PKG_CONFIG"; then + if test -n "$PCIUTILS_LIBS"; then + pkg_cv_PCIUTILS_LIBS="$PCIUTILS_LIBS" + else + if test -n "$PKG_CONFIG" && \ + { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"libpci\"") >&5 + ($PKG_CONFIG --exists --print-errors "libpci") 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; then + pkg_cv_PCIUTILS_LIBS=`$PKG_CONFIG --libs "libpci" 2>/dev/null` +else + pkg_failed=yes +fi + fi +else + pkg_failed=untried +fi + + + +if test $pkg_failed = yes; then + +if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then + _pkg_short_errors_supported=yes +else + _pkg_short_errors_supported=no +fi + if test $_pkg_short_errors_supported = yes; then + PCIUTILS_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "libpci"` + else + PCIUTILS_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "libpci"` + fi + # Put the nasty error message in config.log where it belongs + echo "$PCIUTILS_PKG_ERRORS" >&5 + + echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6 + { echo "$as_me:$LINENO: WARNING: libpci not registered in pkgconfig, will guess instead" >&5 +echo "$as_me: WARNING: libpci not registered in pkgconfig, will guess instead" >&2;} + test "x$PCIUTILS_CFLAGS$PCIUTILS_LIBS" = "x" && PCIUTILS_LIBS="-lpci -lz" + +elif test $pkg_failed = untried; then + { echo "$as_me:$LINENO: WARNING: libpci not registered in pkgconfig, will guess instead" >&5 +echo "$as_me: WARNING: libpci not registered in pkgconfig, will guess instead" >&2;} + test "x$PCIUTILS_CFLAGS$PCIUTILS_LIBS" = "x" && PCIUTILS_LIBS="-lpci -lz" + +else + PCIUTILS_CFLAGS=$pkg_cv_PCIUTILS_CFLAGS + PCIUTILS_LIBS=$pkg_cv_PCIUTILS_LIBS + echo "$as_me:$LINENO: result: yes" >&5 +echo "${ECHO_T}yes" >&6 + : +fi + +SAVED_CPPFLAGS="$CPPFLAGS" +SAVED_CFLAGS="$CFLAGS" +CFLAGS="$CFLAGS $PCIUTILS_CFLAGS" +CPPFLAGS="$CPPFLAGS $PCIUTILS_CFLAGS" if test "${ac_cv_header_pci_pci_h+set}" = set; then echo "$as_me:$LINENO: checking for pci/pci.h" >&5 echo $ECHO_N "checking for pci/pci.h... $ECHO_C" >&6 @@ -20241,6 +20335,167 @@ else HAVE_PCI_PCI_H_FALSE= fi +CFLAGS="$SAVED_CFLAGS" +CPPFLAGS="$SAVED_CPPFLAGS" + +as_ac_Header=`echo "ac_cv_header_${sdkdir}/xf86_ansic.h" | $as_tr_sh` +if eval "test \"\${$as_ac_Header+set}\" = set"; then + echo "$as_me:$LINENO: checking for ${sdkdir}/xf86_ansic.h" >&5 +echo $ECHO_N "checking for ${sdkdir}/xf86_ansic.h... $ECHO_C" >&6 +if eval "test \"\${$as_ac_Header+set}\" = set"; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +fi +echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5 +echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6 +else + # Is the header compilable? +echo "$as_me:$LINENO: checking ${sdkdir}/xf86_ansic.h usability" >&5 +echo $ECHO_N "checking ${sdkdir}/xf86_ansic.h usability... $ECHO_C" >&6 +cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ +$ac_includes_default +#include <${sdkdir}/xf86_ansic.h> +_ACEOF +rm -f conftest.$ac_objext +if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; } && + { ac_try='test -s conftest.$ac_objext' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + ac_header_compiler=yes +else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + +ac_header_compiler=no +fi +rm -f conftest.err conftest.$ac_objext conftest.$ac_ext +echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 +echo "${ECHO_T}$ac_header_compiler" >&6 + +# Is the header present? +echo "$as_me:$LINENO: checking ${sdkdir}/xf86_ansic.h presence" >&5 +echo $ECHO_N "checking ${sdkdir}/xf86_ansic.h presence... $ECHO_C" >&6 +cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ +#include <${sdkdir}/xf86_ansic.h> +_ACEOF +if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 + (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } >/dev/null; then + if test -s conftest.err; then + ac_cpp_err=$ac_c_preproc_warn_flag + ac_cpp_err=$ac_cpp_err$ac_c_werror_flag + else + ac_cpp_err= + fi +else + ac_cpp_err=yes +fi +if test -z "$ac_cpp_err"; then + ac_header_preproc=yes +else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + ac_header_preproc=no +fi +rm -f conftest.err conftest.$ac_ext +echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 +echo "${ECHO_T}$ac_header_preproc" >&6 + +# So? What about this header? +case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in + yes:no: ) + { echo "$as_me:$LINENO: WARNING: ${sdkdir}/xf86_ansic.h: accepted by the compiler, rejected by the preprocessor!" >&5 +echo "$as_me: WARNING: ${sdkdir}/xf86_ansic.h: accepted by the compiler, rejected by the preprocessor!" >&2;} + { echo "$as_me:$LINENO: WARNING: ${sdkdir}/xf86_ansic.h: proceeding with the compiler's result" >&5 +echo "$as_me: WARNING: ${sdkdir}/xf86_ansic.h: proceeding with the compiler's result" >&2;} + ac_header_preproc=yes + ;; + no:yes:* ) + { echo "$as_me:$LINENO: WARNING: ${sdkdir}/xf86_ansic.h: present but cannot be compiled" >&5 +echo "$as_me: WARNING: ${sdkdir}/xf86_ansic.h: present but cannot be compiled" >&2;} + { echo "$as_me:$LINENO: WARNING: ${sdkdir}/xf86_ansic.h: check for missing prerequisite headers?" >&5 +echo "$as_me: WARNING: ${sdkdir}/xf86_ansic.h: check for missing prerequisite headers?" >&2;} + { echo "$as_me:$LINENO: WARNING: ${sdkdir}/xf86_ansic.h: see the Autoconf documentation" >&5 +echo "$as_me: WARNING: ${sdkdir}/xf86_ansic.h: see the Autoconf documentation" >&2;} + { echo "$as_me:$LINENO: WARNING: ${sdkdir}/xf86_ansic.h: section \"Present But Cannot Be Compiled\"" >&5 +echo "$as_me: WARNING: ${sdkdir}/xf86_ansic.h: section \"Present But Cannot Be Compiled\"" >&2;} + { echo "$as_me:$LINENO: WARNING: ${sdkdir}/xf86_ansic.h: proceeding with the preprocessor's result" >&5 +echo "$as_me: WARNING: ${sdkdir}/xf86_ansic.h: proceeding with the preprocessor's result" >&2;} + { echo "$as_me:$LINENO: WARNING: ${sdkdir}/xf86_ansic.h: in the future, the compiler will take precedence" >&5 +echo "$as_me: WARNING: ${sdkdir}/xf86_ansic.h: in the future, the compiler will take precedence" >&2;} + ( + cat <<\_ASBOX +## ------------------------------------------------------------------------------------------------ ## +## Report this to https://bugs.freedesktop.org/enter_bug.cgi?product=xorg&component=Driver/radeonhd ## +## ------------------------------------------------------------------------------------------------ ## +_ASBOX + ) | + sed "s/^/$as_me: WARNING: /" >&2 + ;; +esac +echo "$as_me:$LINENO: checking for ${sdkdir}/xf86_ansic.h" >&5 +echo $ECHO_N "checking for ${sdkdir}/xf86_ansic.h... $ECHO_C" >&6 +if eval "test \"\${$as_ac_Header+set}\" = set"; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + eval "$as_ac_Header=\$ac_header_preproc" +fi +echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5 +echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6 + +fi +if test `eval echo '${'$as_ac_Header'}'` = yes; then + +cat >>confdefs.h <<\_ACEOF +#define HAVE_XF86_ANSIC_H 1 +_ACEOF + + have_xf86_ansic_h=yes +fi + + + + +if test "x$have_xf86_ansic_h" = "xyes"; then + HAVE_XF86_ANSIC_H_TRUE= + HAVE_XF86_ANSIC_H_FALSE='#' +else + HAVE_XF86_ANSIC_H_TRUE='#' + HAVE_XF86_ANSIC_H_FALSE= +fi + SAVED_CFLAGS="$CFLAGS" CFLAGS="$CFLAGS $XORG_CFLAGS" @@ -20846,6 +21101,8 @@ esac + + RANDR_VERSION=`pkg-config --modversion randrproto` @@ -21116,6 +21373,13 @@ echo "$as_me: error: conditional \"HAVE_PCI_PCI_H\" was never defined. Usually this means the macro was only invoked conditionally." >&2;} { (exit 1); exit 1; }; } fi +if test -z "${HAVE_XF86_ANSIC_H_TRUE}" && test -z "${HAVE_XF86_ANSIC_H_FALSE}"; then + { { echo "$as_me:$LINENO: error: conditional \"HAVE_XF86_ANSIC_H\" was never defined. +Usually this means the macro was only invoked conditionally." >&5 +echo "$as_me: error: conditional \"HAVE_XF86_ANSIC_H\" was never defined. +Usually this means the macro was only invoked conditionally." >&2;} + { (exit 1); exit 1; }; } +fi if test -z "${ATOM_BIOS_TRUE}" && test -z "${ATOM_BIOS_FALSE}"; then { { echo "$as_me:$LINENO: error: conditional \"ATOM_BIOS\" was never defined. Usually this means the macro was only invoked conditionally." >&5 @@ -21408,7 +21672,7 @@ _ASBOX } >&5 cat >&5 <<_CSEOF -This file was extended by xf86-video-radeonhd $as_me 1.0.0, which was +This file was extended by xf86-video-radeonhd $as_me 1.1.0, which was generated by GNU Autoconf 2.59. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -21471,7 +21735,7 @@ _ACEOF cat >>$CONFIG_STATUS <<_ACEOF ac_cs_version="\\ -xf86-video-radeonhd config.status 1.0.0 +xf86-video-radeonhd config.status 1.1.0 configured by $0, generated by GNU Autoconf 2.59, with options \\"`echo "$ac_configure_args" | sed 's/[\\""\`\$]/\\\\&/g'`\\" @@ -21744,8 +22008,12 @@ s,@PKG_CONFIG@,$PKG_CONFIG,;t t s,@ac_pt_PKG_CONFIG@,$ac_pt_PKG_CONFIG,;t t s,@XORG_CFLAGS@,$XORG_CFLAGS,;t t s,@XORG_LIBS@,$XORG_LIBS,;t t +s,@PCIUTILS_CFLAGS@,$PCIUTILS_CFLAGS,;t t +s,@PCIUTILS_LIBS@,$PCIUTILS_LIBS,;t t s,@HAVE_PCI_PCI_H_TRUE@,$HAVE_PCI_PCI_H_TRUE,;t t s,@HAVE_PCI_PCI_H_FALSE@,$HAVE_PCI_PCI_H_FALSE,;t t +s,@HAVE_XF86_ANSIC_H_TRUE@,$HAVE_XF86_ANSIC_H_TRUE,;t t +s,@HAVE_XF86_ANSIC_H_FALSE@,$HAVE_XF86_ANSIC_H_FALSE,;t t s,@ATOM_BIOS_TRUE@,$ATOM_BIOS_TRUE,;t t s,@ATOM_BIOS_FALSE@,$ATOM_BIOS_FALSE,;t t s,@ATOM_BIOS_PARSER_TRUE@,$ATOM_BIOS_PARSER_TRUE,;t t diff --git a/driver/xf86-video-radeonhd/man/Makefile.in b/driver/xf86-video-radeonhd/man/Makefile.in index a8b920e81..3789601f5 100644 --- a/driver/xf86-video-radeonhd/man/Makefile.in +++ b/driver/xf86-video-radeonhd/man/Makefile.in @@ -14,7 +14,7 @@ @SET_MAKE@ -# $Id: Makefile.in,v 1.2 2007/12/04 22:27:40 matthieu Exp $ +# $Id: Makefile.in,v 1.3 2008/01/05 17:34:43 matthieu Exp $ # # Copyright 2005 Sun Microsystems, Inc. All rights reserved. # @@ -129,6 +129,8 @@ FILE_MAN_DIR = @FILE_MAN_DIR@ FILE_MAN_SUFFIX = @FILE_MAN_SUFFIX@ HAVE_PCI_PCI_H_FALSE = @HAVE_PCI_PCI_H_FALSE@ HAVE_PCI_PCI_H_TRUE = @HAVE_PCI_PCI_H_TRUE@ +HAVE_XF86_ANSIC_H_FALSE = @HAVE_XF86_ANSIC_H_FALSE@ +HAVE_XF86_ANSIC_H_TRUE = @HAVE_XF86_ANSIC_H_TRUE@ HAVE_ZLIB_FALSE = @HAVE_ZLIB_FALSE@ HAVE_ZLIB_TRUE = @HAVE_ZLIB_TRUE@ INSTALL_DATA = @INSTALL_DATA@ @@ -157,6 +159,8 @@ PACKAGE_STRING = @PACKAGE_STRING@ PACKAGE_TARNAME = @PACKAGE_TARNAME@ PACKAGE_VERSION = @PACKAGE_VERSION@ PATH_SEPARATOR = @PATH_SEPARATOR@ +PCIUTILS_CFLAGS = @PCIUTILS_CFLAGS@ +PCIUTILS_LIBS = @PCIUTILS_LIBS@ PEDANTIC_CFLAGS = @PEDANTIC_CFLAGS@ PKG_CONFIG = @PKG_CONFIG@ RANDR_VERSION = @RANDR_VERSION@ diff --git a/driver/xf86-video-radeonhd/src/Makefile.in b/driver/xf86-video-radeonhd/src/Makefile.in index 0f38e2801..aa5811d7b 100644 --- a/driver/xf86-video-radeonhd/src/Makefile.in +++ b/driver/xf86-video-radeonhd/src/Makefile.in @@ -168,6 +168,8 @@ FILE_MAN_DIR = @FILE_MAN_DIR@ FILE_MAN_SUFFIX = @FILE_MAN_SUFFIX@ HAVE_PCI_PCI_H_FALSE = @HAVE_PCI_PCI_H_FALSE@ HAVE_PCI_PCI_H_TRUE = @HAVE_PCI_PCI_H_TRUE@ +HAVE_XF86_ANSIC_H_FALSE = @HAVE_XF86_ANSIC_H_FALSE@ +HAVE_XF86_ANSIC_H_TRUE = @HAVE_XF86_ANSIC_H_TRUE@ HAVE_ZLIB_FALSE = @HAVE_ZLIB_FALSE@ HAVE_ZLIB_TRUE = @HAVE_ZLIB_TRUE@ INSTALL_DATA = @INSTALL_DATA@ @@ -196,6 +198,8 @@ PACKAGE_STRING = @PACKAGE_STRING@ PACKAGE_TARNAME = @PACKAGE_TARNAME@ PACKAGE_VERSION = @PACKAGE_VERSION@ PATH_SEPARATOR = @PATH_SEPARATOR@ +PCIUTILS_CFLAGS = @PCIUTILS_CFLAGS@ +PCIUTILS_LIBS = @PCIUTILS_LIBS@ PEDANTIC_CFLAGS = @PEDANTIC_CFLAGS@ PKG_CONFIG = @PKG_CONFIG@ RANDR_VERSION = @RANDR_VERSION@ diff --git a/driver/xf86-video-radeonhd/utils/conntest/Makefile.in b/driver/xf86-video-radeonhd/utils/conntest/Makefile.in index 0a84f70bb..dd058c272 100644 --- a/driver/xf86-video-radeonhd/utils/conntest/Makefile.in +++ b/driver/xf86-video-radeonhd/utils/conntest/Makefile.in @@ -116,6 +116,8 @@ FILE_MAN_DIR = @FILE_MAN_DIR@ FILE_MAN_SUFFIX = @FILE_MAN_SUFFIX@ HAVE_PCI_PCI_H_FALSE = @HAVE_PCI_PCI_H_FALSE@ HAVE_PCI_PCI_H_TRUE = @HAVE_PCI_PCI_H_TRUE@ +HAVE_XF86_ANSIC_H_FALSE = @HAVE_XF86_ANSIC_H_FALSE@ +HAVE_XF86_ANSIC_H_TRUE = @HAVE_XF86_ANSIC_H_TRUE@ HAVE_ZLIB_FALSE = @HAVE_ZLIB_FALSE@ HAVE_ZLIB_TRUE = @HAVE_ZLIB_TRUE@ INSTALL_DATA = @INSTALL_DATA@ @@ -144,6 +146,8 @@ PACKAGE_STRING = @PACKAGE_STRING@ PACKAGE_TARNAME = @PACKAGE_TARNAME@ PACKAGE_VERSION = @PACKAGE_VERSION@ PATH_SEPARATOR = @PATH_SEPARATOR@ +PCIUTILS_CFLAGS = @PCIUTILS_CFLAGS@ +PCIUTILS_LIBS = @PCIUTILS_LIBS@ PEDANTIC_CFLAGS = @PEDANTIC_CFLAGS@ PKG_CONFIG = @PKG_CONFIG@ RANDR_VERSION = @RANDR_VERSION@ @@ -212,11 +216,11 @@ GIT_VERSION_CMD = $(SHELL) $(top_srcdir)/git_version.sh EXTRA_DIST = README Imakefile # Including config.h requires xorg-config.h, so we need the XORG_CFLAGS here -AM_CFLAGS = @XORG_CFLAGS@ @WARN_CFLAGS@ +AM_CFLAGS = @XORG_CFLAGS@ @WARN_CFLAGS@ @PCIUTILS_CFLAGS@ AM_CPPFLAGS = -I$(top_srcdir)/src/AtomBios/includes rhd_conntest_SOURCES = rhd_conntest.c nodist_rhd_conntest_SOURCES = git_version.h -rhd_conntest_LDADD = -lz -lpci +rhd_conntest_LDADD = @PCIUTILS_LIBS@ all: $(BUILT_SOURCES) $(MAKE) $(AM_MAKEFLAGS) all-am |