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.

diff --git a/Zend/acconfig.h b/Zend/acconfig.h
index 9538c34b73ccb383a3d5c05fe795740be9f652f8..b58f8b7a6c299d5a6da470d13d5e8e20fc278365 100644 (file)
--- a/Zend/acconfig.h
+++ b/Zend/acconfig.h
@@ -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 @@ int zend_sprintf(char *buffer, const char *format, ...);
 #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

diff --git a/acinclude.m4 b/acinclude.m4
index 19961397fcb8d1202a2ee01f169206f9af0002be..8f4af6490c0457765eb8a6d511e51514c590913f 100644 (file)
--- a/acinclude.m4
+++ b/acinclude.m4
@@ -130,6 +130,8 @@ dnl append to the array which has been dynamically chosen at m4 time
 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