MFZE1 (AIX fixes)

diff --git a/Zend/Zend.m4 b/Zend/Zend.m4
index df6fb5f4467f37e6cbf8a381c046af18ed44b09f..409c04083388666c1ac0f6424b5a30d2d383b259 100644 (file)
--- a/Zend/Zend.m4
+++ b/Zend/Zend.m4
@@ -1,3 +1,8 @@
+dnl
+dnl $Id$
+dnl
+dnl This file contains Zend specific autoconf functions.
+dnl
 
 AC_DEFUN(LIBZEND_BISON_CHECK,[
 
@@ -5,7 +10,7 @@ if test "$YACC" != "bison -y"; then
     AC_MSG_WARN(You will need bison if you want to regenerate the Zend parser.)
 else
     AC_MSG_CHECKING(bison version)
-    set `bison --version| sed -e 's/^GNU Bison version //' -e 's/\./ /'`
+    set `bison --version| grep 'GNU Bison' | cut -d ' ' -f 4 | sed -e 's/\./ /'`
     if test "${1}" = "1" -a "${2}" -lt "28"; then
         AC_MSG_WARN(You will need bison 1.28 if you want to regenerate the Zend parser (found ${1}.${2}).)
     fi

diff --git a/Zend/zend.h b/Zend/zend.h
index cb935c0a43edc46510171e6e17b2072028a23e10..545a20da6b678e0943aa6b61d13a05f5b5ef3c09 100644 (file)
--- a/Zend/zend.h
+++ b/Zend/zend.h
@@ -17,6 +17,7 @@
    +----------------------------------------------------------------------+
 */
 
+/* $Id$ */
 
 #ifndef ZEND_H
 #define ZEND_H
@@ -92,8 +93,19 @@
 # define ZEND_EXTENSIONS_SUPPORT       0
 #endif
 
-#if HAVE_ALLOCA_H
-# include <alloca.h>
+/* AIX requires this to be the first thing in the file.  */
+#ifndef __GNUC__
+# if HAVE_ALLOCA_H
+#  include <alloca.h>
+# else
+#  ifdef _AIX
+ #pragma alloca
+#  else
+#   ifndef alloca /* predefined by HP cc +Olibcalls */
+char *alloca ();
+#   endif
+#  endif
+# endif
 #endif
 
 #if (HAVE_ALLOCA || (defined (__GNUC__) && __GNUC__ >= 2)) && !(defined(ZTS) && defined(ZEND_WIN32))