pajoye Tue, 09 Feb 2010 16:42:40 +
Revision: http://svn.php.net/viewvc?view=revision&revision=294815
Log:
- improve netsnmp detectio and restore snmp on win
Changed paths:
_U php/php-src/branches/PHP_5_3_2/
U php/php-src/branches/PHP_5_3_2/ext/snmp/config.w32
_U php/php-src/branches/PHP_5_3_2/ext/tidy/tests/
_U
php/php-src/branches/PHP_5_3_2/tests/security/open_basedir_parse_ini_file.phpt
Property changes on: php/php-src/branches/PHP_5_3_2
___
Modified: svn:mergeinfo
-
/php/php-src/branches/PHP_5_3:292504,292574,292594-292595,292611,292624,292630,292632-292635,292654,292677,292682-292683,292693,292716,292719,292762,292765,292771,292777,292823,293051,293075,293114,293126,293131,293144,293146,293152,293175-293176,293180,293216,293235,293253,293268,293341,293380,293400,293442,293447,293466,293487,293502,293538,293548,293558,293588,293590,293597,293627,293644,293653,293655,293699,293726-293728,293732,293735,293762,293768,293804,293815-293816,293862,293894,293896-293897,293901-293906,293917-293918,293965-293966,293974,293976-293977,293985,293998,294040,294053,294075,294077-294078,294081,294089,294094,294100,294102,294104,294126-294127,294129,294164,294251-294253,294255,294259-294261,294265,294267,294269,294272,294278,294285,294302-294304,294307-294308,294310,294312-294313,294315,294317,294320-294323,294333-294336,294353,294418,294421,294487,294498,294532,294571,294695,294697,294724
/php/php-src/trunk:284726
+
/php/php-src/branches/PHP_5_3:292504,292574,292594-292595,292611,292624,292630,292632-292635,292654,292677,292682-292683,292693,292716,292719,292762,292765,292771,292777,292823,293051,293075,293114,293126,293131,293144,293146,293152,293175-293176,293180,293216,293235,293253,293268,293341,293380,293400,293442,293447,293466,293487,293502,293538,293548,293558,293588,293590,293597,293627,293644,293653,293655,293699,293726-293728,293732,293735,293762,293768,293804,293815-293816,293862,293894,293896-293897,293901-293906,293917-293918,293965-293966,293974,293976-293977,293985,293998,294040,294053,294075,294077-294078,294081,294089,294094,294100,294102,294104,294126-294127,294129,294164,294251-294253,294255,294259-294261,294265,294267,294269,294272,294278,294285,294302-294304,294307-294308,294310,294312-294313,294315,294317,294320-294323,294333-294336,294353,294418,294421,294487,294498,294532,294571,294695,294697,294724,294814
/php/php-src/trunk:284726
Modified: php/php-src/branches/PHP_5_3_2/ext/snmp/config.w32
===
--- php/php-src/branches/PHP_5_3_2/ext/snmp/config.w32 2010-02-09 16:38:24 UTC
(rev 294814)
+++ php/php-src/branches/PHP_5_3_2/ext/snmp/config.w32 2010-02-09 16:42:40 UTC
(rev 294815)
@@ -4,13 +4,18 @@
ARG_WITH("snmp", "SNMP support", "no");
if (PHP_SNMP != "no") {
-
- if (CHECK_HEADER_ADD_INCLUDE("snmp.h", "CFLAGS_SNMP", PHP_PHP_BUILD +
"\\include\\ucd-snmp;" + PHP_PHP_BUILD + "\\include\\net-snmp;" + PHP_SNMP) &&
- CHECK_LIB("libsnmp.lib", "snmp", PHP_SNMP)) {
- EXTENSION('snmp', 'snmp.c');
-
- AC_DEFINE('HAVE_SNMP', 1);
-
+ if (CHECK_HEADER_ADD_INCLUDE("snmp.h", "CFLAGS_SNMP", PHP_PHP_BUILD +
"\\include\\net-snmp;" + PHP_SNMP)) {
+ if (CHECK_LIB("netsnmp.lib", "snmp", PHP_SNMP)) {
+ EXTENSION('snmp', 'snmp.c');
+ CHECK_LIB("libeay32.lib", "snmp", PHP_SNMP)
+ AC_DEFINE('HAVE_SNMP', 1);
+ AC_DEFINE("HAVE_NET_SNMP", 1);
+ } else if (CHECK_LIB("libsnmp.lib", "snmp", PHP_SNMP)) {
+ EXTENSION('snmp', 'snmp.c');
+ AC_DEFINE('HAVE_SNMP', 1);
+ } else {
+ WARNING("snmp not enabled; libraries and headers not
found");
+ }
} else {
WARNING("snmp not enabled; libraries and headers not found");
}
Property changes on: php/php-src/branches/PHP_5_3_2/ext/tidy/tests
___
Modified: svn:mergeinfo
-
/php/php-src/branches/PHP_5_3/ext/tidy/tests:292562,292566,292571,292574,292635,292716,292719,292765,293146,293152,293175-293176,293180,293216,293235,293253,293380,293400,293442,293447,293466,293487,293502,293538,293548,293558,293588,293590,293597,293627,293644,293653,293655,293699,293726-293728,293732,293735,293762,293768,293804,293815-293816,293862,293894,293896-293897,293901-293906,293917-293918,293965-293966,293976-293977,293985,293998,294040,294053,294075,294077-294078,294081,294089,294094,294100,294102,294104,294126-294127,294129,294164,294251-294253,294255,294259-294261,294265,294267,294269,294272,294278,294285,294302-294304,294307-294308,294310,294312-294313,294315,294317,294320-294323,294333-294336,294353,294418,294421,294487,294498,294532,29