Add buildsystem for Xprint, and:

Wed Aug 17 14:50:58 2005 Soren Sandmann <sandmann@redhat.com>
Include <X11/extensions/Print{,str}.h> instead of "Print{,str}.h"
Include <X11/fonts/fontstruct.h> isntead of "fonts/fontstruct.h"
Wed Aug 17 14:54:49 2005 Søren Sandmann <sandmann@redhat.com>
Conditionally compile in xprint.c
Add Xprint

10 files changed, 150 insertions, 7 deletions

diff --git a/ChangeLog b/ChangeLog
index e12f49b97..2684ed2ad 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+Wed Aug 17 14:54:49 2005  Søren Sandmann  <sandmann@redhat.com>
+
+	* Xext/Makefile.am: Conditionally compile in xprint.c
+
+	* Makefile.am, configure.ac: Add Xprint
+
 Tue Aug 16 12:09:09 2005  Søren Sandmann  <sandmann@redhat.com>
 
 	* hw/xfree86/dixmods/Makefile.am: Add ft and type1 modules.
diff --git a/Makefile.am b/Makefile.am
index ffac1baf4..dfa95b0cc 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -47,7 +47,8 @@ SUBDIRS=	\
 	$(XTRAP_DIR) \
 	$(COMPOSITE_DIR) \
         $(GLX_DIR) \
-	hw
+	hw	\
+	Xprint
 
 pkgconfigdir = $(libdir)/pkgconfig
 pkgconfig_DATA = xorg-server.pc
diff --git a/Xext/Makefile.am b/Xext/Makefile.am
index ac5f9246b..d043555ba 100644
--- a/Xext/Makefile.am
+++ b/Xext/Makefile.am
@@ -30,6 +30,10 @@ if XEVIE
 XEVIE_SRCS = xevie.c EVIstruct.h
 endif
 
+if XPRINT
+XPRINT_SRCS = xprint.c
+endif
+
 INCLUDES = -I$(top_srcdir)/hw/xfree86/dixmods/extmod
 
 AM_CFLAGS = $(DIX_CFLAGS)
@@ -60,4 +64,6 @@ libXext_la_SOURCES =		\
 	$(SCREENSAVER_SRCS)	\
 	$(PANORAMIX_SRCS)	\
 	$(XCSECURITY_SRCS)	\
-	$(XEVIE_SRCS)
+	$(XEVIE_SRCS)		\
+	$(XPRINT_SRCS)
+
diff --git a/Xext/xprint.c b/Xext/xprint.c
index c59a8c008..60512d372 100644
--- a/Xext/xprint.c
+++ b/Xext/xprint.c
@@ -83,8 +83,8 @@ copyright holders.
 #include "extnsionst.h"
 #include "dixstruct.h"
 #include <X11/Xatom.h>
-#include "Print.h"
-#include "Printstr.h"
+#include <X11/extensions/Print.h>
+#include <X11/extensions/Printstr.h>
 #include "../Xprint/DiPrint.h"
 #include "../Xprint/attributes.h"
 #include "modinit.h"
diff --git a/Xprint/Init.c b/Xprint/Init.c
index 889a036dc..0bc1cf39e 100644
--- a/Xprint/Init.c
+++ b/Xprint/Init.c
@@ -82,14 +82,14 @@ copyright holders.
 #include "inputstr.h"
 
 #include "gcstruct.h"
-#include "fonts/fontstruct.h"
+#include <X11/fonts/fontstruct.h>
 #include "errno.h"
 
 typedef char *XPointer;
 #define HAVE_XPointer 1
 
 #define Status int
-#include <Xresource.h>
+#include <X11/Xresource.h>
 
 #include "DiPrint.h"
 #include "attributes.h"
