diff options
| author | Sascha Schumann <sas@php.net> | 2000-01-01 20:49:34 +0000 |
|---|---|---|
| committer | Sascha Schumann <sas@php.net> | 2000-01-01 20:49:34 +0000 |
| commit | 800ffda01c019ccd9b5dba8e9b1d62fac9495b5d (patch) | |
| tree | b23772405487519739066e3c161c5229976264d4 | |
| parent | 6bdbd306b1c7dbc5e35807954f442e66bdefc6fa (diff) | |
| download | php-git-800ffda01c019ccd9b5dba8e9b1d62fac9495b5d.tar.gz | |
Some cleanup
| -rw-r--r-- | Zend/Zend.m4 | 11 | ||||
| -rw-r--r-- | Zend/acconfig.h | 5 | ||||
| -rw-r--r-- | Zend/acinclude.m4 | 5 |
3 files changed, 10 insertions, 11 deletions
diff --git a/Zend/Zend.m4 b/Zend/Zend.m4 index c2816402ad..5acdf7c3fa 100644 --- 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 2599994b7b..2ddee4eb16 100644 --- 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 897eab216b..7ec914d407 100644 --- 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,[ |