summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEgbert Eich <eich@suse.de>2004-08-27 22:47:44 +0000
committerEgbert Eich <eich@suse.de>2004-08-27 22:47:44 +0000
commitbfc1f89d07762c45b6bf0c2278b34a7eac592763 (patch)
treeca4df7aba4ad9a8de6ec105df0250ab418afea44
parentda190a65b5fd9362194e744c7028a0d806269a07 (diff)
Set the define XtransFailSoft to restore the old behavior to fail softly
when socket directory cannot chowned/chmod to correct user/group. This should be added on a per OS basis which hasn't been done.
-rw-r--r--X11.rules6
-rw-r--r--X11.tmpl3
2 files changed, 8 insertions, 1 deletions
diff --git a/X11.rules b/X11.rules
index e1804b8..8467da7 100644
--- a/X11.rules
+++ b/X11.rules
@@ -124,3 +124,9 @@ XCOMM $XFree86: xc/config/cf/X11.rules,v 1.6 2001/01/17 16:22:31 dawes Exp $
# define X11CplusplusProjectDefines X11ProjectDefines
#endif
#define CplusplusProjectDefines X11CplusplusProjectDefines
+
+#ifdef XtransFailSoft
+# define XtransFailDefine -DFAIL_HARD
+#else
+# define XtransFailDefine /**/
+#endif
diff --git a/X11.tmpl b/X11.tmpl
index 331695d..4fb28ef 100644
--- a/X11.tmpl
+++ b/X11.tmpl
@@ -1,6 +1,6 @@
XCOMM ----------------------------------------------------------------------
XCOMM X Window System Build Parameters and Rules
-XCOMM $XdotOrg: xc/config/cf/X11.tmpl,v 1.29 2004/08/25 00:30:41 kem Exp $
+XCOMM $XdotOrg: xc/config/cf/X11.tmpl,v 1.30 2004/08/27 13:26:22 eich Exp $
XCOMM $Xorg: X11.tmpl,v 1.6 2000/08/17 19:41:46 cpqbld Exp $
XCOMM
XCOMM
@@ -1748,6 +1748,7 @@ XCOMM X Window System make variables; these need to be coordinated with rules
TRANSCOMMSRC = $(LIBSRC)/xtrans
TRANS_INCLUDES = -I$(TRANSCOMMSRC)
CONNECTION_FLAGS = ConnectionFlags ExtraConnectionDefs
+XTRANS_FAILDEFINES = XtransFailDefine
#ifdef X11ProjectRoot
XPROJECTROOT = X11ProjectRoot
#endif