pajoye Tue, 09 Feb 2010 16:38:24 +0000
Revision: http://svn.php.net/viewvc?view=revision&revision=294814
Log:
- improve netsnmp detection (and restor snmp on win)
Changed paths:
U php/php-src/branches/PHP_5_3/ext/snmp/config.w32
U php/php-src/trunk/ext/snmp/config.w32
Modified: php/php-src/branches/PHP_5_3/ext/snmp/config.w32
===================================================================
--- php/php-src/branches/PHP_5_3/ext/snmp/config.w32 2010-02-09 16:30:02 UTC
(rev 294813)
+++ php/php-src/branches/PHP_5_3/ext/snmp/config.w32 2010-02-09 16:38:24 UTC
(rev 294814)
@@ -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");
}
Modified: php/php-src/trunk/ext/snmp/config.w32
===================================================================
--- php/php-src/trunk/ext/snmp/config.w32 2010-02-09 16:30:02 UTC (rev
294813)
+++ php/php-src/trunk/ext/snmp/config.w32 2010-02-09 16:38:24 UTC (rev
294814)
@@ -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");
}
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
