xserver: Branch 'master' - 2 commits

[Keith Packard]

 configure.ac |   11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

New commits:
commit 4114854893ff57a1be525ec099a4b33e5f9963b1
Author: Keith Packard <keithp at keithp.com>
Date:   Thu Oct 22 00:17:37 2009 +0900

    Don't attempt to build hw/kdrive/sdl/Makefile anymore
    
    With sdl removed, there's no way to build the sdl Makefile.
    
    Signed-off-by: Keith Packard <keithp at keithp.com>

diff --git a/configure.ac b/configure.ac
index 84ee7b6..14d6095 100644
--- a/configure.ac
+++ b/configure.ac
@@ -2082,7 +2082,6 @@ hw/kdrive/ephyr/Makefile
 hw/kdrive/fake/Makefile
 hw/kdrive/fbdev/Makefile
 hw/kdrive/linux/Makefile
-hw/kdrive/sdl/Makefile
 hw/kdrive/src/Makefile
 test/Makefile
 test/xi2/Makefile
commit 4d333c5121818754356853724333eadec2dcd18c
Author: Keith Packard <keithp at keithp.com>
Date:   Thu Oct 22 00:16:12 2009 +0900

    Always check for doxygen so that distcheck gets dmx docs
    
    make distcheck wants the built dmx documentation so that users don't
    have to install doxygen. This means that even if dmx isn't built, the
    docs need to be so that the tarball can include them.
    
    Signed-off-by: Keith Packard <keithp at keithp.com>

diff --git a/configure.ac b/configure.ac
index e7e0812..84ee7b6 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1853,12 +1853,12 @@ dnl Linux sources in DMX require <linux/keyboard.h>
 	PKG_CHECK_MODULES([X11EXAMPLES_DEP], [$LIBXEXT x11])
 	AC_SUBST(X11EXAMPLES_DEP_LIBS)
 
-	AC_PATH_PROG(DOXYGEN,doxygen,[not_found])
-	if test "x$DOXYGEN" = "xnot_found" ; then
-	    AC_MSG_WARN([doxygen not found in $PATH. Cannot build documentation])
-	fi
-	AC_SUBST(DOXYGEN)
 fi
+AC_PATH_PROG(DOXYGEN,doxygen,[not_found])
+if test "x$DOXYGEN" = "xnot_found" ; then
+    AC_MSG_WARN([doxygen not found in $PATH. Cannot build dmx documentation])
+fi
+AC_SUBST(DOXYGEN)
 AM_CONDITIONAL([HAVE_DOXYGEN], [test "x$DOXYGEN" != "xnot_found"])
 AM_CONDITIONAL([DMX_BUILD_LNX], [test "x$DMX_BUILD_LNX" = xyes])
 AM_CONDITIONAL([DMX_BUILD_USB], [test "x$DMX_BUILD_USB" = xyes])