summaryrefslogtreecommitdiff
path: root/ext/snmp
diff options
context:
space:
mode:
authorSascha Schumann <sas@php.net>1999-12-30 02:59:53 +0000
committerSascha Schumann <sas@php.net>1999-12-30 02:59:53 +0000
commitf2f8d38efa3ccbaa05affaf8fcab24786ef452de (patch)
treec546807d61a77a191f89056212a4c40c63f0e83b /ext/snmp
parent6bf3529919cf60389797a107cab16c826df3e68f (diff)
downloadphp-git-f2f8d38efa3ccbaa05affaf8fcab24786ef452de.tar.gz
Integration of -ng changes. Changes:
- added support for externally built modules, - improved support for in-tree shared modules, - fixed diversion bugs, - configure displays some informative messages, - faster static build (libtool isn't used anymore for compiling non-PIC objects), - dependencies comparable to automake's without requiring GNU make or GCC, - working make clean for non-GNU makes.
Diffstat (limited to 'ext/snmp')
-rw-r--r--ext/snmp/Makefile.am12
-rw-r--r--ext/snmp/Makefile.in13
-rw-r--r--ext/snmp/config.m48
3 files changed, 16 insertions, 17 deletions
diff --git a/ext/snmp/Makefile.am b/ext/snmp/Makefile.am
deleted file mode 100644
index 5f7da80286..0000000000
--- a/ext/snmp/Makefile.am
+++ /dev/null
@@ -1,12 +0,0 @@
-# $Id$
-
-SRC=snmp.c
-INCLUDES=@INCLUDES@ @SNMP_INCLUDE@ -I@top_srcdir@ -I@top_srcdir@/Zend
-noinst_LTLIBRARIES=@SNMP_STATIC@
-EXTRA_LTLIBRARIES=libphpext_snmp.la snmp.la
-libphpext_snmp_la_SOURCES=$(SRC)
-phplib_LTLIBRARIES=@SNMP_SHARED@
-snmp_la_SOURCES=$(SRC)
-snmp_la_LIBADD=@SNMP_LIBDIR@ -lsnmp @KSTAT_LIBS@
-snmp_la_LDFLAGS=-avoid-version -module -rpath $(phplibdir)
-EXTRA_LIBS=
diff --git a/ext/snmp/Makefile.in b/ext/snmp/Makefile.in
new file mode 100644
index 0000000000..ae21bdf7fe
--- /dev/null
+++ b/ext/snmp/Makefile.in
@@ -0,0 +1,13 @@
+
+DEPTH = ../..
+topsrcdir = @topsrcdir@
+srcdir = @srcdir@
+VPATH = @srcdir@
+
+LTLIBRARY_NAME = libsnmp.la
+LTLIBRARY_SOURCES = snmp.c
+LTLIBRARY_SHARED_LIBADD = $(SNMP_LIBDIR) -lsnmp $(KSTAT_LIBS)
+
+include $(topsrcdir)/build/ltlib.mk
+
+INCLUDES += $(SNMP_INCLUDE)
diff --git a/ext/snmp/config.m4 b/ext/snmp/config.m4
index bcfdee7cb7..ef4f3a5a2a 100644
--- a/ext/snmp/config.m4
+++ b/ext/snmp/config.m4
@@ -65,11 +65,9 @@ AC_ARG_WITH(snmp,
],[
AC_MSG_RESULT(no)
])
-AC_SUBST(SNMP_LIBDIR)
-AC_SUBST(SNMP_INCLUDE)
-AC_SUBST(SNMP_SHARED)
-AC_SUBST(SNMP_STATIC)
-AC_SUBST(KSTAT_LIBS)
+PHP_SUBST(SNMP_LIBDIR)
+PHP_SUBST(SNMP_INCLUDE)
+PHP_SUBST(KSTAT_LIBS)
AC_MSG_CHECKING(whether to enable UCD SNMP hack)
AC_ARG_ENABLE(ucd-snmp-hack,