diff options
| author | Peter Hutterer <peter.hutterer@who-t.net> | 2009-09-28 16:48:46 +1000 |
|---|---|---|
| committer | Peter Hutterer <peter.hutterer@who-t.net> | 2009-09-28 16:48:46 +1000 |
| commit | 8c83457c60a4e02ca61086c7218dcd0e054926ba (patch) | |
| tree | b0c5cd3175622ffb7cbaf761b180c939f8daf55b /configure.ac | |
| parent | 6af44db315121ea24cec390d144514bf56908b2c (diff) | |
| parent | b49dba33f94b51ba9a14803f0d81ccde2cb778f8 (diff) | |
Merge remote branch 'origin/xorg-server-1.7-apple' into server-1.7-branch
Diffstat (limited to 'configure.ac')
| -rw-r--r-- | configure.ac | 8 |
1 files changed, 1 insertions, 7 deletions
diff --git a/configure.ac b/configure.ac index 91d87afc8..a7f55106d 100644 --- a/configure.ac +++ b/configure.ac @@ -85,12 +85,6 @@ 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]) -dnl Darwin 9 has dtrace, but it doesn't support compilation into ELF... -if test "x$WDTRACE" = xauto; then - case $host_os in - darwin*) WDTRACE="no" ;; - esac -fi if test "x$WDTRACE" = "xyes" -o "x$WDTRACE" = "xauto" ; then AC_PATH_PROG(DTRACE, [dtrace], [not_found], [$PATH:/usr/sbin]) if test "x$DTRACE" = "xnot_found" ; then @@ -1250,7 +1244,7 @@ AC_DEFINE(XSYNC, 1, [Support XSync extension]) AC_DEFINE(XCMISC, 1, [Support XCMisc extension]) AC_DEFINE(BIGREQS, 1, [Support BigRequests extension]) -if test "x$WDTRACE" != "xno" ; then +if test "x$WDTRACE" != "xno" && test "x$XQUARTZ" = "xno"; then DIX_LIB='$(top_builddir)/dix/dix.O' OS_LIB='$(top_builddir)/os/os.O' else |