make the code more readable

diff --git a/acinclude.m4 b/acinclude.m4
index c6852192d3fad524c5348619ab7c4926fb8f00fc..6b009a5ee22ecca6e19385d21eb4b686dfb98e33 100644 (file)
--- a/acinclude.m4
+++ b/acinclude.m4
@@ -2928,6 +2928,10 @@ dnl
 dnl Generate platform specific dtrace header
 dnl
 AC_DEFUN([PHP_INIT_DTRACE], [
-  dtrace -h -C -s $abs_srcdir/$1 -o $abs_builddir/$2 && $SED -ibak 's,PHP_,DTRACE_,g' $abs_builddir/$2 || AC_MSG_ERROR([cannot create DTrace header file])
+  dtrace -h -C -s $abs_srcdir/$1 -o $abs_builddir/$2
+  if test "$?" != "0"; then 
+    AC_MSG_ERROR([cannot create DTrace header file])
+  fi
+  $SED -ibak 's,PHP_,DTRACE_,g' $abs_builddir/$2
 ])
 

diff --git a/configure.in b/configure.in
index 0ef02909bb1279a899c42bd035623d12e742c2ed..e8557bcaad065c8dcfdb37ecf3ac5ca5d22432f6 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -887,13 +887,15 @@ PHP_ARG_ENABLE(dtrace, whether to enable DTrace support,
 dnl ## DTRACE CHECHKS
 dnl ## this needs to be done before SAPI configureation
 if test "$PHP_DTRACE" = "yes"; then
-  AC_CHECK_HEADERS([sys/sdt.h],
-    [PHP_ADD_DTRACE([Zend/zend_dtrace.d], [main/main.c, Zend/zend_API.c \
-       Zend/zend_execute.c Zend/zend_exceptions.c \
-       Zend/zend_dtrace.c Zend/zend.c])
-     AC_DEFINE(HAVE_DTRACE, 1, [Whether to enable DTrace support])
-     PHP_INIT_DTRACE([Zend/zend_dtrace.d], [Zend/zend_dtrace_gen.h])],
-    AC_MSG_ERROR([DTrace header not found. DTrace is probably not available on your system!]))
+  AC_CHECK_HEADERS([sys/sdt.h], [
+    PHP_ADD_DTRACE([Zend/zend_dtrace.d], [main/main.c, Zend/zend_API.c \
+      Zend/zend_execute.c Zend/zend_exceptions.c \
+      Zend/zend_dtrace.c Zend/zend.c])
+    AC_DEFINE(HAVE_DTRACE, 1, [Whether to enable DTrace support])
+    PHP_INIT_DTRACE([Zend/zend_dtrace.d], [Zend/zend_dtrace_gen.h])
+  ], [
+    AC_MSG_ERROR([Cannot find sys/sdt.h which is required for DTrace support])
+  ])
 fi
 
 AC_MSG_CHECKING([how big to make fd sets])