Some cleanup

diff --git a/Zend/Zend.m4 b/Zend/Zend.m4
index c2816402ad951cd9a8570efc1e254e2acdb0c6e1..5acdf7c3faaf8becec9ae6dba9e16f779cda01b6 100644 (file)
--- a/Zend/Zend.m4
+++ b/Zend/Zend.m4
@@ -200,7 +200,7 @@ dnl Digital Unix 4.0
 AC_CHECK_LIB(cxx, cin)
 AC_CHECK_LIB(cxxstd, __array_delete)
 
-AC_MSG_CHECKING(for class istdiostream)
+AC_CACHE_CHECK(for class istdiostream,ac_cv_class_istdiostream,[
 AC_TRY_COMPILE([
 #include <sys/types.h>
 #include <unistd.h>
@@ -209,11 +209,14 @@ AC_TRY_COMPILE([
 ],[
 istdiostream *foo = new istdiostream((FILE *) 0);
 ],[
-  AC_DEFINE(HAVE_CLASS_ISTDIOSTREAM, 1, [Whether you have class istdiostream])
-  AC_MSG_RESULT(yes)
+  ac_cv_class_istdiostream=yes
 ],[
-  AC_MSG_RESULT(no)
+  ac_cv_class_istdiostream=no
 ])
+])
+  if test "$ac_cv_class_istdiostream" = "yes"; then
+    AC_DEFINE(HAVE_CLASS_ISTDIOSTREAM, 1, [Whether you have class istdiostream])
+  fi
 AC_LANG_C
 fi
 ])

diff --git a/Zend/acconfig.h b/Zend/acconfig.h
index 2599994b7bec32ec387c8c899e0afae5d5bd9e9f..2ddee4eb166a01cf8eb94dfe42947107cbf2f91e 100644 (file)
--- a/Zend/acconfig.h
+++ b/Zend/acconfig.h
@@ -1,5 +1,3 @@
-#undef HAVE_CLASS_ISTDIOSTREAM
-
 #define ZEND_API
 
 @TOP@
@@ -33,9 +31,6 @@
 /* Define if you want to enable memory limit support */
 #define MEMORY_LIMIT 0
 
-/* Define if you have broken sprintf function like SunOS 4 */
-#define ZEND_BROKEN_SPRINTF 0
-
 /* Define to compile Zend thread safe */
 #undef ZTS
 

diff --git a/Zend/acinclude.m4 b/Zend/acinclude.m4
index 897eab216b6560434e41f1c5c5e6cd2301e7a9bc..7ec914d407aa4698bb89e4059d29175e59680716 100644 (file)
--- a/Zend/acinclude.m4
+++ b/Zend/acinclude.m4
@@ -16,10 +16,11 @@ AC_DEFUN(AC_ZEND_BROKEN_SPRINTF,[
     ])
   ])
   if test "$ac_cv_broken_sprintf" = "yes"; then
-    AC_DEFINE(ZEND_BROKEN_SPRINTF, 1, [Whether sprintf is broken])
+    ac_result=1
   else
-    AC_DEFINE(ZEND_BROKEN_SPRINTF, 0, [Whether sprintf is broken])
+    ac_result=0
   fi
+  AC_DEFINE_UNQUOTED(ZEND_BROKEN_SPRINTF, $ac_result, [Whether sprintf is broken])
 ])
 
 AC_DEFUN(AM_SET_LIBTOOL_VARIABLE,[