24 # Except as contained in this notice, the name of a copyright holder |
24 # Except as contained in this notice, the name of a copyright holder |
25 # shall not be used in advertising or otherwise to promote the sale, use |
25 # shall not be used in advertising or otherwise to promote the sale, use |
26 # or other dealings in this Software without prior written authorization |
26 # or other dealings in this Software without prior written authorization |
27 # of the copyright holder. |
27 # of the copyright holder. |
28 |
28 |
29 diff -urp -x '*~' configure.ac configure.ac |
29 diff -urp -x '*~' -x '*.orig' configure.ac configure.ac |
30 --- configure.ac 2006-12-21 14:21:37.260843000 -0800 |
30 --- configure.ac 2007-07-30 18:33:18.270657000 -0700 |
31 +++ configure.ac 2006-12-21 14:21:51.350495000 -0800 |
31 +++ configure.ac 2007-07-30 18:33:33.880185000 -0700 |
32 @@ -881,6 +881,7 @@ PKG_CHECK_MODULES([XSERVERCFLAGS], [$REQ |
32 @@ -887,6 +887,7 @@ PKG_CHECK_MODULES([XSERVERCFLAGS], [$REQ |
33 PKG_CHECK_MODULES([XSERVERLIBS], [$REQUIRED_LIBS]) |
33 PKG_CHECK_MODULES([XSERVERLIBS], [$REQUIRED_LIBS]) |
34 |
34 |
35 XSERVER_CFLAGS="${XSERVERCFLAGS_CFLAGS}" |
35 XSERVER_CFLAGS="${XSERVERCFLAGS_CFLAGS}" |
36 +LIBS="${LIBS} -lproject" |
36 +LIBS="${LIBS} -lproject" |
37 XSERVER_LIBS="${XSERVERLIBS_LIBS} ${SYS_LIBS} ${LIBS}" |
37 XSERVER_LIBS="${XSERVERLIBS_LIBS} ${SYS_LIBS} ${LIBS}" |
38 AC_SUBST([SYS_LIBS]) |
38 AC_SUBST([SYS_LIBS]) |
39 |
39 |
40 diff -urp -x '*~' os/Makefile.am os/Makefile.am |
40 diff -urp -x '*~' -x '*.orig' os/Makefile.am os/Makefile.am |
41 --- os/Makefile.am 2006-12-21 14:21:37.266897000 -0800 |
41 --- os/Makefile.am 2007-07-30 18:33:18.179832000 -0700 |
42 +++ os/Makefile.am 2006-12-21 14:21:51.334148000 -0800 |
42 +++ os/Makefile.am 2007-07-30 18:33:33.905121000 -0700 |
43 @@ -27,6 +27,7 @@ libos_la_SOURCES = \ |
43 @@ -27,6 +27,7 @@ libos_la_SOURCES = \ |
44 xdmauth.c \ |
44 xdmauth.c \ |
45 xstrans.c \ |
45 xstrans.c \ |
46 xprintf.c \ |
46 xprintf.c \ |
47 + dtlogin.c \ |
47 + dtlogin.c \ |
48 $(XORG_SRCS) |
48 $(XORG_SRCS) |
49 |
49 |
50 if XCSECURITY |
50 if XCSECURITY |
51 @@ -41,6 +42,8 @@ if NEED_STRLCAT |
51 @@ -41,6 +42,8 @@ if NEED_STRLCAT |
52 libos_la_SOURCES += $(STRLCAT_SOURCES) |
52 libos_la_SOURCES += $(STRLCAT_SRCS) |
53 endif |
53 endif |
54 |
54 |
55 +libos_la_LIBADD = -lproject |
55 +libos_la_LIBADD = -lproject |
56 + |
56 + |
57 libcwrapper_la_SOURCES = \ |
57 libcwrapper_la_SOURCES = \ |
58 $(top_srcdir)/hw/xfree86/os-support/shared/libc_wrapper.c |
58 $(top_srcdir)/hw/xfree86/os-support/shared/libc_wrapper.c |
59 libcwrapper_la_CFLAGS = \ |
59 libcwrapper_la_CFLAGS = \ |
60 diff -urp -x '*~' os/auth.c os/auth.c |
60 diff -urp -x '*~' -x '*.orig' os/auth.c os/auth.c |
61 --- os/auth.c 2006-11-13 16:59:41.000000000 -0800 |
61 --- os/auth.c 2006-09-17 23:04:18.000000000 -0700 |
62 +++ os/auth.c 2006-12-21 14:21:51.334597000 -0800 |
62 +++ os/auth.c 2007-07-30 18:33:33.905663000 -0700 |
63 @@ -332,6 +332,19 @@ AddAuthorization (unsigned name_length, |
63 @@ -332,6 +332,19 @@ AddAuthorization (unsigned name_length, |
64 return 0; |
64 return 0; |
65 } |
65 } |
66 |
66 |
67 +#ifdef SUNSOFT |
67 +#ifdef SUNSOFT |