cvs: ZendEngine2 / Zend.m4
[email protected] ("Felipe Pena")
| Newsgroups | php.zend-engine.cvs |
|---|---|
| Message-ID | <cvsfelipe1205161760@cvsserver> |
felipe Mon Mar 10 15:09:20 2008 UTC
Modified files:
/ZendEngine2 Zend.m4
Log:
MFB: Improve the Darwin 9 hack considerably and switch to using dl*() instead of NS*() on Darwin 8+. (Patch by Gwynne)
http://cvs.php.net/viewvc.cgi/ZendEngine2/Zend.m4?r1=1.64&r2=1.65&diff_format=u
Index: ZendEngine2/Zend.m4
diff -u ZendEngine2/Zend.m4:1.64 ZendEngine2/Zend.m4:1.65
--- ZendEngine2/Zend.m4:1.64 Wed Dec 20 10:50:45 2006
+++ ZendEngine2/Zend.m4 Mon Mar 10 15:09:20 2008
@@ -1,5 +1,5 @@
dnl
-dnl $Id: Zend.m4,v 1.64 2006/12/20 10:50:45 dmitry Exp $
+dnl $Id: Zend.m4,v 1.65 2008/03/10 15:09:20 felipe Exp $
dnl
dnl This file contains Zend specific autoconf functions.
dnl
@@ -61,9 +61,20 @@
signal.h \
unix.h \
stdlib.h \
-mach-o/dyld.h \
dlfcn.h)
+dnl Don't use mach-o/dyld.h on Darwin 8+, dl* is recommended by Apple from there on
+dnl See http://developer.apple.com/documentation/DeveloperTools/Conceptual/MachOTopics/Articles/loading_code.html
+case $host_alias in
+*darwin[[89]]*)
+ ;;
+*)
+ AC_CHECK_HEADERS([ \
+mach-o/dyld.h
+],[],[][])
+ ;;
+esac
+
AC_TYPE_SIZE_T
AC_TYPE_SIGNAL