xserver: Branch 'master' - 4 commits

[Daniel Stone]

 configure.ac                  |    9 +++++++--
 hw/xfree86/xf1bpp/Makefile.am |    7 ++++---
 2 files changed, 11 insertions(+), 5 deletions(-)

New commits:
diff-tree f3955c0a020b39021050cd33c20a17f14fc4b579 (from a04c95f4446e5c169dea71019321d790ab4fa139)
Author: Arkadiusz Miskiewicz <arekm at maven.pl>
Date:   Wed Aug 1 21:04:22 2007 +0300

    XFree86: xf1bpp: distclean generated files as well
    
    Make sure we clean up after ourselves: not sure why distcheck didn't flag
    this one.

diff --git a/hw/xfree86/xf1bpp/Makefile.am b/hw/xfree86/xf1bpp/Makefile.am
index 341fe3b..ef3d08f 100644
--- a/hw/xfree86/xf1bpp/Makefile.am
+++ b/hw/xfree86/xf1bpp/Makefile.am
@@ -55,7 +55,7 @@ libxf1bppmfb_a_SOURCES = \
         mfbwindow.c \
         mfbzerarc.c
 
-BUILT_SOURCES = $(libxf1bppgen_a_SOURCES) $(libxf1bppgen_a_SOURCES)
+BUILT_SOURCES = $(libxf1bppmfb_a_SOURCES) $(libxf1bppgen_a_SOURCES)
 
 libxf1bpp_la_SOURCES = $(libxf1bppmfb_a_SOURCES) $(libxf1bppgen_a_SOURCES) \
         mfbmodule.c
@@ -173,7 +173,8 @@ mfbtileG.c:
 	echo "#include \"$(top_srcdir)/mfb/mfbtile.c\"" >> $@
 
 $(libxf1bppmfb_a_SOURCES):
-	echo "#include \"mfbmap.h\"" > $$i
-	echo "#include \"$(top_srcdir)/mfb/$$i\"" >> $$i
+	echo "#include \"mfbmap.h\"" > $@
+	echo "#include \"$(top_srcdir)/mfb/$@\"" >> $@
 
 EXTRA_DIST = mfbmap.sh mfbunmap.sh 
+DISTCLEANFILES = $(BUILT_SOURCES)
diff-tree a04c95f4446e5c169dea71019321d790ab4fa139 (from 99a88826e5e8cfa25c5f8a88c12799d33114729c)
Author: Julien Cristau <jcristau at debian.org>
Date:   Wed Aug 1 20:37:05 2007 +0300

    configure.ac: Fix argument quoting for argv[]
    
    m4 quoting.  Yar boo sux.

diff --git a/configure.ac b/configure.ac
index 728b79a..518f332 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1077,7 +1077,7 @@ if ! test "x$have_clock_gettime" = xno; 
 #define _POSIX_C_SOURCE 199309L
 #include <time.h>
 
-int main(int argc, char *argv[]) {
+int main(int argc, char *argv[[]]) {
     struct timespec tp;
 
     if (clock_gettime(CLOCK_MONOTONIC, &tp) == 0)
diff-tree 99a88826e5e8cfa25c5f8a88c12799d33114729c (from 1c80e04f876e9254b93ef87eadfcff71234340c6)
Author: Daniel Stone <daniel at fooishbar.org>
Date:   Wed Aug 1 20:34:58 2007 +0300

    configure.ac: Actually use -lrt in monotonic clock test
    
    If we need -lrt to use clock_gettime, then make sure we link with it.

diff --git a/configure.ac b/configure.ac
index ffcc72d..728b79a 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1070,6 +1070,9 @@ if ! test "x$have_clock_gettime" = xno; 
         CLOCK_LIBS=""
     fi
 
+    LIBS_SAVE="$LIBS"
+    LIBS="$CLOCK_LIBS"
+
     AC_RUN_IFELSE([
 #define _POSIX_C_SOURCE 199309L
 #include <time.h>
@@ -1084,6 +1087,8 @@ int main(int argc, char *argv[]) {
 }
     ], [MONOTONIC_CLOCK=yes], [MONOTONIC_CLOCK=no],
        [MONOTONIC_CLOCK="cross compiling"])
+
+    LIBS="$LIBS_SAVE"
 else
     MONOTONIC_CLOCK=no
 fi
diff-tree 1c80e04f876e9254b93ef87eadfcff71234340c6 (from c46663367329615bd2c9b63e93c9534036e5a2ae)
Author: Daniel Stone <daniel at fooishbar.org>
Date:   Wed Aug 1 20:08:31 2007 +0300

    configure.ac: Disable D-Bus config API support by default
    
    This is problematic, so don't even bother with it unless someone wants it.
    respeclaration is dead, long live HAL.

diff --git a/configure.ac b/configure.ac
index c80f2ed..ffcc72d 100644
--- a/configure.ac
+++ b/configure.ac
@@ -522,7 +522,7 @@ AC_ARG_ENABLE(fontcache,      AS_HELP_ST
 AC_ARG_ENABLE(dbe,            AS_HELP_STRING([--disable-dbe], [Build DBE extension (default: enabled)]), [DBE=$enableval], [DBE=yes])
 AC_ARG_ENABLE(xf86bigfont,    AS_HELP_STRING([--disable-xf86bigfont], [Build XF86 Big Font extension (default: enabled)]), [XF86BIGFONT=$enableval], [XF86BIGFONT=yes])
 AC_ARG_ENABLE(dpms,           AS_HELP_STRING([--disable-dpms], [Build DPMS extension (default: enabled)]), [DPMSExtension=$enableval], [DPMSExtension=yes])
-AC_ARG_ENABLE(config-dbus,    AS_HELP_STRING([--disable-config-dbus], [Build D-BUS support (default: auto)]), [CONFIG_DBUS_API=$enableval], [CONFIG_DBUS_API=auto])
+AC_ARG_ENABLE(config-dbus,    AS_HELP_STRING([--enable-config-dbus], [Build D-BUS API support (default: no)]), [CONFIG_DBUS_API=$enableval], [CONFIG_DBUS_API=no])
 AC_ARG_ENABLE(config-hal,     AS_HELP_STRING([--disable-config-hal], [Build HAL support (default: auto)]), [CONFIG_HAL=$enableval], [CONFIG_HAL=auto])
 AC_ARG_ENABLE(xfree86-utils,     AS_HELP_STRING([--enable-xfree86-utils], [Build xfree86 DDX utilities (default: enabled)]), [XF86UTILS=$enableval], [XF86UTILS=yes])