diff --git a/Xprint/Makefile.am b/Xprint/Makefile.am
new file mode 100644
index 000000000..c6f044923
--- /dev/null
+++ b/Xprint/Makefile.am
@@ -0,0 +1,33 @@
+SUBDIRS = pcl raster ps
+
+bin_PROGRAMS = Xprt
+
+Xprt_CFLAGS = @DIX_CFLAGS@ -DPRINT_ONLY_SERVER -D_XP_PRINT_SERVER_  -DXPRINTDIR=\"$(prefix)/X11/xserver\"  
+
+Xprt_LDFLAGS = -L$(top_srcdir)
+Xprt_LDADD = @XPRINT_LIBS@ pcl/libpcl.la raster/libraster.la
+
+miinitext-wrapper.c:
+	echo "#include \"$(top_srcdir)/mi/miinitext.c\"" >> $@
+
+dpmsstubs-wrapper.c:
+	echo "#include \"$(top_srcdir)/Xext/dpmsstubs.c\"" >> $@
+
+Xprt_SOURCES =			\
+	attributes.c		\
+	attributes.h		\
+	AttrValid.c		\
+	AttrValid.h		\
+	ddxInit.c		\
+	DiPrint.h		\
+	Init.c			\
+	mediaSizes.c		\
+	Oid.c			\
+	OidDefs.h		\
+	Oid.h			\
+	OidStrs.h		\
+	spooler.c		\
+	spooler.h		\
+	Util.c			\
+	miinitext-wrapper.c	\
+	dpmsstubs-wrapper.c
diff --git a/Xprint/pcl/Makefile.am b/Xprint/pcl/Makefile.am
new file mode 100644
index 000000000..e8bbae09e
--- /dev/null
+++ b/Xprint/pcl/Makefile.am
@@ -0,0 +1,30 @@
+noinst_LTLIBRARIES = libpcl.la
+
+INCLUDES = -I$(top_srcdir)/Xprint -I$(top_srcdir)/cfb -I$(top_srcdir)/mfb
+
+AM_CFLAGS = @DIX_CFLAGS@ -D_XP_PRINT_SERVER_ -DPSZ=8
+
+libpcl_la_SOURCES =		\
+	PclArc.c		\
+	PclArea.c		\
+	PclAttr.c		\
+	PclAttVal.c		\
+	PclColor.c		\
+	PclCursor.c		\
+	PclDef.h		\
+	PclFonts.c		\
+	PclGC.c			\
+	Pcl.h			\
+	PclInit.c		\
+	PclLine.c		\
+	Pclmap.h		\
+	PclMisc.c		\
+	PclPixel.c		\
+	PclPixmap.c		\
+	PclPolygon.c		\
+	PclPrint.c		\
+	PclSFonts.c		\
+	PclSFonts.h		\
+	PclSpans.c		\
+	PclText.c		\
+	PclWindow.c
diff --git a/Xprint/ps/Makefile.am b/Xprint/ps/Makefile.am
new file mode 100644
index 000000000..a98dc3561
--- /dev/null
+++ b/Xprint/ps/Makefile.am
@@ -0,0 +1,36 @@
+noinst_LTLIBRARIES = libps.la
+
+INCLUDES = -I$(top_srcdir)/Xprint -I$(top_srcdir)/cfb -I$(top_srcdir)/mfb
+
+AM_CFLAGS = @DIX_CFLAGS@ -D_XP_PRINT_SERVER_ -DPSZ=8 -DXP_PSTEXT
+
+libps_la_SOURCES =		\
+	PsArc.c			\
+	PsArea.c		\
+	PsAttr.c		\
+	PsAttVal.c		\
+	PsCache.c		\
+	PsColor.c		\
+	PsDef.h			\
+	PsFonts.c		\
+	PsGC.c			\
+	Ps.h			\
+	PsImageUtil.c		\
+	PsInit.c		\
+	PsLine.c		\
+	PsMisc.c		\
+	psout.c			\
+	psout.h			\
+	PsPixel.c		\
+	PsPixmap.c		\
+	PsPolygon.c		\
+	PsPrint.c		\
+	PsSpans.c		\
+	PsText.c		\
+	PsWindow.c
+
+EXTRA_DIST = 	PsFTFonts.c	\
+	psout_ft.c		\
+	psout_ftpstype1.c	\
+	psout_ftpstype3.c	\
+	ttf2pt1wrap.c
diff --git a/Xprint/raster/Makefile.am b/Xprint/raster/Makefile.am
new file mode 100644
index 000000000..168bcfe41
--- /dev/null
+++ b/Xprint/raster/Makefile.am
@@ -0,0 +1,10 @@
+noinst_LTLIBRARIES = libraster.la
+
+INCLUDES = -I$(top_srcdir)/Xprint -I$(top_srcdir)/cfb -I$(top_srcdir)/mfb
+
+AM_CFLAGS = @DIX_CFLAGS@ -D_XP_PRINT_SERVER_ -DPSZ=8
+
+libraster_la_SOURCES =		\
+	RasterAttVal.c		\
+	Raster.c		\
+	Raster.h
diff --git a/configure.ac b/configure.ac
index dddd5b881..06446f2b9 100644
--- a/configure.ac
+++ b/configure.ac
@@ -166,6 +166,7 @@ DEFAULT_VENDOR_RELEASE="$PACKAGE_VERSION"
 VERSION_STRING="6,99,99,900,0"
 DEFAULT_VENDOR_WEB="http://wiki.x.org"
 EXTENSION_LIBS='$(top_builddir)/Xext/libXext.la'
+XPRINT_EXTENSIONS='$(top_builddir)/Xext/libXext.la'" "'$(top_builddir)/render/librender.la'" "'$(top_builddir)/composite/libcomposite.la'" "'$(top_builddir)/randr/librandr.la'" "'$(top_builddir)/Xi/libXi.la'" "'$(top_builddir)/xfixes/libxfixes.la'" "'$(top_builddir)/damageext/libdamageext.la'
 DMX_EXTENSIONS='$(top_builddir)/Xext/libXext.la'" "'$(top_builddir)/render/librender.la'
 EXTENSION_INCS='-I$(top_srcdir)/Xext'
 AC_DEFINE(XORG_SERVER, 1, [Build X.Org X server])
