cvs: /php3 snmp.m4 /php3 aclocal.m4 configure.in
| From: | Sascha Schumann | Date: | Wed, 29 Mar 2000 17:45:33 +0000 |
| Subject: | cvs: /php3 snmp.m4 /php3 aclocal.m4 configure.in | ||
| Groups: | php.dev | ||
| Request: | Send a blank email to php-dev+get-17348@lists.php.net to get a copy of this message | ||
sas Wed Mar 29 09:45:33 2000 EDT
Added files:
/php3 snmp.m4
Modified files:
/php3 aclocal.m4 configure.in
Log:
Add support for UCD-SNMP 4.1.x
snmp.m4 is PHP 4.0's snmp/config.m4
PR: #3868
Index: php3/aclocal.m4
diff -u php3/aclocal.m4:1.50 php3/aclocal.m4:1.51
--- php3/aclocal.m4:1.50 Fri Mar 10 08:10:54 2000
+++ php3/aclocal.m4 Wed Mar 29 09:45:33 2000
@@ -1,9 +1,10 @@
-dnl $Id: aclocal.m4,v 1.50 2000/03/10 16:10:54 ssb Exp $
+dnl $Id: aclocal.m4,v 1.51 2000/03/29 17:45:33 sas Exp $
dnl
dnl This file contains local autoconf functions.
dnl dummy function for PHP4 compatibility
AC_DEFUN(PHP_EXTENSION,[])
+AC_DEFUN(PHP_SUBST,[AC_SUBST($1)])
dnl
dnl AC_PHP_ONCE(namespace, variable, code)
Index: php3/configure.in
diff -u php3/configure.in:1.497 php3/configure.in:1.498
--- php3/configure.in:1.497 Sun Mar 12 19:25:56 2000
+++ php3/configure.in Wed Mar 29 09:45:33 2000
@@ -1,4 +1,4 @@
-dnl $Id: configure.in,v 1.497 2000/03/13 03:25:56 rasmus Exp $
+dnl $Id: configure.in,v 1.498 2000/03/29 17:45:33 sas Exp $
dnl Process this file with autoconf to produce a configure script.
AC_INIT(main.c)
@@ -1791,38 +1791,7 @@
AC_SUBST(MCK_LFLAGS)
AC_SUBST(MCK_INCLUDE)
-AC_MSG_CHECKING(for SNMP support)
-AC_ARG_WITH(snmp,
-[ --with-snmp[=DIR] Include SNMP support. DIR is the SNMP base
- install directory, defaults to searching through
- a number of common locations for the snmp install.],
-[
- if test "$withval" != "no"; then
- if test "$withval" = "yes"; then
- SNMP_INCDIR=/usr/local/include
- SNMP_LIBDIR=/usr/local/lib
- test -d /usr/local/include/ucd-snmp && SNMP_INCDIR=/usr/local/include/ucd-snmp
- test -d /usr/include/ucd-snmp && SNMP_INCDIR=/usr/include/ucd-snmp
- test -f /usr/lib/libsnmp.a && SNMP_LIBDIR=/usr/lib
- else
- SNMP_INCDIR=$withval/include
- test -d $withval/include/snmp && SNMP_INCDIR=$withval/include/snmp
- test -d $withval/include/ucd-snmp && SNMP_INCDIR=$withval/include/ucd-snmp
- SNMP_LIBDIR=$withval/lib
- fi
- AC_ADD_LIBRARY_WITH_PATH(snmp, $SNMP_LIBDIR)
- AC_ADD_INCLUDE($SNMP_INCDIR)
- AC_CHECK_LIB(kstat, kstat_read, [AC_ADD_LIBRARY(kstat)])
-
- AC_DEFINE(HAVE_SNMP)
-
- AC_MSG_RESULT(yes)
- else
- AC_MSG_RESULT(no)
- fi
-],[
- AC_MSG_RESULT(no)
-])
+sinclude(snmp.m4)
AC_MSG_CHECKING(for Velocis support)
AC_ARG_WITH(velocis,