diff options
| author | Kristian Høgsberg <krh@redhat.com> | 2004-08-16 16:36:14 +0000 |
|---|---|---|
| committer | Kristian Høgsberg <krh@redhat.com> | 2004-08-16 16:36:14 +0000 |
| commit | 93df4ff66635ea936d57723d317d0a0cdaa55e62 (patch) | |
| tree | 1d0c557d889a37ccd88d82b4468b9dab90148ef7 | |
| parent | c0753d383d2b610863873fda5a1d2c65674e37b0 (diff) | |
| download | xorg-lib-libXaw-93df4ff66635ea936d57723d317d0a0cdaa55e62.tar.gz | |
As discussed and agreed on on the release-wranglers meeting of August 16,XORG-6_7_99_903XORG-6_7_99_902XORG-6_7_99_901
I'm committing the patch from bug #1060 to back out unconditional
Xprint functionality.
Back out Xprint changes.
Revert xman to CVS of June 5, revert xlogo to CVS of May 8, revert xedit to
CVS of April 25, to back out unconditional Xprint support.
Fix up Xprint config logic to be like the rest of the extensions:
BuildXprint is a one-stop option for disabling everything Xprint
related. XprtServer controls building Xprt, BuildXprintLib controls
building Xprint libs and BuildXprintClients controls building clients
related to Xprint. BuiltXprint defaults to YES and the other options
respects relevant settings, i.e. BuildServer and BuildServersOnly.
Build Xaw regardless of BuildXprintLib setting.
Only build xphelloworld, xplsprinters and xprehashprinterlist when
BuildXprintClients it YES. Disable building xmore, it has always
supported XawPrintShell.
Make Xprint support depend on BuildXprintLib.
| -rw-r--r-- | src/AllWidgets.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/src/AllWidgets.c b/src/AllWidgets.c index 385bf88..115ea9e 100644 --- a/src/AllWidgets.c +++ b/src/AllWidgets.c @@ -68,8 +68,10 @@ extern WidgetClass vendorShellWidgetClass; extern WidgetClass viewportWidgetClass; extern WidgetClass wmShellWidgetClass; #ifndef OLDXAW +#ifdef XPRINT_IN_XAW extern WidgetClass xawPrintShellWidgetClass; #endif +#endif XmuWidgetNode XawWidgetArray[] = { { "applicationShell", &applicationShellWidgetClass }, @@ -115,8 +117,10 @@ XmuWidgetNode XawWidgetArray[] = { { "viewport", &viewportWidgetClass }, { "wmShell", &wmShellWidgetClass }, #ifndef OLDXAW +#ifdef XPRINT_IN_XAW { "printShell", &xawPrintShellWidgetClass }, #endif +#endif }; int XawWidgetCount = XtNumber(XawWidgetArray); |