cvs: php4 /ext/snmp Makefile.in config.m4

sniper Mon Aug 20 10:04:49 2001 EDT Modified files: /php4/ext/snmp Makefile.in config.m4 Log: Cleaning. And made the check for SSL support in SNMP to really work. Index: php4/ext/snmp/Makefile.in diff -u php4/ext/snmp/Makefile.in:1.12 php4/ext/snmp/Makefile.in:1.13 --- php4/ext/snmp/Makefile.in:1.12 Mon Aug 21 11:05:45 2000 +++ php4/ext/snmp/Makefile.in Mon Aug 20 10:04:48 2001 @@ -4,6 +4,4 @@ LTLIBRARY_SHARED_NAME = snmp.la LTLIBRARY_SHARED_LIBADD = $(SNMP_SHARED_LIBADD) -EXTRA_INCLUDES = $(SNMP_INCLUDE) - include $(top_srcdir)/build/dynlib.mk Index: php4/ext/snmp/config.m4 diff -u php4/ext/snmp/config.m4:1.20 php4/ext/snmp/config.m4:1.21 --- php4/ext/snmp/config.m4:1.20 Fri Jul 27 10:26:39 2001 +++ php4/ext/snmp/config.m4 Mon Aug 20 10:04:48 2001 @@ -1,5 +1,5 @@ dnl -dnl $Id: config.m4,v 1.20 2001/07/27 14:26:39 sniper Exp $ +dnl $Id: config.m4,v 1.21 2001/08/20 14:04:48 sniper Exp $ dnl PHP_ARG_WITH(snmp,for SNMP support, @@ -10,6 +10,7 @@ to build as a dl and still specify DIR.]) if test "$PHP_SNMP" != "no"; then + if test "$PHP_SNMP" = "yes"; then for i in /usr/include /usr/local/include; do test -f $i/snmp.h && SNMP_INCDIR=$i @@ -22,7 +23,7 @@ done else SNMP_INCDIR=$PHP_SNMP/include - test -d $PHP_SNMP/include/ucd-snmp && SNMP_INCDIR=$withval/include/ucd-snmp + test -d $PHP_SNMP/include/ucd-snmp && SNMP_INCDIR=$PHP_SNMP/include/ucd-snmp SNMP_LIBDIR=$PHP_SNMP/lib fi @@ -32,41 +33,46 @@ AC_MSG_ERROR(libsnmp not found. Check your SNMP installation.) fi - AC_DEFINE(HAVE_SNMP,1,[ ]) - PHP_ADD_INCLUDE($SNMP_INCDIR) - PHP_ADD_LIBRARY_WITH_PATH(snmp, $SNMP_LIBDIR, SNMP_SHARED_LIBADD) - old_CPPFLAGS=$CPPFLAGS - CPPFLAGS="$INCLUDES $CPPFLAGS" + CPPFLAGS=-I$SNMP_INCDIR AC_CHECK_HEADERS(default_store.h) if test "$ac_cv_header_default_store_h" = "yes"; then - dnl UCD SNMP 4.1.x - AC_TRY_RUN([ -#include <ucd-snmp-config.h> -main() { exit(USE_OPENSSL != 1); } + AC_MSG_CHECKING(for OpenSSL support in SNMP libraries) + AC_EGREP_CPP(yes,[ + #include <ucd-snmp-config.h> + #if USE_OPENSSL + yes + #endif ],[ SNMP_SSL=yes ],[ SNMP_SSL=no - ],[ - SNMP_SSL=no ]) + fi + CPPFLAGS=$old_CPPFLAGS + AC_MSG_RESULT($SNMP_SSL) + + if test "$SNMP_SSL" = "yes"; then + if test "$PHP_OPENSSL" != "no"; then + PHP_ADD_LIBRARY(ssl, 1, SNMP_SHARED_LIBADD) + PHP_ADD_LIBRARY(crypto,1, SNMP_SHARED_LIBADD) + else + AC_MSG_ERROR(The UCD-SNMP in this system is build with SSL support. - if test "$SNMP_SSL" = "yes"; then - PHP_SETUP_OPENSSL + Add --with-openssl<=DIR> to your configure line.) fi fi - CPPFLAGS=$old_CPPFLAGS - PHP_EXTENSION(snmp,$ext_shared) - PHP_SUBST(SNMP_SHARED_LIBADD) - AC_CHECK_LIB(kstat, kstat_read, [ PHP_ADD_LIBRARY(kstat,,SNMP_SHARED_LIBADD) ]) - SNMP_INCLUDE=-I$SNMP_INCDIR + + AC_DEFINE(HAVE_SNMP,1,[ ]) + PHP_ADD_INCLUDE($SNMP_INCDIR) + PHP_ADD_LIBRARY_WITH_PATH(snmp, $SNMP_LIBDIR, SNMP_SHARED_LIBADD) + + PHP_EXTENSION(snmp, $ext_shared) + PHP_SUBST(SNMP_SHARED_LIBADD) fi -PHP_SUBST(SNMP_LIBDIR) -PHP_SUBST(SNMP_INCLUDE) AC_MSG_CHECKING(whether to enable UCD SNMP hack) AC_ARG_ENABLE(ucd-snmp-hack,