From: Pierre Joye <pajoye@php.net>
Date: Tue, 9 Feb 2010 16:38:24 +0000 (+0000)
Subject: - improve netsnmp detection (and restor snmp on win)
X-Git-Tag: php-5.4.0alpha1~191^2~1972
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=4a28c40ed0d35ecc8229bffc3d8bf4a2862fad63;p=php

- improve netsnmp detection (and restor snmp on win)
---

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");
 	}