--- embedaddon/php/ext/snmp/config.m4 2012/02/21 23:48:01 1.1.1.1 +++ embedaddon/php/ext/snmp/config.m4 2012/05/29 12:34:42 1.1.1.2 @@ -1,5 +1,5 @@ dnl -dnl $Id: config.m4,v 1.1.1.1 2012/02/21 23:48:01 misho Exp $ +dnl $Id: config.m4,v 1.1.1.2 2012/05/29 12:34:42 misho Exp $ dnl PHP_ARG_WITH(snmp,for SNMP support, @@ -8,14 +8,8 @@ PHP_ARG_WITH(snmp,for SNMP support, PHP_ARG_WITH(openssl-dir,OpenSSL dir for SNMP, [ --with-openssl-dir[=DIR] SNMP: openssl install prefix], no, no) -PHP_ARG_ENABLE(ucd-snmp-hack, whether to enable UCD SNMP hack, -[ --enable-ucd-snmp-hack SNMP: Enable UCD SNMP hack], no, no) - if test "$PHP_SNMP" != "no"; then - dnl - dnl Try net-snmp first - dnl if test "$PHP_SNMP" = "yes"; then AC_PATH_PROG(SNMP_CONFIG,net-snmp-config,,[/usr/local/bin:$PATH]) else @@ -26,92 +20,27 @@ if test "$PHP_SNMP" != "no"; then SNMP_LIBS=`$SNMP_CONFIG --netsnmp-libs` SNMP_LIBS="$SNMP_LIBS `$SNMP_CONFIG --external-libs`" SNMP_PREFIX=`$SNMP_CONFIG --prefix` - - if test -n "$SNMP_LIBS" && test -n "$SNMP_PREFIX"; then - PHP_ADD_INCLUDE(${SNMP_PREFIX}/include) - PHP_EVAL_LIBLINE($SNMP_LIBS, SNMP_SHARED_LIBADD) - AC_DEFINE(HAVE_NET_SNMP,1,[ ]) - SNMP_LIBNAME=netsnmp - else - AC_MSG_ERROR([Could not find the required paths. Please check your net-snmp installation.]) - fi - else - - dnl - dnl Try ucd-snmp if net-snmp test failed - dnl - - if test "$PHP_SNMP" = "yes"; then - for i in /usr/include /usr/local/include; do - test -f $i/snmp.h && SNMP_INCDIR=$i - test -f $i/ucd-snmp/snmp.h && SNMP_INCDIR=$i/ucd-snmp - test -f $i/snmp/snmp.h && SNMP_INCDIR=$i/snmp - test -f $i/snmp/include/ucd-snmp/snmp.h && SNMP_INCDIR=$i/snmp/include/ucd-snmp - done - for i in /usr/$PHP_LIBDIR /usr/snmp/lib /usr/local/$PHP_LIBDIR /usr/local/lib /usr/local/snmp/lib; do - test -f $i/libsnmp.a || test -f $i/libsnmp.$SHLIB_SUFFIX_NAME && SNMP_LIBDIR=$i - done - else - SNMP_INCDIR=$PHP_SNMP/include - test -d $PHP_SNMP/include/ucd-snmp && SNMP_INCDIR=$PHP_SNMP/include/ucd-snmp - SNMP_LIBDIR=$PHP_SNMP/lib - fi - - if test -z "$SNMP_INCDIR"; then - AC_MSG_ERROR(snmp.h not found. Check your SNMP installation.) - elif test -z "$SNMP_LIBDIR"; then - AC_MSG_ERROR(libsnmp not found. Check your SNMP installation.) - fi - - old_CPPFLAGS=$CPPFLAGS - CPPFLAGS=-I$SNMP_INCDIR - AC_CHECK_HEADERS(default_store.h) - if test "$ac_cv_header_default_store_h" = "yes"; then - AC_MSG_CHECKING(for OpenSSL support in SNMP libraries) - AC_EGREP_CPP(yes,[ -#include -#if USE_OPENSSL - yes -#endif - ],[ - SNMP_SSL=yes - ],[ - SNMP_SSL=no - ]) - fi - CPPFLAGS=$old_CPPFLAGS - AC_MSG_RESULT($SNMP_SSL) - - if test "$SNMP_SSL" = "yes"; then - if test "$PHP_OPENSSL_DIR" != "no"; then - PHP_OPENSSL=$PHP_OPENSSL_DIR - fi - - if test "$PHP_OPENSSL" = "no"; then - AC_MSG_ERROR([The UCD-SNMP in this system is built with SSL support. - - Add --with-openssl-dir=DIR to your configure line.]) + snmp_full_version=`$SNMP_CONFIG --version` + ac_IFS=$IFS + IFS="." + set $snmp_full_version + IFS=$ac_IFS + SNMP_VERSION=`expr [$]1 \* 1000 + [$]2` + if test "$SNMP_VERSION" -ge "5003"; then + if test -n "$SNMP_LIBS" && test -n "$SNMP_PREFIX"; then + PHP_ADD_INCLUDE(${SNMP_PREFIX}/include) + PHP_EVAL_LIBLINE($SNMP_LIBS, SNMP_SHARED_LIBADD) + SNMP_LIBNAME=netsnmp else - PHP_SETUP_OPENSSL(SNMP_SHARED_LIBADD, [], [ - AC_MSG_ERROR([SNMP: OpenSSL check failed. Please check config.log for more information.]) - ]) + AC_MSG_ERROR([Could not find the required paths. Please check your net-snmp installation.]) fi + else + AC_MSG_ERROR([Net-SNMP version 5.3 or greater reqired (detected $snmp_full_version).]) fi - - AC_CHECK_LIB(kstat, kstat_read, [ PHP_ADD_LIBRARY(kstat,,SNMP_SHARED_LIBADD) ]) - PHP_ADD_INCLUDE($SNMP_INCDIR) - PHP_ADD_LIBRARY_WITH_PATH(snmp, $SNMP_LIBDIR, SNMP_SHARED_LIBADD) - SNMP_LIBNAME=snmp + else + AC_MSG_ERROR([Could not find net-snmp-config binary. Please check your net-snmp installation.]) fi - dnl Check whether snmp_parse_oid() exists. - PHP_CHECK_LIBRARY($SNMP_LIBNAME, snmp_parse_oid, - [ - AC_DEFINE(HAVE_SNMP_PARSE_OID, 1, [ ]) - ], [], [ - $SNMP_SHARED_LIBADD - ]) - dnl Test build. PHP_CHECK_LIBRARY($SNMP_LIBNAME, init_snmp, [ @@ -122,10 +51,75 @@ if test "$PHP_SNMP" != "no"; then $SNMP_SHARED_LIBADD ]) - if test "$PHP_UCD_SNMP_HACK" = "yes" ; then - AC_DEFINE(UCD_SNMP_HACK, 1, [ ]) + dnl Check whether shutdown_snmp_logging() exists. + PHP_CHECK_LIBRARY($SNMP_LIBNAME, shutdown_snmp_logging, + [ + AC_DEFINE(HAVE_SHUTDOWN_SNMP_LOGGING, 1, [ ]) + ], [], [ + $SNMP_SHARED_LIBADD + ]) + + dnl Check for buggy snmp_snprint_value() (net-snmp BUGid 2027834) + AC_CACHE_CHECK([for buggy snmp_snprint_value], ac_cv_buggy_snprint_value,[ + save_CFLAGS="$CFLAGS" + CFLAGS="$CFLAGS -I${SNMP_PREFIX}/include $SNMP_SHARED_LIBADD" + AC_TRY_RUN( [ +#include +#include +#include +#include +#include + +u_char uname[] = "Linux nex1.php.net 2.6.18-194.32.1.el5 #1 SMP Wed Jan 5 17:53:09 EST 2011 i686"; + +int main(int argc, char **argv) +{ + struct variable_list vars; + char buf1[2048]; + char buf2[sizeof(buf1)]; + + memset(&(buf1[0]), 0, sizeof(buf1)); + memset(&(buf2[0]), 0, sizeof(buf2)); + memset(&vars, 0, sizeof(vars)); + vars.type = 4; + vars.val.integer = (long *)&(uname[0]); + vars.val.string = &(uname[0]); + vars.val.bitstring = &(uname[0]); + vars.val.counter64 = (struct counter64 *)&(uname[0]); + vars.val.floatVal = (float *)&(uname[0]); + vars.val_len = sizeof(uname), + vars.name_loc[0] = 1; + vars.name_loc[1] = 3; + vars.name_loc[2] = 6; + vars.name_loc[3] = 1; + vars.name_loc[4] = 2; + vars.name_loc[5] = 1; + vars.name_loc[6] = 1; + vars.name_loc[7] = 1; + vars.name = (oid *)&(vars.name_loc); + vars.name_length = 9; + + init_snmp("snmpapp"); + + netsnmp_ds_set_boolean(NETSNMP_DS_LIBRARY_ID, NETSNMP_DS_LIB_QUICK_PRINT, 0); + + snprint_value(buf1, (sizeof(uname) + 32), vars.name, vars.name_length, &vars); + snprint_value(buf2, sizeof(buf2), vars.name, vars.name_length, &vars); + exit((strncmp(buf1, buf2, sizeof(buf1)) != 0)); +} + ],[ + ac_cv_buggy_snprint_value=no + ],[ + ac_cv_buggy_snprint_value=yes + ],[ + ac_cv_buggy_snprint_value=no + ]) + CFLAGS="$save_CFLAGS" + ]) + if test "$ac_cv_buggy_snprint_value" = "yes"; then + AC_DEFINE(BUGGY_SNMPRINT_VALUE, 1, [ ]) fi - + PHP_NEW_EXTENSION(snmp, snmp.c, $ext_shared) PHP_SUBST(SNMP_SHARED_LIBADD) fi