xserver: Branch 'master' - 2 commits

[Eric Anholt]

 configure.ac          |   18 ++++++++++--------
 hw/xprint/Makefile.am |   20 ++++++++++++++++----
 hw/xprint/ddxInit.c   |   11 +++++++++++
 3 files changed, 37 insertions(+), 12 deletions(-)

New commits:
diff-tree d67e210f3458b62d7d4a6032aabfda0004d661c1 (from f7f79724fdea0cc6fda0e90e56431df937d49335)
Author: Gerte Hoogewerf <g.hoogewerf at gmail.com>
Date:   Tue Sep 4 16:09:38 2007 -0700

    Add stub symbols to make xprint build.

diff --git a/hw/xprint/ddxInit.c b/hw/xprint/ddxInit.c
index a465c4c..1e7652e 100644
--- a/hw/xprint/ddxInit.c
+++ b/hw/xprint/ddxInit.c
@@ -310,6 +310,17 @@ ChangeDeviceControl (
     return BadMatch;
 }
 
+int
+NewInputDeviceRequest(InputOption *options, DeviceIntPtr *pdev)
+{
+    return BadValue;
+}
+
+void
+DeleteInputDeviceRequest(DeviceIntPtr dev)
+{
+}
+
 void
 OpenInputDevice (
     DeviceIntPtr dev,
diff-tree f7f79724fdea0cc6fda0e90e56431df937d49335 (from e89d16be07e45e487913509788a9e8cb1ee09bc7)
Author: Eric Anholt <eric at anholt.net>
Date:   Tue Sep 4 15:10:49 2007 -0700

    Increase despair by fixing xprint build after my _DEPENDENCIES changes.

diff --git a/configure.ac b/configure.ac
index f9c8408..a5bdfb4 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1649,11 +1649,10 @@ AC_MSG_CHECKING([whether to build Xprint
 AC_MSG_RESULT([$XPRINT])
 
 if test "x$XPRINT" = xyes; then
-	PKG_CHECK_MODULES([XPRINT], [printproto x11 xfont $XDMCP_MODULES xau])
-	XPRINT_EXTENSIONS="$XEXT_LIB $CONFIG_LIB $DBE_LIB $XTRAP_LIB $RECORD_LIB $RENDER_LIB $COMPOSITE_LIB $RANDR_LIB $XI_LIB $FIXES_LIB $DAMAGE_LIB $XI_LIB $GLX_LIBS"
-	XPRINT_LIBS="$DIX_LIB $XKB_LIB $XKB_STUB_LIB $XPRINT_EXTENSIONS $MIEXT_DAMAGE_LIB $CWRAP_LIB $XPRINT_LIBS"
-	AC_SUBST([XPRINT_CFLAGS])
-	AC_SUBST([XPRINT_LIBS])
+	PKG_CHECK_MODULES([XPRINTMODULES], [printproto x11 xfont $XDMCP_MODULES xau])
+	XPRINT_CFLAGS="$XPRINTMODULES_CFLAGS"
+	XPRINT_LIBS="$XEXT_LIB $CONFIG_LIB $DBE_LIB $XTRAP_LIB $RECORD_LIB $RENDER_LIB $COMPOSITE_LIB $RANDR_LIB $XI_LIB $FIXES_LIB $DAMAGE_LIB $XI_LIB $GLX_LIBS $MIEXT_DAMAGE_LIB $CWRAP_LIBS $XKB_LIB $XKB_STUB_LIB"
+	XPRINT_SYS_LIBS="$XPRINTMODULES_LIBS"
 
 	xpconfigdir=$libdir/X11/xserver
 	AC_SUBST([xpconfigdir])
@@ -1689,10 +1688,13 @@ if test "x$XPRINT" = xyes; then
             FREETYPE_LIBS=""
             FREETYPE_REQUIRES=""
         fi
-        AC_SUBST(FREETYPE_LIBS)
-        AC_SUBST(FREETYPE_CFLAGS)
-        AC_SUBST(FREETYPE_REQUIRES)
+	XPRINT_CFLAGS="$XPRINT_CFLAGS $FREETYPE_CFLAGS"
+	XPRINT_SYS_LIBS="$XPRINT_SYS_LIBS $FREETYPE_LIBS"
 	# end freetype support
+
+	AC_SUBST([XPRINT_CFLAGS])
+	AC_SUBST([XPRINT_LIBS])
+	AC_SUBST([XPRINT_SYS_LIBS])
 fi
 AM_CONDITIONAL(XP_USE_FREETYPE, [test "x$XPRINT" = xyes && test "x$XP_USE_FREETYPE" = xyes])
 
diff --git a/hw/xprint/Makefile.am b/hw/xprint/Makefile.am
index dc8764a..c440473 100644
--- a/hw/xprint/Makefile.am
+++ b/hw/xprint/Makefile.am
@@ -9,10 +9,22 @@ Xprt_CFLAGS = @DIX_CFLAGS@ @XPRINT_CFLAG
 	-DXFree86Server
 
 Xprt_LDFLAGS = -L$(top_srcdir)
-Xprt_LDADD = @XPRINT_LIBS@ ps/libps.la raster/libraster.la  \
-	pcl/libpcl.la pcl-mono/libpcl.la $(top_builddir)/fb/libfb.la \
-	$(top_builddir)/render/librender.la $(top_builddir)/mi/libmi.la \
-	$(top_builddir)/Xext/libXext.la  @FREETYPE_LIBS@
+XPRINT_LIBS = \
+	@XPRINT_LIBS@ \
+	ps/libps.la \
+	raster/libraster.la \
+	pcl/libpcl.la \
+	pcl-mono/libpcl.la \
+	$(top_builddir)/fb/libfb.la \
+	$(top_builddir)/render/librender.la \
+	$(XSERVER_LIBS) \
+	$(top_builddir)/Xext/libXext.la \
+	$(top_builddir)/xkb/libxkb.la \
+	$(top_builddir)/xkb/libxkbstubs.la \
+	$(top_builddir)/os/libos.la # for Xprintf
+
+Xprt_DEPENDENCIES = $(XPRINT_LIBS)
+Xprt_LDADD = $(XPRINT_LIBS) $(XPRINT_SYS_LIBS) $(XSERVER_SYS_LIBS)
 
 miinitext-wrapper.c:
 	echo "#include \"$(top_srcdir)/mi/miinitext.c\"" >> $@