@@ -194,6 +195,7 @@ AC_ARG_ENABLE(xvfb,    	      AS_HELP_STRING([--enable-xvfb],[Build Xvfb server
 AC_ARG_ENABLE(xnest,   	      AS_HELP_STRING([--enable-xnest],[Build Xnest server (default: auto)]),[XNEST=$enableval],[XNEST=auto])
 AC_ARG_ENABLE(xwin,    	      AS_HELP_STRING([--enable-xwin],[Build XWin server (default: auto)]),[XWIN=$enableval],[XWIN=auto])
 AC_ARG_ENABLE(xevie,          AS_HELP_STRING([--enable-xevie],[Build XEvIE extension (default: disabled)]), [XEVIE=$enableval],[XEVIE=no])
+AC_ARG_ENABLE(xprint,         AS_HELP_STRING([--disable-xprint],[Build Xprint extension and server (default: auto)]), [XPRINT=$enableval],[XPRINT=auto])
 
 # Transport selection
 AC_ARG_ENABLE(unix-transport,[  --disable-unix-transport ], [UNIXCONN=$enableval], [UNIXCONN=yes])
@@ -285,7 +287,20 @@ if test "$XNEST" = yes; then
 fi
 AM_CONDITIONAL(XNEST, [test x$XNEST = xyes])
 
-          
+#
+# XPRINT
+#
+
+if test "$XPRINT" = auto; then
+   PKG_CHECK_MODULES([XPRINT], [printproto x11], [XPRINT=yes], [XPRINT=no])
+fi
+if test x$XPRINT = xyes; then
+   PKG_CHECK_MODULES([XPRINT], [printproto x11 xfont])
+fi
+AM_CONDITIONAL(XPRINT, [test x$XPRINT = xyes])
+AC_MSG_CHECKING([whether to build Xprint DDX])
+AC_MSG_RESULT([$XPRINT])
+
 # Checks to see if we should compile in MMX support (there will be
 # a runtime test when the code is actually run to see if it should
 # be used - this just checks if we can compile it.)
@@ -651,6 +666,7 @@ XVFB_LIBS="$FB_LIB $MI_LIB $GLX_LIBS $EXTENSION_LIBS $XI_LIB $XKB_LIB $COMPOSITE
 XNEST_LIBS="$FB_LIB $MI_LIB $GLX_LIBS $EXTENSION_LIBS $XI_LIB $XKB_LIB $COMPOSITE_LIB $DAMAGE_LIB $LAYER_LIB $XPSTUBS_LIB $OS_LIB"
 XWIN_LIBS="$FB_LIB $MI_LIB $EXTENSION_LIBS $XI_LIB $XKB_LIB $COMPOSITE_LIB $DAMAGE_LIB $LAYER_LIB $XPSTUBS_LIB $OS_LIB $SHADOW_LIB"
 XDMX_LIBS="$FB_LIB $MI_LIB $DMX_EXTENSIONS $EXTENSION_LIBS $XI_LIB $XKB_LIB $DAMAGE_LIB $OS_LIB $SHADOW_LIB"
+XPRINT_LIBS="$XPRINT_LIBS $DIX_LIB $XKB_LIB $OS_LIB $XPRINT_EXTENSIONS $MI_LIB $DAMAGE_LIB"
 XORG_DDXINCS='-I$(top_srcdir)/hw/xfree86 -I$(top_srcdir)/hw/xfree86/include -I$(top_srcdir)/hw/xfree86/common'
 XORG_OSINCS='-I$(top_srcdir)/hw/xfree86/os-support -I$(top_srcdir)/hw/xfree86/os-support/bus -I$(top_srcdir)/os'
 XORG_INCS="$XORG_DDXINCS $XORG_OSINCS"
@@ -764,6 +780,7 @@ AC_SUBST([XNEST_LIBS])
 AC_SUBST([XWIN_LIBS])
 AC_SUBST([EXTENSION_LIBS])
 AC_SUBST([XDMX_LIBS])
+AC_SUBST([XPRINT_LIBS])
 AC_SUBST([XORG_INCS])
 AC_SUBST([XORG_OS])
 AC_SUBST([XORG_OS_SUBDIR])
@@ -975,5 +992,9 @@ hw/dmx/Makefile
 hw/vfb/Makefile
 hw/xnest/Makefile
 hw/xwin/Makefile
+Xprint/Makefile
+Xprint/pcl/Makefile
+Xprint/raster/Makefile
+Xprint/ps/Makefile
 xorg-server.pc
 ])