From 1a2dde3335864abfbbc133dbc709f564272dd540 Mon Sep 17 00:00:00 2001 From: Alan Coopersmith Date: Fri, 2 Oct 2009 20:44:19 -0700 Subject: [PATCH 1/9] Set XQUARTZ to no on non-Darwin OS'es Fixes build with dtrace probes on Solaris after efacd7bfd08ffc0725de6f639c6afbf3b2f6c9fe Signed-off-by: Alan Coopersmith Reviewed-by: Jeremy Huddleston --- configure.ac | 1 + 1 file changed, 1 insertion(+) diff --git a/configure.ac b/configure.ac index 46421fdb7..ba52329c4 100644 --- a/configure.ac +++ b/configure.ac @@ -701,6 +701,7 @@ case $host_os in XF86VIDMODE=no fi ;; + *) XQUARTZ=no ;; esac dnl --------------------------------------------------------------------------- From bf116057c7efd43c247c93f2f5d733a5db857cc9 Mon Sep 17 00:00:00 2001 From: Peter Hutterer Date: Mon, 5 Oct 2009 10:44:43 +1000 Subject: [PATCH 2/9] Require libXtst >= 1.0.99.2 and libdmx >= 1.0.99.1 libXtst requirement is already implicit since we require xextproto 7.1 and that doesn't go well with pre 1.0.99.2 versions of libXtst. Nonetheless, list it explicitly. Since d0440275108920f5cb5d630f55fc9a3320c496d3 we require dmxproto 2.2.99.1. Complementing that is libdmx 1.0.99.1 with the dmxext.h header file. Reported-by: Mark Rosenstand Signed-off-by: Peter Hutterer --- configure.ac | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/configure.ac b/configure.ac index ba52329c4..8395049fc 100644 --- a/configure.ac +++ b/configure.ac @@ -735,11 +735,13 @@ REQUIRED_LIBS="xfont xau [pixman-1 >= 0.15.20]" dnl List of libraries that require a specific version LIBAPPLEWM="applewm >= 1.4" +LIBDMX="dmx >= 1.0.99.1" LIBDRI="dri >= 7.1.0" LIBDRM="libdrm >= 2.3.0" LIBGL="gl >= 7.1.0" LIBXEXT="xext >= 1.0.99.4" LIBXI="xi >= 1.2.99.1" +LIBXTST="xtst >= 1.0.99.2" LIBPCIACCESS="pciaccess >= 0.8.0" LIBGLIB="glib-2.0 >= 2.16" @@ -1820,13 +1822,13 @@ dnl Linux sources in DMX require PKG_CHECK_MODULES([XDMXCONFIG_DEP], [xaw7 xmu xt xpm x11]) AC_SUBST(XDMXCONFIG_DEP_CFLAGS) AC_SUBST(XDMXCONFIG_DEP_LIBS) - PKG_CHECK_MODULES([DMXEXAMPLES_DEP], [dmx $LIBXEXT x11]) + PKG_CHECK_MODULES([DMXEXAMPLES_DEP], [$LIBDMX $LIBXEXT x11]) AC_SUBST(DMXEXAMPLES_DEP_LIBS) - PKG_CHECK_MODULES([DMXXMUEXAMPLES_DEP], [dmx xmu $LIBXEXT x11]) + PKG_CHECK_MODULES([DMXXMUEXAMPLES_DEP], [$LIBDMX xmu $LIBXEXT x11]) AC_SUBST(DMXXMUEXAMPLES_DEP_LIBS) - PKG_CHECK_MODULES([DMXXIEXAMPLES_DEP], [dmx $LIBXI $LIBXEXT x11]) + PKG_CHECK_MODULES([DMXXIEXAMPLES_DEP], [$LIBDMX $LIBXI $LIBXEXT x11]) AC_SUBST(DMXXIEXAMPLES_DEP_LIBS) - PKG_CHECK_MODULES([XTSTEXAMPLES_DEP], [xtst $LIBXEXT x11]) + PKG_CHECK_MODULES([XTSTEXAMPLES_DEP], [$LIBXTST $LIBXEXT x11]) AC_SUBST(XTSTEXAMPLES_DEP_LIBS) PKG_CHECK_MODULES([XRESEXAMPLES_DEP], [xres $LIBXEXT x11]) AC_SUBST(XRESEXAMPLES_DEP_LIBS) From d2118c8ca94fc7bcb8e0de547e63cf022f53a8a9 Mon Sep 17 00:00:00 2001 From: Peter Hutterer Date: Mon, 5 Oct 2009 15:31:54 +1000 Subject: [PATCH 3/9] xfree86: remove log-spamming DebugF All input drivers use xf86PostKeyEventP indirectly now and have been since it exists. I guess that qualifies it as tested - no need to spam the logs. Reported-by: Felix Wenk Signed-off-by: Peter Hutterer Signed-off-by: Daniel Stone --- hw/xfree86/common/xf86Xinput.c | 10 ---------- 1 file changed, 10 deletions(-) diff --git a/hw/xfree86/common/xf86Xinput.c b/hw/xfree86/common/xf86Xinput.c index b36953700..fd07c2a06 100644 --- a/hw/xfree86/common/xf86Xinput.c +++ b/hw/xfree86/common/xf86Xinput.c @@ -896,11 +896,6 @@ xf86PostKeyEvent(DeviceIntPtr device, int i = 0; static int valuators[MAX_VALUATORS]; - /* instil confidence in the user */ - DebugF("this function has never been tested properly. if things go quite " - "badly south after this message, then xf86PostKeyEvent is " - "broken.\n"); - XI_VERIFY_VALUATORS(num_valuators); va_start(var, num_valuators); @@ -924,11 +919,6 @@ xf86PostKeyEventP(DeviceIntPtr device, { int i = 0, nevents = 0; - /* instil confidence in the user */ - DebugF("this function has never been tested properly. if things go quite " - "badly south after this message, then xf86PostKeyEvent is " - "broken.\n"); - XI_VERIFY_VALUATORS(num_valuators); if (is_absolute) { From d5d960f57834f16164457dab2e80290717dbf2cd Mon Sep 17 00:00:00 2001 From: Kim Woelders Date: Fri, 2 Oct 2009 19:31:15 +0200 Subject: [PATCH 4/9] render: Fix clip region translation in miClipPictureSrc(). Signed-off-by: Kim Woelders Reviewed-by: Soren Sandmann Pedersen Signed-off-by: Peter Hutterer --- render/mipict.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/render/mipict.c b/render/mipict.c index 71f3de718..b5dfcb2ba 100644 --- a/render/mipict.c +++ b/render/mipict.c @@ -318,14 +318,14 @@ miClipPictureSrc (RegionPtr pRegion, Bool result; pixman_region_translate ( pPicture->clientClip, - pPicture->clipOrigin.x - dx, - pPicture->clipOrigin.y - dy); + pPicture->clipOrigin.x + dx, + pPicture->clipOrigin.y + dy); result = REGION_INTERSECT (pScreen, pRegion, pRegion, pPicture->clientClip); pixman_region_translate ( pPicture->clientClip, - - (pPicture->clipOrigin.x - dx), - - (pPicture->clipOrigin.y - dy)); + - (pPicture->clipOrigin.x + dx), + - (pPicture->clipOrigin.y + dy)); if (!result) return FALSE; From 6ee61578ddb9f880ef12bbe9c3671d7dd53f2809 Mon Sep 17 00:00:00 2001 From: Alan Coopersmith Date: Mon, 5 Oct 2009 17:27:27 -0700 Subject: [PATCH 5/9] Remove shave now that automake-1.11 has AM_SILENT_RULES Revert "Add shave so that we can see the steaming piles of warnings generated." This reverts commit 181cc08c8908a119fc403f970dea8cc98d3e0b9b. shave was left in the xserver 1.7 release/branch to allow developers & distros time to transition to automake-1.11. xserver 1.8 series will require automake-1.11 for silencing build noise. Signed-off-by: Alan Coopersmith Signed-off-by: Keith Packard --- .gitignore | 2 -- configure.ac | 7 ---- m4/shave.m4 | 73 ---------------------------------------- shave-libtool.in | 69 -------------------------------------- shave.in | 86 ------------------------------------------------ 5 files changed, 237 deletions(-) delete mode 100644 m4/shave.m4 delete mode 100644 shave-libtool.in delete mode 100644 shave.in diff --git a/.gitignore b/.gitignore index 3a8fe501d..108cfe6f9 100644 --- a/.gitignore +++ b/.gitignore @@ -35,8 +35,6 @@ install-sh libtool ltmain.sh missing -shave -shave-libtool TAGS tags cscope* diff --git a/configure.ac b/configure.ac index 8395049fc..0221b37b8 100644 --- a/configure.ac +++ b/configure.ac @@ -32,11 +32,6 @@ AC_CONFIG_SRCDIR([Makefile.am]) AM_INIT_AUTOMAKE([dist-bzip2 foreign]) AM_MAINTAINER_MODE -AC_CONFIG_FILES([ - shave - shave-libtool -]) - # Require xorg-macros version 1.2.0 or newer for XORG_CHANGELOG and # XORG_CWARNFLAGS m4_ifndef([XORG_MACROS_VERSION], [AC_FATAL([must install xorg-macros 1.2 or later before running autoconf/autogen])]) @@ -1993,8 +1988,6 @@ AC_SUBST([prefix]) XORG_MANPAGE_SECTIONS XORG_CHANGELOG -SHAVE_INIT([.], [enable]) - AC_OUTPUT([ Makefile glx/Makefile diff --git a/m4/shave.m4 b/m4/shave.m4 deleted file mode 100644 index 0c2c9f5a0..000000000 --- a/m4/shave.m4 +++ /dev/null @@ -1,73 +0,0 @@ -dnl Make automake/libtool output more friendly to humans -dnl -dnl SHAVE_INIT([shavedir],[default_mode]) -dnl -dnl shavedir: the directory where the shave scripts are, it defaults to -dnl $(top_builddir) -dnl default_mode: (enable|disable) default shave mode. This parameter -dnl controls shave's behaviour when no option has been -dnl given to configure. It defaults to disable. -dnl -dnl * SHAVE_INIT should be called late in your configure.(ac|in) file (just -dnl before AC_CONFIG_FILE/AC_OUTPUT is perfect. This macro rewrites CC and -dnl LIBTOOL, you don't want the configure tests to have these variables -dnl re-defined. -dnl * This macro requires GNU make's -s option. - -AC_DEFUN([_SHAVE_ARG_ENABLE], -[ - AC_ARG_ENABLE([shave], - AS_HELP_STRING( - [--enable-shave], - [use shave to make the build pretty [[default=$1]]]),, - [enable_shave=$1] - ) -]) - -AC_DEFUN([SHAVE_INIT], -[ - dnl you can tweak the default value of enable_shave - m4_if([$2], [enable], [_SHAVE_ARG_ENABLE(yes)], [_SHAVE_ARG_ENABLE(no)]) - - if test x"$enable_shave" = xyes; then - dnl where can we find the shave scripts? - m4_if([$1],, - [shavedir="$ac_pwd"], - [shavedir="$ac_pwd/$1"]) - AC_SUBST(shavedir) - - dnl make is now quiet - AC_SUBST([MAKEFLAGS], [-s]) - AC_SUBST([AM_MAKEFLAGS], ['`test -z $V && echo -s`']) - - dnl we need sed - AC_CHECK_PROG(SED,sed,sed,false) - - dnl substitute libtool - SHAVE_SAVED_LIBTOOL=$LIBTOOL - LIBTOOL="${SHELL} ${shavedir}/shave-libtool '${SHAVE_SAVED_LIBTOOL}'" - AC_SUBST(LIBTOOL) - - dnl substitute cc/cxx - SHAVE_SAVED_CC=$CC - SHAVE_SAVED_CXX=$CXX - SHAVE_SAVED_FC=$FC - SHAVE_SAVED_F77=$F77 - CC="${SHELL} ${shavedir}/shave cc ${SHAVE_SAVED_CC}" - CXX="${SHELL} ${shavedir}/shave cxx ${SHAVE_SAVED_CXX}" - FC="${SHELL} ${shavedir}/shave fc ${SHAVE_SAVED_FC}" - F77="${SHELL} ${shavedir}/shave f77 ${SHAVE_SAVED_F77}" - AC_SUBST(CC) - AC_SUBST(CXX) - AC_SUBST(FC) - AC_SUBST(F77) - - V=@ - else - V=1 - fi - Q='$(V:1=)' - AC_SUBST(V) - AC_SUBST(Q) -]) - diff --git a/shave-libtool.in b/shave-libtool.in deleted file mode 100644 index 488c657e9..000000000 --- a/shave-libtool.in +++ /dev/null @@ -1,69 +0,0 @@ -#!/bin/sh - -# we need sed -SED=@SED@ -if test -z "$SED" ; then -SED=sed -fi - -lt_unmangle () -{ - last_result=`echo $1 | $SED -e 's#.libs/##' -e 's#[0-9a-zA-Z_\-\.]*_la-##'` -} - -# the real libtool to use -LIBTOOL="$1 --tag=CC" -shift - -# if 1, don't print anything, the underlaying wrapper will do it -pass_though=0 - -# scan the arguments, keep the right ones for libtool, and discover the mode -preserved_args= -while test "$#" -gt 0; do - opt="$1" - shift - - case $opt in - --mode=*) - mode=`echo $opt | $SED -e 's/[-_a-zA-Z0-9]*=//'` - preserved_args="$preserved_args $opt" - ;; - -o) - lt_output="$1" - preserved_args="$preserved_args $opt" - ;; - *) - preserved_args="$preserved_args $opt" - ;; - esac -done - -case "$mode" in -compile) - # shave will be called and print the actual CC/CXX/LINK line - preserved_args="$preserved_args --shave-mode=$mode" - pass_though=1 - ;; -link) - preserved_args="$preserved_args --shave-mode=$mode" - Q=" LINK " - ;; -*) - # let's u - # echo "*** libtool: Unimplemented mode: $mode, fill a bug report" - ;; -esac - -lt_unmangle "$lt_output" -output=$last_result - -if test -z "$V"; then - if test $pass_though -eq 0; then - echo "$Q$output" - fi - $LIBTOOL --silent $preserved_args -else - echo $LIBTOOL $preserved_args - $LIBTOOL $preserved_args -fi diff --git a/shave.in b/shave.in deleted file mode 100644 index 397b0769f..000000000 --- a/shave.in +++ /dev/null @@ -1,86 +0,0 @@ -#!/bin/sh - -# we need sed -SED=@SED@ -if test -z "$SED" ; then -SED=sed -fi - -lt_unmangle () -{ - last_result=`echo $1 | $SED -e 's#.libs/##' -e 's#[0-9a-zA-Z_\-\.]*_la-##'` -} - -# the tool to wrap (cc, cxx, ar, ranlib, ..) -tool="$1" -shift - -# the reel tool (to call) -REEL_TOOL="$1" -shift - -pass_through=0 -preserved_args= -while test "$#" -gt 0; do - opt="$1" - shift - - case $opt in - --shave-mode=*) - mode=`echo $opt | $SED -e 's/[-_a-zA-Z0-9]*=//'` - ;; - -o) - lt_output="$1" - preserved_args="$preserved_args $opt" - ;; - # hack for configure. configure calls $CC -print-prog-name=ld to get - # the linker. Without this bit here, the output can't be parsed and - # configure thinks there's no valid linker installed. - -print-prog-name=*) - mode="find-ld" - preserved_args="$preserved_args $opt" - ;; - *) - preserved_args="$preserved_args $opt" - ;; - esac -done - -# mode=link is handled in the libtool wrapper -case "$mode,$tool" in -link,*) - pass_through=1 - ;; -find-ld,*) - pass_through=1 - ;; -*,cxx) - Q=" CXX " - ;; -*,cc) - Q=" CC " - ;; -*,fc) - Q=" FC " - ;; -*,f77) - Q=" F77 " - ;; -*,*) - # should not happen - Q=" CC " - ;; -esac - -lt_unmangle "$lt_output" -output=$last_result - -if test -z "$V"; then - if test $pass_through -eq 0; then - echo "$Q$output" - fi - $REEL_TOOL $preserved_args -else - echo $REEL_TOOL $preserved_args - $REEL_TOOL $preserved_args -fi From 8c51b886400c5962b31ff565771be1b01a3ca8fb Mon Sep 17 00:00:00 2001 From: Julien Cristau Date: Tue, 6 Oct 2009 16:08:42 +0200 Subject: [PATCH 6/9] configure: quote argument to m4_pattern_forbid Without this, configure spits out ../configure: line 15460: ac_fn_c_check_member: command not found Also anchor the pattern to make it stricter. Signed-off-by: Julien Cristau Signed-off-by: Dan Nicholson Signed-off-by: Keith Packard --- configure.ac | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configure.ac b/configure.ac index 0221b37b8..cb9721ba6 100644 --- a/configure.ac +++ b/configure.ac @@ -637,7 +637,7 @@ dnl If you're seeing an error here, be sure you installed the lib/xtrans module dnl first and if it's not in the default location, that you set the ACLOCAL dnl environment variable to find it, such as: dnl ACLOCAL="aclocal -I ${PREFIX}/share/aclocal" -m4_pattern_forbid(XTRANS_CONNECTION_FLAGS) +m4_pattern_forbid([^XTRANS_CONNECTION_FLAGS$]) # Transport selection macro from xtrans.m4 XTRANS_CONNECTION_FLAGS From 4b0911565d18b1aefca564315d0f1b9b4a17aa65 Mon Sep 17 00:00:00 2001 From: Alan Coopersmith Date: Mon, 5 Oct 2009 16:52:19 -0700 Subject: [PATCH 7/9] Add platform tests for Dtrace linker magic Replaces special handling for Xquartz DDX and scales better to handling the multiple platforms that now have some level of Dtrace support available. Signed-off-by: Alan Coopersmith Reviewed-by: Jeremy Huddleston --- configure.ac | 14 +++++++++++++- dix/Makefile.am | 2 +- hw/xfree86/Makefile.am | 2 +- os/Makefile.am | 4 +--- test/Makefile.am | 2 +- test/xi2/Makefile.am | 2 +- 6 files changed, 18 insertions(+), 8 deletions(-) diff --git a/configure.ac b/configure.ac index cb9721ba6..014c1d782 100644 --- a/configure.ac +++ b/configure.ac @@ -97,8 +97,20 @@ fi if test "x$WDTRACE" != "xno" ; then AC_DEFINE(XSERVER_DTRACE, 1, [Define to 1 if the DTrace Xserver provider probes should be built in.]) + +# Solaris/OpenSolaris require dtrace -G to build dtrace probe information into +# object files, and require linking with those as relocatable objects, not .a +# archives. MacOS X handles all this in the normal compiler toolchain, and on +# some releases (like Tiger), will error out on dtrace -G. For now, other +# platforms with Dtrace ports are assumed to support -G (the FreeBSD and Linux +# ports appear to, based on my web searches, but have not yet been tested). + case $host_os in + darwin*) SPECIAL_DTRACE_OBJECTS=no ;; + *) SPECIAL_DTRACE_OBJECTS=yes ;; + esac fi AM_CONDITIONAL(XSERVER_DTRACE, [test "x$WDTRACE" != "xno"]) +AM_CONDITIONAL(SPECIAL_DTRACE_OBJECTS, [test "x$SPECIAL_DTRACE_OBJECTS" = "xyes"]) AC_HEADER_DIRENT AC_HEADER_STDC @@ -1242,7 +1254,7 @@ AC_DEFINE(XSYNC, 1, [Support XSync extension]) AC_DEFINE(XCMISC, 1, [Support XCMisc extension]) AC_DEFINE(BIGREQS, 1, [Support BigRequests extension]) -if test "x$WDTRACE" != "xno" && test "x$XQUARTZ" = "xno"; then +if test "x$SPECIAL_DTRACE_OBJECTS" = "xyes" ; then DIX_LIB='$(top_builddir)/dix/dix.O' OS_LIB='$(top_builddir)/os/os.O' else diff --git a/dix/Makefile.am b/dix/Makefile.am index 85a8767d2..0996cffea 100644 --- a/dix/Makefile.am +++ b/dix/Makefile.am @@ -54,7 +54,7 @@ Xserver-dtrace.h: $(srcdir)/Xserver.d $(DTRACE) -C -h -o $@ -s $(srcdir)/Xserver.d \ || cp Xserver-dtrace.h.in $@ -if !XQUARTZ +if SPECIAL_DTRACE_OBJECTS # Generate dtrace object code for probes in libdix dtrace-dix.o: $(top_srcdir)/dix/Xserver.d $(am_libdix_la_OBJECTS) $(DTRACE) -G -C -o $@ -s $(top_srcdir)/dix/Xserver.d $(am_libdix_la_OBJECTS:%.lo=.libs/%.o) diff --git a/hw/xfree86/Makefile.am b/hw/xfree86/Makefile.am index 48db5a14c..159b935cf 100644 --- a/hw/xfree86/Makefile.am +++ b/hw/xfree86/Makefile.am @@ -80,7 +80,7 @@ BUILT_SOURCES = xorg.conf.example DISTCLEANFILES += xorg.conf.example xorg.conf.example.pre EXTRA_DIST = xorgconf.cpp -if XSERVER_DTRACE +if SPECIAL_DTRACE_OBJECTS # Re-add dtrace object code that gets lost when building static libraries Xorg_LDADD += $(XSERVER_LIBS) endif diff --git a/os/Makefile.am b/os/Makefile.am index 9ce8ff274..22ed1946c 100644 --- a/os/Makefile.am +++ b/os/Makefile.am @@ -41,8 +41,7 @@ endif EXTRA_DIST = $(SECURERPC_SRCS) $(INTERNALMALLOC_SRCS) \ $(XDMCP_SRCS) $(STRLCAT_SRCS) -if !XQUARTZ -if XSERVER_DTRACE +if SPECIAL_DTRACE_OBJECTS # Generate dtrace object code for probes in libos & libdix dtrace.o: $(top_srcdir)/dix/Xserver.d $(am_libos_la_OBJECTS) $(DTRACE) -G -C -o $@ -s $(top_srcdir)/dix/Xserver.d .libs/*.o ../dix/.libs/*.o @@ -52,7 +51,6 @@ noinst_PROGRAMS = os.O os.O: dtrace.o $(am_libos_la_OBJECTS) ld -r -o $@ dtrace.o .libs/*.o endif -endif os.c: touch $@ diff --git a/test/Makefile.am b/test/Makefile.am index 1bd76f587..7c4467161 100644 --- a/test/Makefile.am +++ b/test/Makefile.am @@ -9,7 +9,7 @@ AM_CFLAGS = $(DIX_CFLAGS) $(GLIB_CFLAGS) @XORG_CFLAGS@ INCLUDES = @XORG_INCS@ TEST_LDADD=libxservertest.la $(XORG_SYS_LIBS) $(XSERVER_SYS_LIBS) $(GLIB_LIBS) -if XSERVER_DTRACE +if SPECIAL_DTRACE_OBJECTS TEST_LDADD += $(OS_LIB) $(DIX_LIB) endif diff --git a/test/xi2/Makefile.am b/test/xi2/Makefile.am index ef6d0f0ab..0e2de6b47 100644 --- a/test/xi2/Makefile.am +++ b/test/xi2/Makefile.am @@ -17,7 +17,7 @@ INCLUDES = @XORG_INCS@ TEST_LDADD=../libxservertest.la $(XORG_SYS_LIBS) $(XSERVER_SYS_LIBS) $(GLIB_LIBS) COMMON_SOURCES=protocol-common.h protocol-common.c -if XSERVER_DTRACE +if SPECIAL_DTRACE_OBJECTS TEST_LDADD += $(OS_LIB) $(DIX_LIB) endif From 2e294380b64b6362173d0590c4292f290e50af50 Mon Sep 17 00:00:00 2001 From: Alan Coopersmith Date: Fri, 2 Oct 2009 16:51:24 -0700 Subject: [PATCH 8/9] Migrate to xorg macros 1.3 & XORG_DEFAULT_OPTIONS Signed-off-by: Alan Coopersmith Reviewed-by: Eric Anholt Acked-by: Dan Nicholson Acked-by: Peter Hutterer --- configure.ac | 29 ++++++++++++----------------- 1 file changed, 12 insertions(+), 17 deletions(-) diff --git a/configure.ac b/configure.ac index 014c1d782..fa454faca 100644 --- a/configure.ac +++ b/configure.ac @@ -32,10 +32,9 @@ AC_CONFIG_SRCDIR([Makefile.am]) AM_INIT_AUTOMAKE([dist-bzip2 foreign]) AM_MAINTAINER_MODE -# Require xorg-macros version 1.2.0 or newer for XORG_CHANGELOG and -# XORG_CWARNFLAGS -m4_ifndef([XORG_MACROS_VERSION], [AC_FATAL([must install xorg-macros 1.2 or later before running autoconf/autogen])]) -XORG_MACROS_VERSION(1.2) +# Require xorg-macros version 1.3.0 or newer for XORG_DEFAULT_OPTIONS +m4_ifndef([XORG_MACROS_VERSION], [AC_FATAL([must install xorg-macros 1.3 or later before running autoconf/autogen])]) +XORG_MACROS_VERSION(1.3) dnl this gets generated by autoheader, and thus contains all the defines. we dnl don't ever actually use it, internally. @@ -74,6 +73,11 @@ AC_SYS_LARGEFILE XORG_PROG_RAWCPP AC_PATH_PROG(SED,sed) +XORG_DEFAULT_OPTIONS +# Quoted so that make will expand $(CWARNFLAGS) in makefiles to allow +# easier overrides at build time. +XSERVER_CFLAGS='$(CWARNFLAGS)' + dnl Check for dtrace program (needed to build Xserver dtrace probes) dnl Also checks for , since some Linux distros have an dnl ISDN trace program named dtrace @@ -419,7 +423,6 @@ case $host_os in ;; esac -XORG_RELEASE_VERSION dnl augment XORG_RELEASE_VERSION for our snapshot number and to expose the dnl major number PVMAJOR=`echo $PACKAGE_VERSION | cut -d . -f 1` @@ -439,8 +442,9 @@ m4_ifdef([AS_HELP_STRING], , [m4_define([AS_HELP_STRING], m4_defn([AC_HELP_STRIN dnl Build options. AC_ARG_ENABLE(werror, AS_HELP_STRING([--enable-werror], - [Treat warnings as errors (default: disabled)]), - [WERROR=$enableval], [WERROR=no]) + [Obsolete - use --enable-strict-compilation instead]), + AC_MSG_ERROR([--enable-werror has been replaced by --enable-strict-compilation])) + AC_ARG_ENABLE(debug, AS_HELP_STRING([--enable-debug], [Enable debugging (default: disabled)]), [DEBUGGING=$enableval], [DEBUGGING=no]) @@ -1315,7 +1319,7 @@ PKG_CHECK_MODULES([XSERVERLIBS], [$REQUIRED_LIBS]) # XSERVER_SYS_LIBS is the set of out-of-tree libraries which all servers # require. # -XSERVER_CFLAGS="${XSERVERCFLAGS_CFLAGS} ${SHA1_CFLAGS}" +XSERVER_CFLAGS="${XSERVER_CFLAGS} ${XSERVERCFLAGS_CFLAGS} ${SHA1_CFLAGS}" XSERVER_LIBS="$DIX_LIB $CONFIG_LIB $MI_LIB $OS_LIB" XSERVER_SYS_LIBS="${XSERVERLIBS_LIBS} ${SYS_LIBS} ${LIBS} ${SHA1_LIB}" AC_SUBST([XSERVER_LIBS]) @@ -1328,14 +1332,9 @@ AC_SUBST([UTILS_SYS_LIBS]) # Some platforms require extra flags to do this. gcc should set these flags # when -rdynamic is passed to it, other compilers/linkers may need to be added # here. -XORG_CWARNFLAGS if test "x$GCC" = "xyes"; then - if test "x$WERROR" = "xyes"; then - CWARNFLAGS="${CWARNFLAGS} -Werror" - fi LD_EXPORT_SYMBOLS_FLAG="-rdynamic" fi -XSERVER_CFLAGS="$CWARNFLAGS $XSERVER_CFLAGS" case $host_os in openbsd*) LD_EXPORT_SYMBOLS_FLAG="-Wl,--export-dynamic" @@ -1996,10 +1995,6 @@ AC_SUBST([libdir]) AC_SUBST([exec_prefix]) AC_SUBST([prefix]) -# Man page sections - used in config utils & generating man pages -XORG_MANPAGE_SECTIONS -XORG_CHANGELOG - AC_OUTPUT([ Makefile glx/Makefile From 315aaef55750a863c08a16ad9120ffb76f9b48e0 Mon Sep 17 00:00:00 2001 From: Alan Coopersmith Date: Fri, 2 Oct 2009 21:54:53 -0700 Subject: [PATCH 9/9] Use $(AM_V_GEN) to silence more commands when AM_SILENT_RULES is active Signed-off-by: Alan Coopersmith Reviewed-by: Eric Anholt Acked-by: Dan Nicholson Acked-by: Peter Hutterer --- cpprules.in | 4 ++-- dix/Makefile.am | 6 +++--- hw/xfree86/doc/sgml/Makefile.am | 8 ++++---- os/Makefile.am | 4 ++-- 4 files changed, 11 insertions(+), 11 deletions(-) diff --git a/cpprules.in b/cpprules.in index 755620005..7fcb9bd6f 100644 --- a/cpprules.in +++ b/cpprules.in @@ -42,7 +42,7 @@ MANDEFS = \ -D__xlogfile__=$(XLOGFILE) -D__xservername__=$(XSERVERNAME) .pre: - $(RAWCPP) $(RAWCPPFLAGS) $(CPP_FILES_FLAGS) < $< | $(CPP_SED_MAGIC) > $@ + $(AM_V_GEN)$(RAWCPP) $(RAWCPPFLAGS) $(CPP_FILES_FLAGS) < $< | $(CPP_SED_MAGIC) > $@ .man.pre.man: - $(RAWCPP) $(RAWCPPFLAGS) $(MANDEFS) $(EXTRAMANDEFS) < $< | $(CPP_SED_MAGIC) > $@ + $(AM_V_GEN)$(RAWCPP) $(RAWCPPFLAGS) $(MANDEFS) $(EXTRAMANDEFS) < $< | $(CPP_SED_MAGIC) > $@ diff --git a/dix/Makefile.am b/dix/Makefile.am index 0996cffea..ae47dc472 100644 --- a/dix/Makefile.am +++ b/dix/Makefile.am @@ -51,18 +51,18 @@ if XSERVER_DTRACE BUILT_SOURCES = Xserver-dtrace.h Xserver-dtrace.h: $(srcdir)/Xserver.d - $(DTRACE) -C -h -o $@ -s $(srcdir)/Xserver.d \ + $(AM_V_GEN)$(DTRACE) -C -h -o $@ -s $(srcdir)/Xserver.d \ || cp Xserver-dtrace.h.in $@ if SPECIAL_DTRACE_OBJECTS # Generate dtrace object code for probes in libdix dtrace-dix.o: $(top_srcdir)/dix/Xserver.d $(am_libdix_la_OBJECTS) - $(DTRACE) -G -C -o $@ -s $(top_srcdir)/dix/Xserver.d $(am_libdix_la_OBJECTS:%.lo=.libs/%.o) + $(AM_V_GEN)$(DTRACE) -G -C -o $@ -s $(top_srcdir)/dix/Xserver.d $(am_libdix_la_OBJECTS:%.lo=.libs/%.o) noinst_PROGRAMS = dix.O dix.O: dtrace-dix.o $(am_libdix_la_OBJECTS) - ld -r -o $@ $(am_libdix_la_OBJECTS:%.lo=.libs/%.o) + $(AM_V_GEN)ld -r -o $@ $(am_libdix_la_OBJECTS:%.lo=.libs/%.o) endif endif diff --git a/hw/xfree86/doc/sgml/Makefile.am b/hw/xfree86/doc/sgml/Makefile.am index d2c821c03..09b64f7b0 100644 --- a/hw/xfree86/doc/sgml/Makefile.am +++ b/hw/xfree86/doc/sgml/Makefile.am @@ -33,19 +33,19 @@ SUFFIXES = .sgml .txt .html .ps .pdf .sgml.txt: @rm -f $@ - $(MAKE_TEXT) $< + $(AM_V_GEN)$(MAKE_TEXT) $< .sgml.ps: @rm -f $@ - $(MAKE_PS) $< + $(AM_V_GEN)$(MAKE_PS) $< .ps.pdf: @rm -f $@ - $(MAKE_PDF) $< + $(AM_V_GEN)$(MAKE_PDF) $< .sgml.html: @rm -f $@ - $(MAKE_HTML) $< + $(AM_V_GEN)$(MAKE_HTML) $< noinst_DATA = $(TXT_FILES) $(PS_FILES) $(PDF_FILES) $(HTML_FILES) CLEANFILES = $(TXT_FILES) $(PS_FILES) $(PDF_FILES) $(HTML_FILES) diff --git a/os/Makefile.am b/os/Makefile.am index 22ed1946c..a7f34a5b8 100644 --- a/os/Makefile.am +++ b/os/Makefile.am @@ -44,12 +44,12 @@ EXTRA_DIST = $(SECURERPC_SRCS) $(INTERNALMALLOC_SRCS) \ if SPECIAL_DTRACE_OBJECTS # Generate dtrace object code for probes in libos & libdix dtrace.o: $(top_srcdir)/dix/Xserver.d $(am_libos_la_OBJECTS) - $(DTRACE) -G -C -o $@ -s $(top_srcdir)/dix/Xserver.d .libs/*.o ../dix/.libs/*.o + $(AM_V_GEN)$(DTRACE) -G -C -o $@ -s $(top_srcdir)/dix/Xserver.d .libs/*.o ../dix/.libs/*.o noinst_PROGRAMS = os.O os.O: dtrace.o $(am_libos_la_OBJECTS) - ld -r -o $@ dtrace.o .libs/*.o + $(AM_V_GEN)ld -r -o $@ dtrace.o .libs/*.o endif os.c: