- cleanup

[packages/X11.git] / XFree86-Xwrapper.patch

diff --git a/XFree86-Xwrapper.patch b/XFree86-Xwrapper.patch
index 4313c78b0b54636587fe313fa378bf71cb1707a7..f67e6d4e8256e8d47be05a90dc1d989763d5be04 100644 (file)
--- a/XFree86-Xwrapper.patch
+++ b/XFree86-Xwrapper.patch
@@ -80,12 +80,13 @@ diff -urN xc.orig/programs/Xserver/Imakefile xc/programs/Xserver/Imakefile
  #include <Server.tmpl>
  
  #ifdef XFree86Version
-@@ -1146,6 +1141,11 @@
+@@ -1146,6 +1141,12 @@
  #endif /* XnestServer */
  
  
 +#if UseXserverWrapper
-+SetUIDProgramTarget(Xwrapper,os/wrapper.o,NullParameter,$(PAMLIBS),NullParameter)
++all:: Xwrapper
++SetUIDProgramTarget(Xwrapper,os/wrapper.o,NullParameter,$(SERVERPAMLIBRARIES),NullParameter)
 +InstallProgramWithFlags(Xwrapper,$(BINDIR),$(INSTUIDFLAGS))
 +#endif
 +
@@ -109,22 +110,14 @@ diff -urN xc.orig/programs/Xserver/hw/xfree86/os-support/linux/lnx_init.c xc/pro
        /*
 --- xc/programs/Xserver/os/Imakefile.orig      2006-02-19 16:51:31.000000000 +0100
 +++ xc/programs/Xserver/os/Imakefile   2006-07-19 21:30:56.576028250 +0200
-@@ -193,6 +193,7 @@
-                 -I$(SERVERSRC)/Xext -I$(SERVERSRC)/render \
-                 -I$(SERVERSRC)/lbx -I$(SERVERSRC)/Xprint \
-                 -I$(TOP)/lib/Xau Krb5Includes
-+  EXTRA_DEFINES = -DUSE_PAM
-  DEPEND_DEFINES = $(DBM_DEFINES) $(XDMCP_DEFINES) \
-                 $(TRANS_INCLUDES) $(CONNECTION_FLAGS) DependDefines
-        LINTLIBS = ../dix/llib-ldix.ln
-@@ -239,6 +240,14 @@
+@@ -239,6 +241,14 @@
  SpecialCObjectRule(oscolor,$(ICONFIGFILES),$(DBM_DEFINES))
  #endif
  
-+#if UseXserverWrapper
++#if UseXserverWrapper && XF86Server
 +AllTarget(wrapper.o)
 +
-+       WRAPPER_DEFINES = -DXSERVER_PATH=\"/etc/X11/X\"
++       WRAPPER_DEFINES = -DXSERVER_PATH=\"/etc/X11/X\" $(PAMDEFINES)
 +
 +SpecialCObjectRule(wrapper,NullParameter,$(WRAPPER_DEFINES))
 +#endif