cvs: php4 / acinclude.m4 /ext/domxml config.m4 /ext/imap config.m4 /ext/snmp config.m4

sr Sat Jun 1 16:14:58 2002 EDT Modified files: /php4 acinclude.m4 /php4/ext/domxml config.m4 /php4/ext/imap config.m4 /php4/ext/snmp config.m4 Log: WS change to make very old compilers/preprocessors (e.g. HP/UX 9) happy (thanks to Andreas Ley for recognizing this). Index: php4/acinclude.m4 diff -u php4/acinclude.m4:1.187 php4/acinclude.m4:1.188 --- php4/acinclude.m4:1.187 Tue May 28 12:30:16 2002 +++ php4/acinclude.m4 Sat Jun 1 16:14:57 2002 @@ -1,4 +1,4 @@ -dnl $Id: acinclude.m4,v 1.187 2002/05/28 16:30:16 andrei Exp $ +dnl $Id: acinclude.m4,v 1.188 2002/06/01 20:14:57 sr Exp $ dnl dnl This file contains local autoconf functions. @@ -210,10 +210,10 @@ CPPFLAGS=-I$OPENSSL_INCDIR AC_MSG_CHECKING([for OpenSSL version]) AC_EGREP_CPP(yes,[ - #include <openssl/opensslv.h> - #if OPENSSL_VERSION_NUMBER >= 0x0090500fL +#include <openssl/opensslv.h> +#if OPENSSL_VERSION_NUMBER >= 0x0090500fL yes - #endif +#endif ],[ AC_MSG_RESULT([>= 0.9.5]) ],[ Index: php4/ext/domxml/config.m4 diff -u php4/ext/domxml/config.m4:1.38 php4/ext/domxml/config.m4:1.39 --- php4/ext/domxml/config.m4:1.38 Wed May 15 08:41:55 2002 +++ php4/ext/domxml/config.m4 Sat Jun 1 16:14:57 2002 @@ -1,5 +1,5 @@ dnl -dnl $Id: config.m4,v 1.38 2002/05/15 12:41:55 chregu Exp $ +dnl $Id: config.m4,v 1.39 2002/06/01 20:14:57 sr Exp $ dnl AC_DEFUN(PHP_DOM_CHECK_VERSION,[ @@ -7,10 +7,10 @@ CPPFLAGS=-I$DOMXML_DIR/include$DOMXML_DIR_ADD AC_MSG_CHECKING(for libxml version) AC_EGREP_CPP(yes,[ - #include <libxml/xmlversion.h> - #if LIBXML_VERSION >= 20414 +#include <libxml/xmlversion.h> +#if LIBXML_VERSION >= 20414 yes - #endif +#endif ],[ AC_MSG_RESULT(>= 2.4.14) ],[ @@ -78,10 +78,10 @@ CPPFLAGS=-I$DOMXSLT_DIR/include AC_MSG_CHECKING(for libxslt version) AC_EGREP_CPP(yes,[ - #include <libxslt/xsltconfig.h> - #if LIBXSLT_VERSION >= 10003 +#include <libxslt/xsltconfig.h> +#if LIBXSLT_VERSION >= 10003 yes - #endif +#endif ],[ AC_MSG_RESULT(>= 1.0.3) ],[ @@ -95,10 +95,10 @@ CPPFLAGS=-I$DOMEXSLT_DIR/include AC_MSG_CHECKING(for libexslt version) AC_EGREP_CPP(yes,[ - #include <libexslt/exsltconfig.h> - #if LIBEXSLT_VERSION >= 600 +#include <libexslt/exsltconfig.h> +#if LIBEXSLT_VERSION >= 600 yes - #endif +#endif ],[ AC_MSG_RESULT(>= 1.0.3) ],[ Index: php4/ext/imap/config.m4 diff -u php4/ext/imap/config.m4:1.43 php4/ext/imap/config.m4:1.44 --- php4/ext/imap/config.m4:1.43 Mon Apr 1 19:04:53 2002 +++ php4/ext/imap/config.m4 Sat Jun 1 16:14:57 2002 @@ -1,5 +1,5 @@ dnl -dnl $Id: config.m4,v 1.43 2002/04/02 00:04:53 sniper Exp $ +dnl $Id: config.m4,v 1.44 2002/06/01 20:14:57 sr Exp $ dnl AC_DEFUN(IMAP_INC_CHK,[if test -r "$i$1/c-client.h"; then @@ -127,10 +127,10 @@ old_CPPFLAGS=$CPPFLAGS CPPFLAGS=-I$IMAP_INC_DIR AC_EGREP_CPP(this_is_true, [ - #include "imap4r1.h" - #if defined(IMAPSSLPORT) +#include "imap4r1.h" +#if defined(IMAPSSLPORT) this_is_true - #endif +#endif ],[ AC_DEFINE(HAVE_IMAP2001, 1, [ ]) ],[]) Index: php4/ext/snmp/config.m4 diff -u php4/ext/snmp/config.m4:1.25 php4/ext/snmp/config.m4:1.26 --- php4/ext/snmp/config.m4:1.25 Tue Mar 12 11:35:28 2002 +++ php4/ext/snmp/config.m4 Sat Jun 1 16:14:58 2002 @@ -1,5 +1,5 @@ dnl -dnl $Id: config.m4,v 1.25 2002/03/12 16:35:28 sas Exp $ +dnl $Id: config.m4,v 1.26 2002/06/01 20:14:58 sr Exp $ dnl PHP_ARG_WITH(snmp,for SNMP support, @@ -35,10 +35,10 @@ if test "$ac_cv_header_default_store_h" = "yes"; then AC_MSG_CHECKING(for OpenSSL support in SNMP libraries) AC_EGREP_CPP(yes,[ - #include <ucd-snmp-config.h> - #if USE_OPENSSL +#include <ucd-snmp-config.h> +#if USE_OPENSSL yes - #endif +#endif ],[ SNMP_SSL=yes ],[