summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat (limited to 'x11-base/xorg-server/files/1.4.0.90/0037-Check-for-sys-sdt.h-as-well-when-determining-to-en.patch')
-rw-r--r--x11-base/xorg-server/files/1.4.0.90/0037-Check-for-sys-sdt.h-as-well-when-determining-to-en.patch39
1 files changed, 39 insertions, 0 deletions
diff --git a/x11-base/xorg-server/files/1.4.0.90/0037-Check-for-sys-sdt.h-as-well-when-determining-to-en.patch b/x11-base/xorg-server/files/1.4.0.90/0037-Check-for-sys-sdt.h-as-well-when-determining-to-en.patch
new file mode 100644
index 000000000000..bac9999a9428
--- /dev/null
+++ b/x11-base/xorg-server/files/1.4.0.90/0037-Check-for-sys-sdt.h-as-well-when-determining-to-en.patch
@@ -0,0 +1,39 @@
+From b95befdfd2c9bcb6b0cd896f2b8dfaaeb129dbff Mon Sep 17 00:00:00 2001
+From: Alan Coopersmith <alan.coopersmith@sun.com>
+Date: Fri, 7 Dec 2007 17:28:37 -0800
+Subject: [PATCH] Check for <sys/sdt.h> as well when determining to enable dtrace probes
+
+Avoids auto-detecting dtrace is present on systems with the ISDN trace tool
+named dtrace installed, but not the dynamic tracing facility named dtrace
+---
+ configure.ac | 7 +++++++
+ 1 files changed, 7 insertions(+), 0 deletions(-)
+
+diff --git a/configure.ac b/configure.ac
+index 4841d26..c73f4a7 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -66,6 +66,8 @@ AC_SYS_LARGEFILE
+ XORG_PROG_RAWCPP
+
+ dnl Check for dtrace program (needed to build Xserver dtrace probes)
++dnl Also checks for <sys/sdt.h>, since some Linux distros have an
++dnl ISDN trace program named dtrace
+ AC_ARG_WITH(dtrace, AS_HELP_STRING([--with-dtrace=PATH],
+ [Enable dtrace probes (default: enabled if dtrace found)]),
+ [WDTRACE=$withval], [WDTRACE=auto])
+@@ -76,6 +78,11 @@ if test "x$WDTRACE" = "xyes" -o "x$WDTRACE" = "xauto" ; then
+ AC_MSG_FAILURE([dtrace requested but not found])
+ fi
+ WDTRACE="no"
++ else
++ AC_CHECK_HEADER(sys/sdt.h, [HAS_SDT_H="yes"], [HAS_SDT_H="no"])
++ if test "x$WDTRACE" = "xauto" -a "x$HAS_SDT_H" = "xno" ; then
++ WDTRACE="no"
++ fi
+ fi
+ fi
+ if test "x$WDTRACE" != "xno" ; then
+--
+1.5.5.1
+