cvs: ZendEngine2 / acconfig.h php-src acinclude.m4

wez Fri Jan 9 18:37:29 2004 EDT Modified files: /php-src acinclude.m4 /ZendEngine2 acconfig.h Log: support for building asm in the unix buildsys. Also, when ZEND_ACCONFIG_H_NO_C_PROTOS is defined, omit the C prototypes from the configuration header so that it can be included into asm files. Index: php-src/acinclude.m4 diff -u php-src/acinclude.m4:1.267 php-src/acinclude.m4:1.268 --- php-src/acinclude.m4:1.267 Fri Dec 12 00:19:30 2003 +++ php-src/acinclude.m4 Fri Jan 9 18:37:29 2004 @@ -1,4 +1,4 @@ -dnl $Id: acinclude.m4,v 1.267 2003/12/12 05:19:30 sniper Exp $ +dnl $Id: acinclude.m4,v 1.268 2004/01/09 23:37:29 wez Exp $ dnl dnl This file contains local autoconf functions. @@ -130,6 +130,8 @@ dnl choose the right compiler/flags/etc. for the source-file case $ac_src in *.c[)] ac_comp="$b_c_pre $3 $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $6$b_c_post" ;; + *.s[)] ac_comp="$b_c_pre $3 $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $6$b_c_post" ;; + *.S[)] ac_comp="$b_c_pre $3 $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $6$b_c_post" ;; *.cpp[)] ac_comp="$b_cxx_pre $3 $ac_inc $b_cxx_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $6$b_cxx_post" ;; esac Index: ZendEngine2/acconfig.h diff -u ZendEngine2/acconfig.h:1.32 ZendEngine2/acconfig.h:1.33 --- ZendEngine2/acconfig.h:1.32 Thu Jan 8 12:31:47 2004 +++ ZendEngine2/acconfig.h Fri Jan 9 18:37:29 2004 @@ -17,7 +17,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: acconfig.h,v 1.32 2004/01/08 17:31:47 sniper Exp $ */ +/* $Id: acconfig.h,v 1.33 2004/01/09 23:37:29 wez Exp $ */ #define ZEND_API #define ZEND_DLEXPORT @@ -37,6 +37,8 @@ @BOTTOM@ #endif +#ifndef ZEND_ACCONFIG_H_NO_C_PROTOS + #ifdef HAVE_STDLIB_H # include <stdlib.h> #endif @@ -96,6 +98,8 @@ #define zend_finite(a) (zend_isnan(a) ? 0 : zend_isinf(a) ? 0 : 1) #endif +#endif /* ifndef ZEND_ACCONFIG_H_NO_C_PROTOS */ + /* * Local variables: * tab-width: 4