- don't link libsnmp as duplicate of libnetsnmp, just symlink *.{so,la,a} devel files

- link libnetsnmpagent with WRAPLIBS

Changed files:
    net-snmp-link.patch -> 1.2

diff --git a/net-snmp-link.patch b/net-snmp-link.patch
index eddfd1394fd747694e586498bca518df349cb530..336b4baee659ffa894a839176cb21816c0688f57 100644 (file)
--- a/net-snmp-link.patch
+++ b/net-snmp-link.patch
@@ -1,6 +1,14 @@
---- net-snmp-5.0.8/snmplib/Makefile.in.orig    2002-10-29 20:30:10.000000000 +0100
-+++ net-snmp-5.0.8/snmplib/Makefile.in 2003-05-17 17:54:14.000000000 +0200
-@@ -136,11 +136,11 @@
+--- net-snmp-5.1.1/snmplib/Makefile.in.orig    2004-03-04 14:41:19.000000000 +0100
++++ net-snmp-5.1.1/snmplib/Makefile.in 2004-03-27 16:13:21.978939688 +0100
+@@ -115,7 +115,6 @@
+ 
+ # libraries
+ INSTALLLIBS=libnetsnmp.$(LIB_EXTENSION)$(LIB_VERSION)
+-INSTALLUCDLIBS=libsnmp.$(LIB_EXTENSION)$(LIB_VERSION)
+ 
+ #
+ # Things to build
+@@ -178,13 +177,9 @@
  
  # how to build the libraries.
  libnetsnmp.$(LIB_EXTENSION)$(LIB_VERSION):    ${TOBJS}
@@ -8,9 +16,55 @@
 +      $(LIB_LD_CMD) libnetsnmp.$(LIB_EXTENSION)$(LIB_VERSION) ${TOBJS} -lcrypto
        $(RANLIB) libnetsnmp.$(LIB_EXTENSION)$(LIB_VERSION)
  
- libsnmp.$(LIB_EXTENSION)$(LIB_VERSION):    ${TOBJS}
+-libsnmp.$(LIB_EXTENSION)$(LIB_VERSION):    ${TOBJS}
 -      $(LIB_LD_CMD) libsnmp.$(LIB_EXTENSION)$(LIB_VERSION) ${TOBJS}
-+      $(LIB_LD_CMD) libsnmp.$(LIB_EXTENSION)$(LIB_VERSION) ${TOBJS} -lcrypto
-       $(RANLIB) libsnmp.$(LIB_EXTENSION)$(LIB_VERSION)
- 
+-      $(RANLIB) libsnmp.$(LIB_EXTENSION)$(LIB_VERSION)
+-
  #
+ # internal test objects
+ #
+--- net-snmp-5.1.1/Makefile.rules.orig 2004-02-13 23:42:28.000000000 +0100
++++ net-snmp-5.1.1/Makefile.rules      2004-03-27 16:15:57.294328160 +0100
+@@ -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)
+ 
+ standardall: subdirs $(STANDARDTARGETS)
+ 
+@@ -161,17 +161,11 @@
+               $(LIB_LDCONFIG_CMD) ; \
+       fi
+ 
+-installucdlibs: $(INSTALLUCDLIBS)
+-      @if test "$(INSTALLUCDLIBS)" != ""; then \
+-              it="$(INSTALLUCDLIBS)" ; \
+-              $(SHELL) $(top_srcdir)/mkinstalldirs $(INSTALL_PREFIX)$(libdir) ; \
+-                $(INSTALL) $(INSTALLUCDLIBS) $(INSTALL_PREFIX)$(libdir) ;    \
+-              for i in $$it ; do    \
+-                      echo "installing $$i in $(INSTALL_PREFIX)$(libdir)"; \
+-                      $(RANLIB) $(INSTALL_PREFIX)$(libdir)/$$i ; \
+-              done ; \
+-              $(LIB_LDCONFIG_CMD) ; \
+-      fi
++installucdlibs:
++      $(SHELL) $(top_srcdir)/mkinstalldirs $(INSTALL_PREFIX)$(libdir) ; \
++      ln -sf libnetsnmp.so $(INSTALL_PREFIX)$(libdir)/libsnmp.so ; \
++      ln -sf libnetsnmp.la $(INSTALL_PREFIX)$(libdir)/libsnmp.la ; \
++      ln -sf libnetsnmp.a $(INSTALL_PREFIX)$(libdir)/libsnmp.a
+ 
+ installsubdirlibs:
+       @if test "$(SUBDIRS)" != ""; then \
+--- net-snmp-5.1.1/agent/Makefile.in.orig      2003-10-14 15:30:48.000000000 +0200
++++ net-snmp-5.1.1/agent/Makefile.in   2004-03-27 16:24:52.646942192 +0100
+@@ -120,7 +120,7 @@
+ 
+ 
+ libnetsnmpagent.$(LIB_EXTENSION)$(LIB_VERSION):    ${LLIBAGENTOBJS} libnetsnmpmibs.$(LIB_EXTENSION)$(LIB_VERSION)
+-      $(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)
+ 
+ libnetsnmpmibs.$(LIB_EXTENSION)$(LIB_VERSION):    ${LMIBOBJS}