net-snmp-link.patch

   1 diff -urN net-snmp-5.4.org/agent/Makefile.in net-snmp-5.4/agent/Makefile.in
   2 --- net-snmp-5.4.org/agent/Makefile.in  2006-11-07 15:54:25.000000000 +0100
   3 +++ net-snmp-5.4/agent/Makefile.in      2006-12-21 01:59:59.846638250 +0100
   4 @@ -74,11 +74,11 @@
   5  #
   6  # how to build it info
   7  #
   8 -USELIBS                = ../snmplib/libnetsnmp.$(LIB_EXTENSION)$(LIB_VERSION)
   9 -HELPERLIB      = helpers/libnetsnmphelpers.$(LIB_EXTENSION)$(LIB_VERSION)
  10 +USELIBS                = $(top_builddir)/snmplib/libnetsnmp.la
  11 +HELPERLIB      = $(top_builddir)/agent/helpers/libnetsnmphelpers.la
  12  LOCAL_LIBS     =
  13  PERLLDOPTS      = @PERLLDOPTS@
  14 -LIBS           = ../snmplib/libnetsnmp.$(LIB_EXTENSION)$(LIB_VERSION) @AGENTLIBS@ $(PERLLDOPTS)
  15 +LIBS           = $(top_builddir)/snmplib/libnetsnmp.la @AGENTLIBS@ $(PERLLDOPTS)
  16  OUR_AGENT_LIBS = $(INSTALLLIBS) $(HELPERLIB) @WRAPLIBS@ $(LIBS) @DLLIBS@
  17  CPPFLAGS       = $(TOP_INCLUDES) -I. $(AGENT_INCLUDES) $(MIBGROUP_INCLUDES) \
  18                   $(SNMPLIB_INCLUDES) @CPPFLAGS@
  19 @@ -137,11 +137,11 @@
  20
  21
  22  libnetsnmpagent.$(LIB_EXTENSION)$(LIB_VERSION):    ${LLIBAGENTOBJS}
  23 -       $(LIB_LD_CMD) libnetsnmpagent.$(LIB_EXTENSION)$(LIB_VERSION) ${LLIBAGENTOBJS}  $(LIB_LD_LIBS)
  24 +       $(LIB_LD_CMD) libnetsnmpagent.$(LIB_EXTENSION)$(LIB_VERSION) ${LLIBAGENTOBJS} @WRAPLIBS@ $(LIB_LD_LIBS) ${HELPERLIB} ${LIBS}
  25         $(RANLIB) libnetsnmpagent.$(LIB_EXTENSION)$(LIB_VERSION)
  26
  27  libnetsnmpmibs.$(LIB_EXTENSION)$(LIB_VERSION):    ${LMIBOBJS}
  28 -       $(LIB_LD_CMD) libnetsnmpmibs.$(LIB_EXTENSION)$(LIB_VERSION) ${LMIBOBJS}  $(LIB_LD_LIBS) @SENSORLIBS@
  29 +       $(LIB_LD_CMD) libnetsnmpmibs.$(LIB_EXTENSION)$(LIB_VERSION) ${LMIBOBJS} ${HELPERLIB} $(LIB_LD_LIBS) @SENSORLIBS@ -ldl
  30         $(RANLIB) libnetsnmpmibs.$(LIB_EXTENSION)$(LIB_VERSION)
  31
  32  agentlib: libnetsnmpagent.$(LIB_EXTENSION)$(LIB_VERSION)
  33 diff -urN net-snmp-5.4.org/Makefile.rules net-snmp-5.4/Makefile.rules
  34 --- net-snmp-5.4.org/Makefile.rules     2005-10-10 20:47:48.000000000 +0200
  35 +++ net-snmp-5.4/Makefile.rules 2006-12-21 01:17:16.166418250 +0100
  36 @@ -8,7 +8,7 @@
  37
  38  # the standard items to build: libraries, bins, and sbins
  39  STANDARDTARGETS     =$(INSTALLLIBS) $(INSTALLBINPROGS) $(INSTALLSBINPROGS)
  40 -STANDARDCLEANTARGETS=$(INSTALLLIBS) $(INSTALLBINPROGS) $(INSTALLSBINPROGS) $(INSTALLUCDLIBS)
  41 +STANDARDCLEANTARGETS=$(INSTALLLIBS) $(INSTALLBINPROGS) $(INSTALLSBINPROGS)
  42
  43  standardall: subdirs $(STANDARDTARGETS)
  44
  45 @@ -175,17 +175,11 @@
  46                 $(LIB_LDCONFIG_CMD) ; \
  47         fi
  48
  49 -installucdlibs: $(INSTALLUCDLIBS)
  50 -       @if test "$(INSTALLUCDLIBS)" != ""; then \
  51 -               it="$(INSTALLUCDLIBS)" ; \
  52 -               $(SHELL) $(top_srcdir)/mkinstalldirs $(INSTALL_PREFIX)$(libdir) ; \
  53 -               $(INSTALL) $(INSTALLUCDLIBS) $(INSTALL_PREFIX)$(libdir) ; \
  54 -               for i in $$it ; do \
  55 -                       echo "installing $$i in $(INSTALL_PREFIX)$(libdir)"; \
  56 -                       $(RANLIB) $(INSTALL_PREFIX)$(libdir)/$$i ; \
  57 -               done ; \
  58 -               $(LIB_LDCONFIG_CMD) ; \
  59 -       fi
  60 +installucdlibs:
  61 +       $(SHELL) $(top_srcdir)/mkinstalldirs $(INSTALL_PREFIX)$(libdir) ; \
  62 +       ln -sf libnetsnmp.so $(INSTALL_PREFIX)$(libdir)/libsnmp.so ; \
  63 +       ln -sf libnetsnmp.la $(INSTALL_PREFIX)$(libdir)/libsnmp.la ; \
  64 +       ln -sf libnetsnmp.a $(INSTALL_PREFIX)$(libdir)/libsnmp.a
  65
  66  installsubdirlibs:
  67         @if test "$(SUBDIRS)" != ""; then \
  68 diff -urN net-snmp-5.4.org/snmplib/Makefile.in net-snmp-5.4/snmplib/Makefile.in
  69 --- net-snmp-5.4.org/snmplib/Makefile.in        2006-09-19 16:45:29.000000000 +0200
  70 +++ net-snmp-5.4/snmplib/Makefile.in    2006-12-21 01:17:16.166418250 +0100
  71 @@ -128,7 +128,6 @@
  72
  73  # libraries
  74  INSTALLLIBS=libnetsnmp.$(LIB_EXTENSION)$(LIB_VERSION)
  75 -INSTALLUCDLIBS=libsnmp.$(LIB_EXTENSION)$(LIB_VERSION)
  76
  77  #
  78  # Things to build
  79 @@ -188,10 +187,6 @@
  80         $(LIB_LD_CMD) libnetsnmp.$(LIB_EXTENSION)$(LIB_VERSION) ${TOBJS} ${LDFLAGS} @LIBCRYPTO@
  81         $(RANLIB) libnetsnmp.$(LIB_EXTENSION)$(LIB_VERSION)
  82
  83 -libsnmp.$(LIB_EXTENSION)$(LIB_VERSION):    ${TOBJS}
  84 -       $(LIB_LD_CMD) libsnmp.$(LIB_EXTENSION)$(LIB_VERSION) ${TOBJS} ${LDFLAGS} @LIBCRYPTO@
  85 -       $(RANLIB) libsnmp.$(LIB_EXTENSION)$(LIB_VERSION)
  86 -
  87  #
  88  # internal test objects
  89  #