Hello community,
here is the log from the commit of package xorg-x11-proto-devel for
openSUSE:Factory
checked in at Thu Sep 1 12:00:51 CEST 2011.
--------
--- xorg-x11-proto-devel/xorg-x11-proto-devel.changes 2011-05-18
21:17:37.000000000 +0200
+++
/mounts/work_src_done/STABLE/xorg-x11-proto-devel/xorg-x11-proto-devel.changes
2011-08-30 17:30:38.000000000 +0200
@@ -1,0 +2,18 @@
+Tue Aug 30 14:53:08 UTC 2011 - sndir...@suse.com
+
+- update util-macros to release 1.15.0
+- obsoletes xorg-patch5473.patch
+
+-------------------------------------------------------------------
+Sat Aug 13 15:21:11 UTC 2011 - v...@ovi.com
+
+- Update dri2proto 2.6
+ * Needed by next Mesa release.
+
+-------------------------------------------------------------------
+Fri Aug 12 11:25:11 UTC 2011 - v...@ovi.com
+
+- Update glproto 1.4.14
+ * Recquired for next Mesa release.
+
+-------------------------------------------------------------------
calling whatdependson for head-i586
Old:
----
_service
_service:download_files:util-macros-1.13.0.tar.bz2
dri2proto-2.3.tar.bz2
glproto-1.4.12.tar.bz2
util-macros-1.11.0.tar.bz2
xorg-patch5473.patch
New:
----
dri2proto-2.6.tar.bz2
glproto-1.4.14.tar.bz2
util-macros-1.15.0.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ xorg-x11-proto-devel.spec ++++++
--- /var/tmp/diff_new_pack.ayR44K/_old 2011-09-01 12:00:27.000000000 +0200
+++ /var/tmp/diff_new_pack.ayR44K/_new 2011-09-01 12:00:27.000000000 +0200
@@ -24,7 +24,7 @@
Provides: pkgconfig(applewmproto) pkgconfig(bigreqsprot)
pkgconfig(compositeproto) pkgconfig(damageproto) pkgconfig(dmxproto)
pkgconfig(dri2proto) pkgconfig(evieext) pkgconfig(fixesproto)
pkgconfig(fontcacheproto) pkgconfig(fontsproto) pkgconfig(glproto)
pkgconfig(inputproto) pkgconfig(kbproto) pkgconfig(libpthread-stubs)
pkgconfig(printproto) pkgconfig(randrproto) pkgconfig(recordproto)
pkgconfig(renderproto) pkgconfig(resourceproto) pkgconfig(scrnsaveproto)
pkgconfig(trapproto) pkgconfig(util-macros) pkgconfig(videoproto)
pkgconfig(vncproto) pkgconfig(windowswmproto) pkgconfig(xcb-proto)
pkgconfig(xcliplistproto) pkgconfig(xcmiscproto) pkgconfig(x86bigfontproto)
pkgconfig(xf86dgaproto) pkgconfig(xf86driproto) pkgconfig(xf86miscproto)
pkgconfig(xf86rushproto) pkgconfig(xf86vidmodeproto) pkgconfig(xineramaproto)
pkgconfig(xproto) pkgconfig(xproxymanagementprotocol)
Url: http://xorg.freedesktop.org/
Version: 7.6
-Release: 20
+Release: 22
License: GPLv2+ ; MIT License (or similar)
BuildRoot: %{_tmppath}/%{name}-%{version}-build
Group: Development/Libraries/X11
@@ -37,7 +37,7 @@
Source5: fixesproto-5.0.tar.bz2
Source6: fontcacheproto-0.1.3.tar.bz2
Source7: fontsproto-2.1.1.tar.bz2
-Source8: glproto-1.4.12.tar.bz2
+Source8: glproto-1.4.14.tar.bz2
Source9: inputproto-2.0.1.tar.bz2
Source10: kbproto-1.0.5.tar.bz2
Source11: printproto-1.0.4.tar.bz2
@@ -47,7 +47,7 @@
Source15: resourceproto-1.1.1.tar.bz2
Source16: scrnsaverproto-1.2.1.tar.bz2
Source17: trapproto-X11R7.0-3.4.3.tar.bz2
-Source18:
ftp://ftp.fu-berlin.de/unix/X11/FTP.X.ORG/pub/individual/util/util-macros-1.13.0.tar.bz2
+Source18: util-macros-1.15.0.tar.bz2
Source19: videoproto-2.3.1.tar.bz2
Source20: windowswmproto-1.0.4.tar.bz2
Source21: xcmiscproto-1.2.1.tar.bz2
@@ -66,8 +66,7 @@
Source34: libpthread-stubs-0.3.tar.bz2
Source35: vncproto-20070501.tar.bz2
Source36: xcliplistproto-20070501.tar.bz2
-Source37: dri2proto-2.3.tar.bz2
-Patch1:
[http:]//patchwork.freedesktop.org/patch/5473/raw/xorg-patch5473.patch
+Source37: dri2proto-2.6.tar.bz2
Requires: glibc-devel python-base = %{py_ver}
%description
@@ -93,8 +92,6 @@
%prep
%setup -T -c %{name}
for i in $RPM_SOURCE_DIR/*.tar.bz2; do tar xjf $i; done
-cd util-macros-1.11.0
-%patch1 -p1
%build
++++++ dri2proto-2.3.tar.bz2 -> dri2proto-2.6.tar.bz2 ++++++
++++ 23495 lines of diff (skipped)
++++++ glproto-1.4.12.tar.bz2 -> glproto-1.4.14.tar.bz2 ++++++
++++ 21632 lines of diff (skipped)
++++++ util-macros-1.11.0.tar.bz2 -> util-macros-1.15.0.tar.bz2 ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/util-macros-1.11.0/ChangeLog
new/util-macros-1.15.0/ChangeLog
--- old/util-macros-1.11.0/ChangeLog 2010-10-30 05:44:37.000000000 +0200
+++ new/util-macros-1.15.0/ChangeLog 2011-06-24 02:15:52.000000000 +0200
@@ -1,3 +1,267 @@
+commit 08dd5d30c137abe43d5b1673edc39eb569881d66
+Author: Gaetan Nadon <mems...@videotron.ca>
+Date: Thu Jun 23 08:03:13 2011 -0400
+
+ Version bump: 1.15.0
+
+ Signed-off-by: Gaetan Nadon <mems...@videotron.ca>
+
+commit b87c5e7f6c9e856cf82c3c531255adccbd9fae5c
+Author: Gaetan Nadon <mems...@videotron.ca>
+Date: Wed Jun 22 12:42:30 2011 -0400
+
+ XORG_WITH_XSLTPROC: warn at development time rather than config time
+
+ Catching up unimplemented features should be done earlier by the developer
+ during autoconf rather than during configure.
+
+ Reviewed-by: Dan Nicholson <dbn.li...@gmail.com>
+ Signed-off-by: Gaetan Nadon <mems...@videotron.ca>
+
+commit f3332a7214af43878691b4f4876c39dc7d546266
+Author: Gaetan Nadon <mems...@videotron.ca>
+Date: Wed Jun 22 10:02:28 2011 -0400
+
+ Add XORG_WITH_PERL macro
+
+ Following the same pattern as XMLTO and friends.
+ Allows all modules to use the same interface, variables
+ and options to check for perl.
+ Perl is used in libX11 and xserver.
+
+ Reviewed-by: Dan Nicholson <dbn.li...@gmail.com>
+ Signed-off-by: Gaetan Nadon <mems...@videotron.ca>
+
+commit b927af52e8a3384126bfe709b725f6c5bad4ba34
+Author: Gaetan Nadon <mems...@videotron.ca>
+Date: Wed Jun 22 09:04:32 2011 -0400
+
+ XORG_WITH_FOP: add minimum version checking support
+
+ Adding this feature is motivated by a bug in fop 0.95 where
+ fop crashes in the presence of some characters like the latin capital
+ sharp s. Fop version 1.0 works correctly.
+
+ This is the same feature found in XMLTO and the likes.
+ In the macro public interface there is a shift in parameter position
+ for the DEFAULT parameter. Doing development on older libraries
+ (point releases on older versions) will still work the same way as
+ the "no" value will be interpreted as the minimum version. It won't
+ be found, so fop will be disabled anyway.
+
+ Only libX11 has used XORG_WITH_FOP(no) and will be changed with a version
+ bump on util-macros.
+
+ Reviewed-by: Dan Nicholson <dbn.li...@gmail.com>
+ Signed-off-by: Gaetan Nadon <mems...@videotron.ca>
+
+commit 45c7d622657d295b2c02a46061765827ea37f00f
+Author: Gaetan Nadon <mems...@videotron.ca>
+Date: Wed Jun 1 08:59:53 2011 -0400
+
+ XORG_PROG_RAWCPP: use AC_LANG_SOURCE to prevent warnings
+
+ The source for the AC_LANG_CONFTEST should be passed to AC_LANG_SOURCE
+ to satisfy the more stringent testing done by autoconf 2.68.
+ It is available in autoconf 2.60 where AC_LANG_DEFINES_PROVIDED is not.
+
+ Reviewed-by: Alan Coopersmith <alan.coopersm...@oracle.com>
+ Signed-off-by: Gaetan Nadon <mems...@videotron.ca>
+
+commit 10a865fa671382dce50f7e49624ca5a730372d08
+Author: Alan Coopersmith <alan.coopersm...@oracle.com>
+Date: Fri May 27 19:01:13 2011 -0700
+
+ Version bump: 1.14.0
+
+ Signed-off-by: Alan Coopersmith <alan.coopersm...@oracle.com>
+
+commit e03a5cb9f313c6f5de3edc46327eb18b300b92c2
+Author: Alan Coopersmith <alan.coopersm...@oracle.com>
+Date: Sat May 14 09:10:13 2011 -0700
+
+ Add AC_LANG_DEFINES_PROVIDED to XORG_RAW_CPP to silence autoconf warnings
+
+ Since we're intentionally doing a special case to just check cpp output,
+ and not a full program compilation, add the magic macro to silence:
+
+ configure.ac:46: warning: AC_LANG_CONFTEST: no AC_LANG_SOURCE call
detected in body
+ ../../lib/autoconf/lang.m4:194: AC_LANG_CONFTEST is expanded from...
+ aclocal.m4:1077: XORG_PROG_RAWCPP is expanded from...
+ configure.ac:46: the top level
+
+ Signed-off-by: Alan Coopersmith <alan.coopersm...@oracle.com>
+
+commit 61f5a48a74680c316bee2bf93d6ef5d50a688f22
+Author: Alan Coopersmith <alan.coopersm...@oracle.com>
+Date: Mon May 2 16:52:26 2011 -0700
+
+ XORG_STRICT_OPTION: add -Werror=attributes to STRICT_CFLAGS for gcc
+
+ Flags unknown attributes as errors, if -Werror=attributes is supported.
+ (The -Werror=* option was first spotted in gcc 4.2.0 manuals.)
+
+ Signed-off-by: Alan Coopersmith <alan.coopersm...@oracle.com>
+ Reviewed-by: Jeremy Huddleston <jerem...@apple.com>
+
+commit 8a556afbe7ff81987597ca88e315fe66f10e4adc
+Author: Alan Coopersmith <alan.coopersm...@oracle.com>
+Date: Mon Apr 25 20:31:33 2011 -0700
+
+ Make XORG_STRICT_OPTION always set STRICT_CFLAGS
+
+ Still only adds it to CWARNFLAGS if --enable-strict-compilation is
+ passed, but sets the variable with the right flags for the compiler
+ so it's available for other checks in configure scripts.
+
+ Signed-off-by: Alan Coopersmith <alan.coopersm...@oracle.com>
+ Reviewed-by: Jeremy Huddleston <jerem...@apple.com>
+ Reviewed-by: Ian Romanick <ian.d.roman...@intel.com>
+ Reviewed-by: Gaetan Nadon <mems...@videotron.ca>
+
+commit ef7824119ede1d491936ef1715296b47419f4c9c
+Author: Alan Coopersmith <alan.coopersm...@oracle.com>
+Date: Mon Apr 25 20:26:48 2011 -0700
+
+ Create XORG_COMPILER_BRAND macro to centralize compiler checks
+
+ Check for gcc vs. intel vs. sun in one place, instead of
+ continuing to grow more places the check is replicated.
+
+ Add clang check here too, as it's now seeing a lot of use to build X.
+
+ Signed-off-by: Alan Coopersmith <alan.coopersm...@oracle.com>
+ Reviewed-by: Jeremy Huddleston <jerem...@apple.com>
+ Reviewed-by: Ian Romanick <ian.d.roman...@intel.com>
+ Reviewed-by: Gaetan Nadon <mems...@videotron.ca>
+
+commit 5bb0cddcc5359d764015299021718f42b0a4055c
+Author: Gaetan Nadon <mems...@videotron.ca>
+Date: Mon Mar 14 20:12:36 2011 -0400
+
+ Version bump: 1.13.0
+
+ Signed-off-by: Gaetan Nadon <mems...@videotron.ca>
+
+commit 700ecdc16426c14e649439138e8e40cdc41fe1c1
+Author: Gaetan Nadon <mems...@videotron.ca>
+Date: Wed Mar 9 18:53:43 2011 -0500
+
+ XORG_LD_WRAP: check if linker supports -wrap
+
+ Used mainly by test cases using a wrapper function.
+
+ Signed-off-by: Gaetan Nadon <mems...@videotron.ca>
+
+commit 380074140f7b1e3f8ea006a4b1d928d23706b81d
+Author: Gaetan Nadon <mems...@videotron.ca>
+Date: Wed Mar 9 10:53:49 2011 -0500
+
+ XORG_WITH_GLIB: check for the GLib package
+
+ XORG_WITH_GLIB([MIN-VERSION], [DEFAULT])
+ ----------------------------------------
+ Minimum version: 1.13.0
+
+ GLib is a library which provides advanced data structures and functions.
+ This macro enables a module to test for the presence of Glib.
+
+ When used in conjunction with XORG_ENABLE_UNIT_TESTS, use both
AM_CONDITIONAL
+ ENABLE_UNIT_TESTS and HAVE_GLIB.
+ Glib may be used for purpose other than testing
+
+ Package builders should use --without-glib to ensure it does not get
pulled in.
+ Unit tests may or may not use GLib.
+
+ Developers should use --with-glib to error out if GLib is missing.
+
+ Interface to module:
+ HAVE_GLIB: used in makefiles to conditionally build targets
+ with_glib: used in configure.ac to know if GLib has been found
+ --with-glib: 'yes' user instructs the module to use glib
+ 'no' user instructs the module not to use glib
+
+ Reviewed-by: Dan Nicholson <dbn.li...@gmail.com>
+ Signed-off-by: Gaetan Nadon <mems...@videotron.ca>
+
+commit 78af2b882e01b17e38d1361a4a58b7768bb59bec
+Author: Gaetan Nadon <mems...@videotron.ca>
+Date: Wed Mar 9 07:10:18 2011 -0500
+
+ XORG_ENABLE_UNIT_TESTS: add support for unit testing
+
+ This macro enables a builder to enable/disable unit testing
+ It makes no assumption about the test cases implementation
+ Test cases may or may not use Automake "Support for test suites"
+ They may or may not use the software utility library GLib
+
+ Reviewed-by: Dan Nicholson <dbn.li...@gmail.com>
+ Signed-off-by: Gaetan Nadon <mems...@videotron.ca>
+
+commit 1218d7e6ed064e0c534a01caf013cff666cb44bf
+Author: Gaetan Nadon <mems...@videotron.ca>
+Date: Fri Feb 25 16:58:10 2011 -0500
+
+ Version bump: 1.12.0
+
+ Signed-off-by: Gaetan Nadon <mems...@videotron.ca>
+
+commit b22ce580bcc8343b880f19cc7f1c6bea176c8f13
+Author: Gaetan Nadon <mems...@videotron.ca>
+Date: Sat Jan 29 16:17:09 2011 -0500
+
+ XORG_WITH_XSLTPROC: add XSLT processor command line tool
+
+ The primary use will be for DocBook/XML cross links database generation.
+
+ XSLT (Extensible Stylesheet Language Transformations) is a declarative,
+ XML-based language used for the transformation of XML documents.
+ The xsltproc command line tool is for applying XSLT stylesheets
+ to XML documents.
+
+ It is used under the cover by xmlto to generate html files from
DocBook/XML.
+ The XSLT processor is often used as a standalone tool for transformations.
+ It should not be assumed that it is used only to work with documnetation.
+
+ Tested-by: Matt Dew <mar...@osource.org>
+ Signed-off-by: Gaetan Nadon <mems...@videotron.ca>
+
+commit 7370b0b3f0308aec2a32012eddb2f0761d5fe399
+Author: Alan Coopersmith <alan.coopersm...@oracle.com>
+Date: Sun Dec 5 01:25:11 2010 -0800
+
+ Use AC_LANG_PROGRAM in XORG_CHECK_MALLOC_ZERO to clear autoconf-2.68
warnings
+
+ configure.ac:126: warning: AC_LANG_CONFTEST: no AC_LANG_SOURCE call
detected in body
+ ../../lib/autoconf/lang.m4:194: AC_LANG_CONFTEST is expanded from...
+ ../../lib/autoconf/general.m4:2730: _AC_RUN_IFELSE is expanded from...
+ ../../lib/m4sugar/m4sh.m4:606: AS_IF is expanded from...
+ ../../lib/autoconf/general.m4:2749: AC_RUN_IFELSE is expanded from...
+ aclocal.m4:1952: XORG_CHECK_MALLOC_ZERO is expanded from...
+ configure.ac:126: the top level
+
+ Also, calloc() takes two arguments; and all of them return void *,
+ not char *; as the compiler points out when you #include <stdlib.h>
+ instead of faking it badly. (And sometimes when you don't, due to
+ compiler builtin versions of the functions.)
+
+ Signed-off-by: Alan Coopersmith <alan.coopersm...@oracle.com>
+ Reviewed-by: Matt Turner <matts...@gmail.com>
+ Reviewed-by: Dan Nicholson <dbn.li...@gmail.com>
+ Reviewed-by: Gaetan Nadon <mems...@videotron.ca>
+
+commit 04030cbca37c04c48161debc0cade6db00cb347b
+Author: Gaetan Nadon <mems...@videotron.ca>
+Date: Sat Nov 6 20:50:06 2010 -0400
+
+ XORG_ENABLE_DOCS: Fix "Enable building the documentation (yes: yes)"
+
+ The quoting did not prevent the m4 defined variable "default"
+ to replace the text string "default" in the help text.
+
+ Reviewed-by: Dan Nicholson <dbn.li...@gmail.com>
+ Signed-off-by: Gaetan Nadon <mems...@videotron.ca>
+
commit ce32345589050b17b23b18157f95f060f4c776a3
Author: Alan Coopersmith <alan.coopersm...@oracle.com>
Date: Fri Oct 29 20:43:53 2010 -0700
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/util-macros-1.11.0/configure
new/util-macros-1.15.0/configure
--- old/util-macros-1.11.0/configure 2010-10-30 05:44:35.000000000 +0200
+++ new/util-macros-1.15.0/configure 2011-06-23 14:06:38.000000000 +0200
@@ -1,6 +1,6 @@
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.68 for util-macros 1.11.0.
+# Generated by GNU Autoconf 2.68 for util-macros 1.15.0.
#
# Report bugs to <https://bugs.freedesktop.org/enter_bug.cgi?product=xorg>.
#
@@ -560,8 +560,8 @@
# Identity of this package.
PACKAGE_NAME='util-macros'
PACKAGE_TARNAME='util-macros'
-PACKAGE_VERSION='1.11.0'
-PACKAGE_STRING='util-macros 1.11.0'
+PACKAGE_VERSION='1.15.0'
+PACKAGE_STRING='util-macros 1.15.0'
PACKAGE_BUGREPORT='https://bugs.freedesktop.org/enter_bug.cgi?product=xorg'
PACKAGE_URL=''
@@ -1183,7 +1183,7 @@
# 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 util-macros 1.11.0 to adapt to many kinds of systems.
+\`configure' configures util-macros 1.15.0 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
@@ -1249,7 +1249,7 @@
if test -n "$ac_init_help"; then
case $ac_init_help in
- short | recursive ) echo "Configuration of util-macros 1.11.0:";;
+ short | recursive ) echo "Configuration of util-macros 1.15.0:";;
esac
cat <<\_ACEOF
@@ -1323,7 +1323,7 @@
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
-util-macros configure 1.11.0
+util-macros configure 1.15.0
generated by GNU Autoconf 2.68
Copyright (C) 2010 Free Software Foundation, Inc.
@@ -1340,7 +1340,7 @@
This file contains any messages produced by compilers while
running configure, to aid debugging if configure makes a mistake.
-It was created by util-macros $as_me 1.11.0, which was
+It was created by util-macros $as_me 1.15.0, which was
generated by GNU Autoconf 2.68. Invocation command line was
$ $0 $@
@@ -2156,7 +2156,7 @@
# Define the identity of the package.
PACKAGE='util-macros'
- VERSION='1.11.0'
+ VERSION='1.15.0'
cat >>confdefs.h <<_ACEOF
@@ -2837,7 +2837,7 @@
# report actual input values of CONFIG_FILES etc. instead of their
# values after options handling.
ac_log="
-This file was extended by util-macros $as_me 1.11.0, which was
+This file was extended by util-macros $as_me 1.15.0, which was
generated by GNU Autoconf 2.68. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
@@ -2890,7 +2890,7 @@
cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //;
s/[\\""\`\$]/\\\\&/g'`"
ac_cs_version="\\
-util-macros config.status 1.11.0
+util-macros config.status 1.15.0
configured by $0, generated by GNU Autoconf 2.68,
with options \\"\$ac_cs_config\\"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/util-macros-1.11.0/configure.ac
new/util-macros-1.15.0/configure.ac
--- old/util-macros-1.11.0/configure.ac 2010-10-30 05:42:30.000000000 +0200
+++ new/util-macros-1.15.0/configure.ac 2011-06-23 14:02:56.000000000 +0200
@@ -23,7 +23,7 @@
AC_PREREQ([2.60])
AC_INIT([util-macros],
- [1.11.0],
+ [1.15.0],
[https://bugs.freedesktop.org/enter_bug.cgi?product=xorg],
[util-macros])
AC_CONFIG_SRCDIR([Makefile.am])
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/util-macros-1.11.0/xorg-macros.m4.in
new/util-macros-1.15.0/xorg-macros.m4.in
--- old/util-macros-1.11.0/xorg-macros.m4.in 2010-10-30 05:42:04.000000000
+0200
+++ new/util-macros-1.15.0/xorg-macros.m4.in 2011-06-23 02:31:19.000000000
+0200
@@ -64,7 +64,7 @@
# which is not the best choice for supporting other OS'es, but covers most
# of the ones we need for now.
AC_MSG_CHECKING([if $RAWCPP requires -undef])
-AC_LANG_CONFTEST([Does cpp redefine unix ?])
+AC_LANG_CONFTEST([AC_LANG_SOURCE([[Does cpp redefine unix ?]])])
if test `${RAWCPP} < conftest.$ac_ext | grep -c 'unix'` -eq 1 ; then
AC_MSG_RESULT([no])
else
@@ -82,7 +82,7 @@
rm -f conftest.$ac_ext
AC_MSG_CHECKING([if $RAWCPP requires -traditional])
-AC_LANG_CONFTEST([Does cpp preserve "whitespace"?])
+AC_LANG_CONFTEST([AC_LANG_SOURCE([[Does cpp preserve "whitespace"?]])])
if test `${RAWCPP} < conftest.$ac_ext | grep -c 'preserve \"'` -eq 1 ; then
AC_MSG_RESULT([no])
else
@@ -432,6 +432,123 @@
AM_CONDITIONAL([HAVE_XMLTO], [test "$have_xmlto" = yes])
]) # XORG_WITH_XMLTO
+# XORG_WITH_XSLTPROC([MIN-VERSION], [DEFAULT])
+# --------------------------------------------
+# Minimum version: 1.12.0
+# Minimum version for optional DEFAULT argument: 1.12.0
+#
+# XSLT (Extensible Stylesheet Language Transformations) is a declarative,
+# XML-based language used for the transformation of XML documents.
+# The xsltproc command line tool is for applying XSLT stylesheets to XML
documents.
+# It is used under the cover by xmlto to generate html files from DocBook/XML.
+# The XSLT processor is often used as a standalone tool for transformations.
+# It should not be assumed that this tool is used only to work with
documnetation.
+# When DEFAULT is not specified, --with-xsltproc assumes 'auto'.
+#
+# Interface to module:
+# HAVE_XSLTPROC: used in makefiles to conditionally generate documentation
+# XSLTPROC: returns the path of the xsltproc program found
+# returns the path set by the user in the environment
+# --with-xsltproc: 'yes' user instructs the module to use xsltproc
+# 'no' user instructs the module not to use xsltproc
+# have_xsltproc: returns yes if xsltproc found in PATH or no
+#
+# If the user sets the value of XSLTPROC, AC_PATH_PROG skips testing the path.
+#
+AC_DEFUN([XORG_WITH_XSLTPROC],[
+AC_ARG_VAR([XSLTPROC], [Path to xsltproc command])
+# Preserves the interface, should it be implemented later
+m4_ifval([$1], [m4_warn([syntax], [Checking for xsltproc MIN-VERSION is not
implemented])])
+m4_define([_defopt], m4_default([$2], [auto]))
+AC_ARG_WITH(xsltproc,
+ AS_HELP_STRING([--with-xsltproc],
+ [Use xsltproc for the transformation of XML documents (default:
]_defopt[)]),
+ [use_xsltproc=$withval], [use_xsltproc=]_defopt)
+m4_undefine([_defopt])
+
+if test "x$use_xsltproc" = x"auto"; then
+ AC_PATH_PROG([XSLTPROC], [xsltproc])
+ if test "x$XSLTPROC" = "x"; then
+ AC_MSG_WARN([xsltproc not found - cannot transform XML documents])
+ have_xsltproc=no
+ else
+ have_xsltproc=yes
+ fi
+elif test "x$use_xsltproc" = x"yes" ; then
+ AC_PATH_PROG([XSLTPROC], [xsltproc])
+ if test "x$XSLTPROC" = "x"; then
+ AC_MSG_ERROR([--with-xsltproc=yes specified but xsltproc not found in
PATH])
+ fi
+ have_xsltproc=yes
+elif test "x$use_xsltproc" = x"no" ; then
+ if test "x$XSLTPROC" != "x"; then
+ AC_MSG_WARN([ignoring XSLTPROC environment variable since
--with-xsltproc=no was specified])
+ fi
+ have_xsltproc=no
+else
+ AC_MSG_ERROR([--with-xsltproc expects 'yes' or 'no'])
+fi
+
+AM_CONDITIONAL([HAVE_XSLTPROC], [test "$have_xsltproc" = yes])
+]) # XORG_WITH_XSLTPROC
+
+# XORG_WITH_PERL([MIN-VERSION], [DEFAULT])
+# ----------------------------------------
+# Minimum version: 1.15.0
+#
+# PERL (Practical Extraction and Report Language) is a language optimized for
+# scanning arbitrary text files, extracting information from those text files,
+# and printing reports based on that information.
+#
+# When DEFAULT is not specified, --with-perl assumes 'auto'.
+#
+# Interface to module:
+# HAVE_PERL: used in makefiles to conditionally scan text files
+# PERL: returns the path of the perl program found
+# returns the path set by the user in the environment
+# --with-perl: 'yes' user instructs the module to use perl
+# 'no' user instructs the module not to use perl
+# have_perl: returns yes if perl found in PATH or no
+#
+# If the user sets the value of PERL, AC_PATH_PROG skips testing the path.
+#
+AC_DEFUN([XORG_WITH_PERL],[
+AC_ARG_VAR([PERL], [Path to perl command])
+# Preserves the interface, should it be implemented later
+m4_ifval([$1], [m4_warn([syntax], [Checking for perl MIN-VERSION is not
implemented])])
+m4_define([_defopt], m4_default([$2], [auto]))
+AC_ARG_WITH(perl,
+ AS_HELP_STRING([--with-perl],
+ [Use perl for extracting information from files (default:
]_defopt[)]),
+ [use_perl=$withval], [use_perl=]_defopt)
+m4_undefine([_defopt])
+
+if test "x$use_perl" = x"auto"; then
+ AC_PATH_PROG([PERL], [perl])
+ if test "x$PERL" = "x"; then
+ AC_MSG_WARN([perl not found - cannot extract information and report])
+ have_perl=no
+ else
+ have_perl=yes
+ fi
+elif test "x$use_perl" = x"yes" ; then
+ AC_PATH_PROG([PERL], [perl])
+ if test "x$PERL" = "x"; then
+ AC_MSG_ERROR([--with-perl=yes specified but perl not found in PATH])
+ fi
+ have_perl=yes
+elif test "x$use_perl" = x"no" ; then
+ if test "x$PERL" != "x"; then
+ AC_MSG_WARN([ignoring PERL environment variable since --with-perl=no was
specified])
+ fi
+ have_perl=no
+else
+ AC_MSG_ERROR([--with-perl expects 'yes' or 'no'])
+fi
+
+AM_CONDITIONAL([HAVE_PERL], [test "$have_perl" = yes])
+]) # XORG_WITH_PERL
+
# XORG_WITH_ASCIIDOC([MIN-VERSION], [DEFAULT])
# ----------------
# Minimum version: 1.5.0
@@ -677,10 +794,11 @@
AM_CONDITIONAL([HAVE_GROFF_HTML], [test "$have_groff_html" = yes])
]) # XORG_WITH_GROFF
-# XORG_WITH_FOP([DEFAULT])
-# ----------------
+# XORG_WITH_FOP([MIN-VERSION], [DEFAULT])
+# ---------------------------------------
# Minimum version: 1.6.0
# Minimum version for optional DEFAULT argument: 1.11.0
+# Minimum version for optional MIN-VERSION argument: 1.15.0
#
# Documentation tools are not always available on all platforms and sometimes
# not at the appropriate level. This macro enables a module to test for the
@@ -700,7 +818,7 @@
#
AC_DEFUN([XORG_WITH_FOP],[
AC_ARG_VAR([FOP], [Path to fop command])
-m4_define([_defopt], m4_default([$1], [auto]))
+m4_define([_defopt], m4_default([$2], [auto]))
AC_ARG_WITH(fop,
AS_HELP_STRING([--with-fop],
[Use fop to regenerate documentation (default: ]_defopt[)]),
@@ -729,6 +847,22 @@
else
AC_MSG_ERROR([--with-fop expects 'yes' or 'no'])
fi
+
+# Test for a minimum version of fop, if provided.
+m4_ifval([$1],
+[if test "$have_fop" = yes; then
+ # scrape the fop version
+ AC_MSG_CHECKING([for fop minimum version])
+ fop_version=`$FOP -version 2>/dev/null | cut -d' ' -f3`
+ AC_MSG_RESULT([$fop_version])
+ AS_VERSION_COMPARE([$fop_version], [$1],
+ [if test "x$use_fop" = xauto; then
+ AC_MSG_WARN([fop version $fop_version found, but $1 needed])
+ have_fop=no
+ else
+ AC_MSG_ERROR([fop version $fop_version found, but $1 needed])
+ fi])
+fi])
AM_CONDITIONAL([HAVE_FOP], [test "$have_fop" = yes])
]) # XORG_WITH_FOP
@@ -811,12 +945,12 @@
# parm1: specify the default value, yes or no.
#
AC_DEFUN([XORG_ENABLE_DOCS],[
-m4_define([default], m4_default([$1], [yes]))
+m4_define([docs_default], m4_default([$1], [yes]))
AC_ARG_ENABLE(docs,
AS_HELP_STRING([--enable-docs],
- [Enable building the documentation (default: ]default[)]),
- [build_docs=$enableval], [build_docs=]default)
-m4_undefine([default])
+ [Enable building the documentation (default: ]docs_default[)]),
+ [build_docs=$enableval], [build_docs=]docs_default)
+m4_undefine([docs_default])
AM_CONDITIONAL(ENABLE_DOCS, [test x$build_docs = xyes])
AC_MSG_CHECKING([whether to build documentation])
AC_MSG_RESULT([$build_docs])
@@ -888,6 +1022,194 @@
AC_MSG_RESULT([$build_specs])
]) # XORG_ENABLE_SPECS
+# XORG_ENABLE_UNIT_TESTS (enable_unit_tests=auto)
+# ----------------------------------------------
+# Minimum version: 1.13.0
+#
+# This macro enables a builder to enable/disable unit testing
+# It makes no assumption about the test cases implementation
+# Test cases may or may not use Automake "Support for test suites"
+# They may or may not use the software utility library GLib
+#
+# When used in conjunction with XORG_WITH_GLIB, use both AM_CONDITIONAL
+# ENABLE_UNIT_TESTS and HAVE_GLIB. Not all unit tests may use glib.
+# The variable enable_unit_tests is used by other macros in this file.
+#
+# Interface to module:
+# ENABLE_UNIT_TESTS: used in makefiles to conditionally build tests
+# enable_unit_tests: used in configure.ac for additional configuration
+# --enable-unit-tests: 'yes' user instructs the module to build tests
+# 'no' user instructs the module not to build tests
+# parm1: specify the default value, yes or no.
+#
+AC_DEFUN([XORG_ENABLE_UNIT_TESTS],[
+AC_BEFORE([$0], [XORG_WITH_GLIB])
+AC_BEFORE([$0], [XORG_LD_WRAP])
+m4_define([_defopt], m4_default([$1], [auto]))
+AC_ARG_ENABLE(unit-tests, AS_HELP_STRING([--enable-unit-tests],
+ [Enable building unit test cases (default: ]_defopt[)]),
+ [enable_unit_tests=$enableval], [enable_unit_tests=]_defopt)
+m4_undefine([_defopt])
+AM_CONDITIONAL(ENABLE_UNIT_TESTS, [test "x$enable_unit_tests" != xno])
+AC_MSG_CHECKING([whether to build unit test cases])
+AC_MSG_RESULT([$enable_unit_tests])
+]) # XORG_ENABLE_UNIT_TESTS
+
+# XORG_WITH_GLIB([MIN-VERSION], [DEFAULT])
+# ----------------------------------------
+# Minimum version: 1.13.0
+#
+# GLib is a library which provides advanced data structures and functions.
+# This macro enables a module to test for the presence of Glib.
+#
+# When used with ENABLE_UNIT_TESTS, it is assumed GLib is used for unit
testing.
+# Otherwise the value of $enable_unit_tests is blank.
+#
+# Interface to module:
+# HAVE_GLIB: used in makefiles to conditionally build targets
+# with_glib: used in configure.ac to know if GLib has been found
+# --with-glib: 'yes' user instructs the module to use glib
+# 'no' user instructs the module not to use glib
+#
+AC_DEFUN([XORG_WITH_GLIB],[
+AC_REQUIRE([PKG_PROG_PKG_CONFIG])
+m4_define([_defopt], m4_default([$2], [auto]))
+AC_ARG_WITH(glib, AS_HELP_STRING([--with-glib],
+ [Use GLib library for unit testing (default: ]_defopt[)]),
+ [with_glib=$withval], [with_glib=]_defopt)
+m4_undefine([_defopt])
+
+have_glib=no
+# Do not probe GLib if user explicitly disabled unit testing
+if test "x$enable_unit_tests" != x"no"; then
+ # Do not probe GLib if user explicitly disabled it
+ if test "x$with_glib" != x"no"; then
+ m4_ifval(
+ [$1],
+ [PKG_CHECK_MODULES([GLIB], [glib-2.0 >= $1], [have_glib=yes],
[have_glib=no])],
+ [PKG_CHECK_MODULES([GLIB], [glib-2.0], [have_glib=yes], [have_glib=no])]
+ )
+ fi
+fi
+
+# Not having GLib when unit testing has been explicitly requested is an error
+if test "x$enable_unit_tests" = x"yes"; then
+ if test "x$have_glib" = x"no"; then
+ AC_MSG_ERROR([--enable-unit-tests=yes specified but glib-2.0 not found])
+ fi
+fi
+
+# Having unit testing disabled when GLib has been explicitly requested is an
error
+if test "x$enable_unit_tests" = x"no"; then
+ if test "x$with_glib" = x"yes"; then
+ AC_MSG_ERROR([--enable-unit-tests=yes specified but glib-2.0 not found])
+ fi
+fi
+
+# Not having GLib when it has been explicitly requested is an error
+if test "x$with_glib" = x"yes"; then
+ if test "x$have_glib" = x"no"; then
+ AC_MSG_ERROR([--with-glib=yes specified but glib-2.0 not found])
+ fi
+fi
+
+AM_CONDITIONAL([HAVE_GLIB], [test "$have_glib" = yes])
+]) # XORG_WITH_GLIB
+
+# XORG_LD_WRAP
+# ------------
+# Minimum version: 1.13.0
+#
+# Check if linker supports -wrap, passed via compiler flags
+#
+# When used with ENABLE_UNIT_TESTS, it is assumed -wrap is used for unit
testing.
+# Otherwise the value of $enable_unit_tests is blank.
+#
+AC_DEFUN([XORG_LD_WRAP],[
+XORG_CHECK_LINKER_FLAGS([-Wl,-wrap,exit],[have_ld_wrap=yes],[have_ld_wrap=no])
+# Not having ld wrap when unit testing has been explicitly requested is an
error
+if test "x$enable_unit_tests" = x"yes"; then
+ if test "x$have_ld_wrap" = x"no"; then
+ AC_MSG_ERROR([--enable-unit-tests=yes specified but ld -wrap support is
not available])
+ fi
+fi
+AM_CONDITIONAL([HAVE_LD_WRAP], [test "$have_ld_wrap" = yes])
+#
+]) # XORG_LD_WRAP
+
+# XORG_CHECK_LINKER_FLAGS
+# -----------------------
+# SYNOPSIS
+#
+# XORG_CHECK_LINKER_FLAGS(FLAGS, [ACTION-SUCCESS], [ACTION-FAILURE])
+#
+# DESCRIPTION
+#
+# Check whether the given linker FLAGS work with the current language's
+# linker, or whether they give an error.
+#
+# ACTION-SUCCESS/ACTION-FAILURE are shell commands to execute on
+# success/failure.
+#
+# NOTE: Based on AX_CHECK_COMPILER_FLAGS.
+#
+# LICENSE
+#
+# Copyright (c) 2009 Mike Frysinger <vap...@gentoo.org>
+# Copyright (c) 2009 Steven G. Johnson <stev...@alum.mit.edu>
+# Copyright (c) 2009 Matteo Frigo
+#
+# This program is free software: you can redistribute it and/or modify it
+# under the terms of the GNU General Public License as published by the
+# Free Software Foundation, either version 3 of the License, or (at your
+# option) any later version.
+#
+# This program is distributed in the hope that it will be useful, but
+# WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General
+# Public License for more details.
+#
+# You should have received a copy of the GNU General Public License along
+# with this program. If not, see <http://www.gnu.org/licenses/>.
+#
+# As a special exception, the respective Autoconf Macro's copyright owner
+# gives unlimited permission to copy, distribute and modify the configure
+# scripts that are the output of Autoconf when processing the Macro. You
+# need not follow the terms of the GNU General Public License when using
+# or distributing such scripts, even though portions of the text of the
+# Macro appear in them. The GNU General Public License (GPL) does govern
+# all other use of the material that constitutes the Autoconf Macro.
+#
+# This special exception to the GPL applies to versions of the Autoconf
+# Macro released by the Autoconf Archive. When you make and distribute a
+# modified version of the Autoconf Macro, you may extend this special
+# exception to the GPL to apply to your modified version as well.#
+AC_DEFUN([XORG_CHECK_LINKER_FLAGS],
+[AC_MSG_CHECKING([whether the linker accepts $1])
+dnl Some hackery here since AC_CACHE_VAL can't handle a non-literal varname:
+AS_LITERAL_IF([$1],
+ [AC_CACHE_VAL(AS_TR_SH(xorg_cv_linker_flags_[$1]), [
+ ax_save_FLAGS=$LDFLAGS
+ LDFLAGS="$1"
+ AC_LINK_IFELSE([AC_LANG_PROGRAM()],
+ AS_TR_SH(xorg_cv_linker_flags_[$1])=yes,
+ AS_TR_SH(xorg_cv_linker_flags_[$1])=no)
+ LDFLAGS=$ax_save_FLAGS])],
+ [ax_save_FLAGS=$LDFLAGS
+ LDFLAGS="$1"
+ AC_LINK_IFELSE([AC_LANG_PROGRAM()],
+ eval AS_TR_SH(xorg_cv_linker_flags_[$1])=yes,
+ eval AS_TR_SH(xorg_cv_linker_flags_[$1])=no)
+ LDFLAGS=$ax_save_FLAGS])
+eval xorg_check_linker_flags=$AS_TR_SH(xorg_cv_linker_flags_[$1])
+AC_MSG_RESULT($xorg_check_linker_flags)
+if test "x$xorg_check_linker_flags" = xyes; then
+ m4_default([$2], :)
+else
+ m4_default([$3], :)
+fi
+]) # XORG_CHECK_LINKER_FLAGS
+
# XORG_CHECK_MALLOC_ZERO
# ----------------------
# Minimum version: 1.0.0
@@ -904,18 +1226,16 @@
AC_MSG_CHECKING([whether malloc(0) returns NULL])
if test "x$MALLOC_ZERO_RETURNS_NULL" = xauto; then
- AC_RUN_IFELSE([
-char *malloc();
-char *realloc();
-char *calloc();
-main() {
+ AC_RUN_IFELSE([AC_LANG_PROGRAM([
+#include <stdlib.h>
+],[
char *m0, *r0, *c0, *p;
m0 = malloc(0);
p = malloc(10);
r0 = realloc(p,0);
- c0 = calloc(0);
- exit(m0 == 0 || r0 == 0 || c0 == 0 ? 0 : 1);
-}],
+ c0 = calloc(0,10);
+ exit((m0 == 0 || r0 == 0 || c0 == 0) ? 0 : 1);
+])],
[MALLOC_ZERO_RETURNS_NULL=yes],
[MALLOC_ZERO_RETURNS_NULL=no],
[MALLOC_ZERO_RETURNS_NULL=yes])
@@ -1041,6 +1361,23 @@
]) # XORG_LINT_LIBRARY
+# XORG_COMPILER_BRAND
+# -------------------
+# Minimum version: 1.14.0
+#
+# Checks for various brands of compilers and sets flags as appropriate:
+# GNU gcc - relies on AC_PROG_CC (via AC_PROG_CC_C99) to set GCC to "yes"
+# clang compiler - sets CLANGCC to "yes"
+# Intel compiler - sets INTELCC to "yes"
+# Sun/Oracle Solaris Studio cc - sets SUNCC to "yes"
+#
+AC_DEFUN([XORG_COMPILER_BRAND], [
+AC_REQUIRE([AC_PROG_CC_C99])
+AC_CHECK_DECL([__clang__], [CLANGCC="yes"], [CLANGCC="no"])
+AC_CHECK_DECL([__INTEL_COMPILER], [INTELCC="yes"], [INTELCC="no"])
+AC_CHECK_DECL([__SUNPRO_C], [SUNCC="yes"], [SUNCC="no"])
+]) # XORG_COMPILER_BRAND
+
# XORG_CWARNFLAGS
# ---------------
# Minimum version: 1.2.0
@@ -1049,6 +1386,7 @@
#
AC_DEFUN([XORG_CWARNFLAGS], [
AC_REQUIRE([AC_PROG_CC_C99])
+AC_REQUIRE([XORG_COMPILER_BRAND])
if test "x$GCC" = xyes ; then
CWARNFLAGS="-Wall -Wpointer-arith -Wstrict-prototypes -Wmissing-prototypes
\
-Wmissing-declarations -Wnested-externs -fno-strict-aliasing \
@@ -1059,7 +1397,6 @@
;;
esac
else
- AC_CHECK_DECL([__SUNPRO_C], [SUNCC="yes"], [SUNCC="no"])
if test "x$SUNCC" = "xyes"; then
CWARNFLAGS="-v"
fi
@@ -1071,28 +1408,43 @@
# -----------------------
# Minimum version: 1.3.0
#
-# Add configure option to enable strict compilation
+# Add configure option to enable strict compilation flags, such as treating
+# warnings as fatal errors.
+# If --enable-strict-compilation is passed to configure, adds strict flags to
+# $CWARNFLAGS.
+#
+# Starting in 1.14.0 also exports $STRICT_CFLAGS for use in other tests or
+# when strict compilation is unconditionally desired.
AC_DEFUN([XORG_STRICT_OPTION], [
# If the module's configure.ac calls AC_PROG_CC later on, CC gets set to C89
AC_REQUIRE([AC_PROG_CC_C99])
+AC_REQUIRE([XORG_COMPILER_BRAND])
AC_REQUIRE([XORG_CWARNFLAGS])
AC_ARG_ENABLE(strict-compilation,
AS_HELP_STRING([--enable-strict-compilation],
[Enable all warnings from compiler and make them
errors (default: disabled)]),
[STRICT_COMPILE=$enableval], [STRICT_COMPILE=no])
+if test "x$GCC" = xyes ; then
+ STRICT_CFLAGS="-pedantic -Werror"
+ # Add -Werror=attributes if supported (gcc 4.2 & later)
+ AC_MSG_CHECKING([if $CC supports -Werror=attributes])
+ save_CFLAGS="$CFLAGS"
+ CFLAGS="$CFLAGS $STRICT_CFLAGS -Werror=attributes"
+ AC_COMPILE_IFELSE([AC_LANG_SOURCE([return 0;])],
+ [STRICT_CFLAGS="$STRICT_CFLAGS -Werror=attributes"
+ AC_MSG_RESULT([yes])],
+ [AC_MSG_RESULT([no])])
+ CFLAGS="$save_CFLAGS"
+elif test "x$SUNCC" = "xyes"; then
+ STRICT_CFLAGS="-errwarn"
+elif test "x$INTELCC" = "xyes"; then
+ STRICT_CFLAGS="-Werror"
+fi
if test "x$STRICT_COMPILE" = "xyes"; then
- AC_CHECK_DECL([__SUNPRO_C], [SUNCC="yes"], [SUNCC="no"])
- AC_CHECK_DECL([__INTEL_COMPILER], [INTELCC="yes"], [INTELCC="no"])
- if test "x$GCC" = xyes ; then
- STRICT_CFLAGS="-pedantic -Werror"
- elif test "x$SUNCC" = "xyes"; then
- STRICT_CFLAGS="-errwarn"
- elif test "x$INTELCC" = "xyes"; then
- STRICT_CFLAGS="-Werror"
- fi
+ CWARNFLAGS="$CWARNFLAGS $STRICT_CFLAGS"
fi
-CWARNFLAGS="$CWARNFLAGS $STRICT_CFLAGS"
+AC_SUBST([STRICT_CFLAGS])
AC_SUBST([CWARNFLAGS])
]) # XORG_STRICT_OPTION
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
--
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org
