From d010d0732c77b416dbcf8e35cc35bac38687c267 Mon Sep 17 00:00:00 2001 From: Pierre Joye Date: Tue, 9 Feb 2010 16:38:24 +0000 Subject: [PATCH] - improve netsnmp detection (and restor snmp on win) --- ext/snmp/config.w32 | 19 ++++++++++++------- 1 file changed, 12 insertions(+), 7 deletions(-) diff --git a/ext/snmp/config.w32 b/ext/snmp/config.w32 index 4bf6750d41..59b6a8266b 100644 --- a/ext/snmp/config.w32 +++ b/ext/snmp/config.w32 @@ -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"); } -- 2.40.0