pixman: Branch 'master'

[Søren Sandmann Pedersen]

 configure.ac |    4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

New commits:
commit 4ef2807c3a6697731ada43ddad2fa915ed7cfe11
Author: Søren Sandmann Pedersen <sandmann at redhat.com>
Date:   Fri Aug 7 00:11:20 2009 -0400

    Only define PIXMAN_TIMERS if timers are actually enabled [bug 23169]

diff --git a/configure.ac b/configure.ac
index ad77b95..a466b86 100644
--- a/configure.ac
+++ b/configure.ac
@@ -462,7 +462,9 @@ AC_ARG_ENABLE(timers,
 		   [enable TIMER_BEGIN and TIMER_END macros [default=no]])],
    [enable_timers=$enableval], [enable_timers=no])
 
-AC_DEFINE(PIXMAN_TIMERS, 1, [enable TIMER_BEGIN/TIMER_END macros])
+if test $enable_timers = yes ; then 
+   AC_DEFINE(PIXMAN_TIMERS, 1, [enable TIMER_BEGIN/TIMER_END macros])
+fi
 AC_SUBST(PIXMAN_TIMERS)
 
 dnl ===================================