---- net-snmp-5.4.org/agent/Makefile.in 2005-12-04 19:24:25.000000000 +0100
-+++ net-snmp-5.4/agent/Makefile.in 2006-01-09 00:58:58.598965000 +0100
-@@ -137,11 +137,11 @@
+--- net-snmp-5.6/agent/Makefile.in.orig 2010-06-08 23:05:11.000000000 +0200
++++ net-snmp-5.6/agent/Makefile.in 2010-10-24 10:33:36.007741043 +0200
+@@ -108,7 +108,7 @@
+ #
+ # how to build it info
+ #
+-USELIBS = ../snmplib/libnetsnmp.$(LIB_EXTENSION)$(LIB_VERSION)
++USELIBS = $(top_builddir)/snmplib/libnetsnmp.la
+ AGENTLIB = libnetsnmpagent.$(LIB_EXTENSION)$(LIB_VERSION)
+ MIBLIB = libnetsnmpmibs.$(LIB_EXTENSION)$(LIB_VERSION)
+
+@@ -249,11 +249,11 @@
- libnetsnmpagent.$(LIB_EXTENSION)$(LIB_VERSION): ${LLIBAGENTOBJS}
-- $(LIB_LD_CMD) libnetsnmpagent.$(LIB_EXTENSION)$(LIB_VERSION) ${LLIBAGENTOBJS} $(LIB_LD_LIBS)
-+ $(LIB_LD_CMD) libnetsnmpagent.$(LIB_EXTENSION)$(LIB_VERSION) ${LLIBAGENTOBJS} @WRAPLIBS@ $(LIB_LD_LIBS)
- $(RANLIB) libnetsnmpagent.$(LIB_EXTENSION)$(LIB_VERSION)
+ libnetsnmpagent.$(LIB_EXTENSION)$(LIB_VERSION): ${LLIBAGENTOBJS} $(USELIBS)
+- $(LIB_LD_CMD) $(AGENTLIB) ${LLIBAGENTOBJS} $(USELIBS) ${LAGENTLIBS} @LD_NO_UNDEFINED@ $(LDFLAGS) $(PERLLDOPTS_FOR_LIBS) $(LIB_LD_LIBS) @AGENTLIBS@
++ $(LIB_LD_CMD) $(AGENTLIB) ${LLIBAGENTOBJS} $(USELIBS) $(LDFLAGS) ${LAGENTLIBS} @LD_NO_UNDEFINED@ $(PERLLDOPTS_FOR_LIBS) $(LIB_LD_LIBS) @AGENTLIBS@
+ $(RANLIB) $(AGENTLIB)
- libnetsnmpmibs.$(LIB_EXTENSION)$(LIB_VERSION): ${LMIBOBJS}
-- $(LIB_LD_CMD) libnetsnmpmibs.$(LIB_EXTENSION)$(LIB_VERSION) ${LMIBOBJS} $(LIB_LD_LIBS) @SENSORLIBS@
-+ $(LIB_LD_CMD) libnetsnmpmibs.$(LIB_EXTENSION)$(LIB_VERSION) ${LMIBOBJS} $(LIB_LD_LIBS) @SENSORLIBS@ -ldl
- $(RANLIB) libnetsnmpmibs.$(LIB_EXTENSION)$(LIB_VERSION)
+ libnetsnmpmibs.$(LIB_EXTENSION)$(LIB_VERSION): ${LMIBOBJS} $(AGENTLIB) $(USELIBS)
+- $(LIB_LD_CMD) $(MIBLIB) ${LMIBOBJS} $(AGENTLIB) $(USELIBS) @LD_NO_UNDEFINED@ $(LDFLAGS) ${LMIBLIBS} $(LIB_LD_LIBS) @AGENTLIBS@
++ $(LIB_LD_CMD) $(MIBLIB) ${LMIBOBJS} $(LDFLAGS) $(AGENTLIB) $(USELIBS) @LD_NO_UNDEFINED@ ${LMIBLIBS} $(LIB_LD_LIBS) @AGENTLIBS@
+ $(RANLIB) $(MIBLIB)
- agentlib: libnetsnmpagent.$(LIB_EXTENSION)$(LIB_VERSION)
-diff -ur net-snmp-5.3.org/Makefile.rules net-snmp-5.3/Makefile.rules
---- net-snmp-5.3.org/Makefile.rules 2005-10-10 20:47:48.000000000 +0200
-+++ net-snmp-5.3/Makefile.rules 2006-01-09 00:58:13.044118000 +0100
+ agentlib: $(AGENTLIB)
+--- net-snmp-5.4.1/Makefile.rules.orig 2007-07-07 01:39:10.000000000 +0200
++++ net-snmp-5.4.1/Makefile.rules 2007-09-08 16:43:38.055836050 +0200
@@ -8,7 +8,7 @@
# the standard items to build: libraries, bins, and sbins
STANDARDTARGETS =$(INSTALLLIBS) $(INSTALLBINPROGS) $(INSTALLSBINPROGS)
--STANDARDCLEANTARGETS=$(INSTALLLIBS) $(INSTALLBINPROGS) $(INSTALLSBINPROGS) $(INSTALLUCDLIBS)
-+STANDARDCLEANTARGETS=$(INSTALLLIBS) $(INSTALLBINPROGS) $(INSTALLSBINPROGS)
+-STANDARDCLEANTARGETS=$(INSTALLLIBS) $(INSTALLPOSTLIBS) $(INSTALLBINPROGS) $(INSTALLSBINPROGS) $(INSTALLUCDLIBS)
++STANDARDCLEANTARGETS=$(INSTALLLIBS) $(INSTALLPOSTLIBS) $(INSTALLBINPROGS) $(INSTALLSBINPROGS)
standardall: subdirs $(STANDARDTARGETS)
-@@ -175,17 +175,11 @@
+@@ -187,17 +187,11 @@
$(LIB_LDCONFIG_CMD) ; \
fi
installsubdirlibs:
@if test "$(SUBDIRS)" != ""; then \
-diff -ur net-snmp-5.3.org/snmplib/Makefile.in net-snmp-5.3/snmplib/Makefile.in
---- net-snmp-5.3.org/snmplib/Makefile.in 2005-10-30 20:01:14.000000000 +0100
-+++ net-snmp-5.3/snmplib/Makefile.in 2006-01-09 00:58:13.044118000 +0100
-@@ -127,7 +127,6 @@
+--- net-snmp-5.6/snmplib/Makefile.in.orig 2010-05-27 06:06:32.000000000 +0200
++++ net-snmp-5.6/snmplib/Makefile.in 2010-10-24 10:35:59.615743558 +0200
+@@ -134,7 +134,6 @@
# libraries
INSTALLLIBS=libnetsnmp.$(LIB_EXTENSION)$(LIB_VERSION)
#
# Things to build
-@@ -187,13 +186,9 @@
+@@ -200,11 +199,7 @@
# how to build the libraries.
- libnetsnmp.$(LIB_EXTENSION)$(LIB_VERSION): ${TOBJS}
-- $(LIB_LD_CMD) libnetsnmp.$(LIB_EXTENSION)$(LIB_VERSION) ${TOBJS} ${LDFLAGS} @LIBCRYPTO@
-+ $(LIB_LD_CMD) libnetsnmp.$(LIB_EXTENSION)$(LIB_VERSION) ${TOBJS} ${LDFLAGS} @KRB5_LIBS@ @LIBCRYPTO@
- $(RANLIB) libnetsnmp.$(LIB_EXTENSION)$(LIB_VERSION)
-
--libsnmp.$(LIB_EXTENSION)$(LIB_VERSION): ${TOBJS}
-- $(LIB_LD_CMD) libsnmp.$(LIB_EXTENSION)$(LIB_VERSION) ${TOBJS} ${LDFLAGS} @LIBCRYPTO@
-- $(RANLIB) libsnmp.$(LIB_EXTENSION)$(LIB_VERSION)
+ libnetsnmp.$(LIB_EXTENSION)$(LIB_VERSION): $(TOBJS)
+- $(LIB_LD_CMD) $@ $(TOBJS) @LD_NO_UNDEFINED@ $(LDFLAGS) @LNETSNMPLIBS@
+- $(RANLIB) $@
-
- #
- # internal test objects
- #
---- net-snmp-5.4/configure.in.orig 2006-12-03 19:46:10.257988000 +0100
-+++ net-snmp-5.4/configure.in 2006-12-03 20:31:42.153670517 +0100
-@@ -1699,6 +1699,8 @@
- rebuilt_new_with_security=
- already_checked_krb5=no
-
-+KRB5_LIBS=
-+AC_SUBST(KRB5_LIBS)
- for sec in $new_with_security
- do
- if test "x$sec" = "xksm" -a "xyes" = "x$already_checked_krb5"; then
-@@ -1718,7 +1720,7 @@
+-libsnmp.$(LIB_EXTENSION)$(LIB_VERSION): $(TOBJS)
+- $(LIB_LD_CMD) $@ $(TOBJS) @LD_NO_UNDEFINED@ $(LDFLAGS) @LNETSNMPLIBS@
++ $(LIB_LD_CMD) $@ $(TOBJS) @LD_NO_UNDEFINED@ $(LDFLAGS) @LNETSNMPLIBS@ @LIBS@
+ $(RANLIB) $@
- if test no != $krb5_config; then
- CPPFLAGS="$CPPFLAGS `$krb5_config --cflags`"
-- LIBS="$LIBS `$krb5_config --libs`"
-+ KRB5_LIBS="`$krb5_config --libs`"
- elif test $krb5path != no; then
- AC_ADD_SEARCH_PATH($krb5path)
- else
-@@ -1755,10 +1757,10 @@
- if test $ac_cv_heimdal = yes; then
- AC_DEFINE(NETSNMP_USE_KERBEROS_HEIMDAL)
- if test no = $krb5_config; then
-- LIBS="$LIBS -lkrb5 -lasn1 -lcom_err -lroken"
-+ KRB5_LIBS="-lkrb5 -lasn1 -lcom_err -lroken"
- fi
- elif test no = $krb5_config; then
-- LIBS="$LIBS -lkrb5 -lcom_err"
-+ KRB5_LIBS="-lkrb5 -lcom_err"
- fi
-
- AC_MSG_CHECKING([to see which crypto API we need to use])
-@@ -1773,7 +1775,7 @@
- AC_MSG_RESULT(new MIT crypto API)
- AC_DEFINE(NETSNMP_USE_KERBEROS_MIT)
- if test no = $krb5_config; then
-- LIBS="$LIBS -lk5crypto"
-+ KRB5_LIBS="-lk5crypto"
- fi
- else
- AC_MSG_RESULT(old MIT crypto API)])
+ #
projects / packages / net-snmp.git / blobdiff