xserver: Branch 'master' - 2 commits

[Alan Coopersmith]

 hw/xfree86/Makefile.am        |    5 +++++
 hw/xfree86/loader/Makefile.am |    2 +-
 hw/xfree86/loader/sdksyms.sh  |    4 ++--
 3 files changed, 8 insertions(+), 3 deletions(-)

New commits:
commit 8c488ac3b3990cd203baed7f2127b9bed8aab534
Author: Alan Coopersmith <alan.coopersmith at sun.com>
Date:   Thu Dec 18 19:47:49 2008 -0800

    Fix linking of Xorg with dtrace probes on Solaris

diff --git a/hw/xfree86/Makefile.am b/hw/xfree86/Makefile.am
index 03c228c..abdbe6a 100644
--- a/hw/xfree86/Makefile.am
+++ b/hw/xfree86/Makefile.am
@@ -62,6 +62,11 @@ BUILT_SOURCES = xorg.conf.example
 DISTCLEANFILES += xorg.conf.example xorg.conf.example.pre
 EXTRA_DIST = xorgconf.cpp
 
+if XSERVER_DTRACE
+# Re-add dtrace object code that gets lost when building static libraries
+Xorg_LDADD += $(XSERVER_LIBS)
+endif
+
 if SOLARIS_ASM_INLINE
 # Needs to be built before any files are compiled when using Sun compilers
 # so in*/out* inline definitions are properly processed.
commit 396433d0da721951e6e7abc02dc3b2f682495154
Author: Alan Coopersmith <alan.coopersmith at sun.com>
Date:   Thu Dec 18 18:49:47 2008 -0800

    Fix sdksyms.sh to work with Solaris/Sun compiler builds
    
     - Pass $(CPP) & $(AWK) settings from configure to sdksyms.sh
     - Only reset sdk variable (tracks if header is part of sdk) if
       a filename is included on the cpp # <line-no> <filename> line,
       since Sun compilers omit filename when it is unchanged from
       previous line.

diff --git a/hw/xfree86/loader/Makefile.am b/hw/xfree86/loader/Makefile.am
index 19c7dab..8732a49 100644
--- a/hw/xfree86/loader/Makefile.am
+++ b/hw/xfree86/loader/Makefile.am
@@ -24,4 +24,4 @@ libloader_la_SOURCES = \
 CLEANFILES = sdksyms.c
 
 sdksyms.c: sdksyms.sh
-	$(srcdir)/sdksyms.sh $(top_srcdir) $(AM_CFLAGS) $(CFLAGS) $(INCLUDES)
+	CPP='$(CPP)' AWK='$(AWK)' $(srcdir)/sdksyms.sh $(top_srcdir) $(AM_CFLAGS) $(CFLAGS) $(INCLUDES)
diff --git a/hw/xfree86/loader/sdksyms.sh b/hw/xfree86/loader/sdksyms.sh
index 55f7206..0576010 100755
--- a/hw/xfree86/loader/sdksyms.sh
+++ b/hw/xfree86/loader/sdksyms.sh
@@ -324,7 +324,7 @@ topdir=$1
 shift
 LC_ALL=C
 export LC_ALL
-cpp -DXorgLoader $@ sdksyms.c | awk -v topdir=$topdir '
+${CPP:-cpp} "$@" -DXorgLoader sdksyms.c | ${AWK:-awk} -v topdir=$topdir '
 BEGIN {
     sdk = 0;
     print("/*");
@@ -334,7 +334,7 @@ BEGIN {
     printf("/* topdir=%s */\n", topdir);
     print("_X_HIDDEN void *xorg_symbols[] = {");
 }
-/^# [0-9]+/ {
+/^# [0-9]+ "/ {
     #   Process text after a include in a relative path or when the
     # processed file has a basename matching $top_srcdir.
     #   Note that indexing starts at 1; 0 means no match, and there