tony2001                                 Fri, 07 May 2010 15:17:34 +0000

Revision: http://svn.php.net/viewvc?view=revision&revision=299110

Log:
make the code more readable

Changed paths:
    U   php/php-src/trunk/acinclude.m4
    U   php/php-src/trunk/configure.in

Modified: php/php-src/trunk/acinclude.m4
===================================================================
--- php/php-src/trunk/acinclude.m4      2010-05-07 15:07:43 UTC (rev 299109)
+++ php/php-src/trunk/acinclude.m4      2010-05-07 15:17:34 UTC (rev 299110)
@@ -2928,6 +2928,10 @@
 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
 ])


Modified: php/php-src/trunk/configure.in
===================================================================
--- php/php-src/trunk/configure.in      2010-05-07 15:07:43 UTC (rev 299109)
+++ php/php-src/trunk/configure.in      2010-05-07 15:17:34 UTC (rev 299110)
@@ -887,13 +887,15 @@
 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])

-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

Reply via email to