[packages/net-snmp.git] / net-snmp-link.patch

diff -urN net-snmp-5.4.org/agent/Makefile.in net-snmp-5.4/agent/Makefile.in
--- net-snmp-5.4.org/agent/Makefile.in	2006-11-07 15:54:25.000000000 +0100
+++ net-snmp-5.4/agent/Makefile.in	2006-12-21 01:59:59.846638250 +0100
@@ -74,11 +74,11 @@
 #
 # how to build it info
 #
-USELIBS		= ../snmplib/libnetsnmp.$(LIB_EXTENSION)$(LIB_VERSION)
-HELPERLIB	= helpers/libnetsnmphelpers.$(LIB_EXTENSION)$(LIB_VERSION)
+USELIBS		= $(top_builddir)/snmplib/libnetsnmp.la
+HELPERLIB	= $(top_builddir)/agent/helpers/libnetsnmphelpers.la
 LOCAL_LIBS	= 
 PERLLDOPTS      = @PERLLDOPTS@
-LIBS		= ../snmplib/libnetsnmp.$(LIB_EXTENSION)$(LIB_VERSION) @AGENTLIBS@ $(PERLLDOPTS)
+LIBS		= $(top_builddir)/snmplib/libnetsnmp.la @AGENTLIBS@ $(PERLLDOPTS)
 OUR_AGENT_LIBS	= $(INSTALLLIBS) $(HELPERLIB) @WRAPLIBS@ $(LIBS) @DLLIBS@
 CPPFLAGS	= $(TOP_INCLUDES) -I. $(AGENT_INCLUDES) $(MIBGROUP_INCLUDES) \
 		  $(SNMPLIB_INCLUDES) @CPPFLAGS@ 
@@ -137,11 +137,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) ${HELPERLIB} ${LIBS}
 	$(RANLIB) libnetsnmpagent.$(LIB_EXTENSION)$(LIB_VERSION)
 
 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} ${HELPERLIB} $(LIB_LD_LIBS) @SENSORLIBS@ -ldl
 	$(RANLIB) libnetsnmpmibs.$(LIB_EXTENSION)$(LIB_VERSION)
 
 agentlib: libnetsnmpagent.$(LIB_EXTENSION)$(LIB_VERSION)
diff -urN net-snmp-5.4.org/Makefile.rules net-snmp-5.4/Makefile.rules
--- net-snmp-5.4.org/Makefile.rules	2005-10-10 20:47:48.000000000 +0200
+++ net-snmp-5.4/Makefile.rules	2006-12-21 01:17:16.166418250 +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)
 
@@ -175,17 +175,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 \
diff -urN net-snmp-5.4.org/snmplib/Makefile.in net-snmp-5.4/snmplib/Makefile.in
--- net-snmp-5.4.org/snmplib/Makefile.in	2006-09-19 16:45:29.000000000 +0200
+++ net-snmp-5.4/snmplib/Makefile.in	2006-12-21 01:17:16.166418250 +0100
@@ -128,7 +128,6 @@
 
 # libraries
 INSTALLLIBS=libnetsnmp.$(LIB_EXTENSION)$(LIB_VERSION)
-INSTALLUCDLIBS=libsnmp.$(LIB_EXTENSION)$(LIB_VERSION)
 
 #
 # Things to build
@@ -188,13 +187,9 @@
 
 # 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)
-
 #
 # internal test objects
 #
Commit	Line	Data
f548e789 AM	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@
bf8b8ba8	19	@@ -137,11 +137,11 @@
40bc0036	20
edf6eebd	21
04ea07b9 AM	22	libnetsnmpagent.$(LIB_EXTENSION)$(LIB_VERSION): ${LLIBAGENTOBJS}
04ea07b9 AM	23	- $(LIB_LD_CMD) libnetsnmpagent.$(LIB_EXTENSION)$(LIB_VERSION) ${LLIBAGENTOBJS} $(LIB_LD_LIBS)
f548e789	24	+ $(LIB_LD_CMD) libnetsnmpagent.$(LIB_EXTENSION)$(LIB_VERSION) ${LLIBAGENTOBJS} @WRAPLIBS@ $(LIB_LD_LIBS) ${HELPERLIB} ${LIBS}
04ea07b9	25	$(RANLIB) libnetsnmpagent.$(LIB_EXTENSION)$(LIB_VERSION)
edf6eebd	26
04ea07b9	27	libnetsnmpmibs.$(LIB_EXTENSION)$(LIB_VERSION): ${LMIBOBJS}
bf8b8ba8	28	- $(LIB_LD_CMD) libnetsnmpmibs.$(LIB_EXTENSION)$(LIB_VERSION) ${LMIBOBJS} $(LIB_LD_LIBS) @SENSORLIBS@
f548e789	29	+ $(LIB_LD_CMD) libnetsnmpmibs.$(LIB_EXTENSION)$(LIB_VERSION) ${LMIBOBJS} ${HELPERLIB} $(LIB_LD_LIBS) @SENSORLIBS@ -ldl
bf8b8ba8 JB	30	$(RANLIB) libnetsnmpmibs.$(LIB_EXTENSION)$(LIB_VERSION)
	31
	32	agentlib: libnetsnmpagent.$(LIB_EXTENSION)$(LIB_VERSION)
f548e789 AM	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
40bc0036 JB	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
04ea07b9	45	@@ -175,17 +175,11 @@
40bc0036 JB	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) ; \
834a380a	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 ; \
40bc0036 JB	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 \
f548e789 AM	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 @@
40bc0036	72
04ea07b9 AM	73	# libraries
	74	INSTALLLIBS=libnetsnmp.$(LIB_EXTENSION)$(LIB_VERSION)
	75	-INSTALLUCDLIBS=libsnmp.$(LIB_EXTENSION)$(LIB_VERSION)
40bc0036	76
04ea07b9 AM	77	#
04ea07b9 AM	78	# Things to build
b728ae53 JR	79	@@ -188,13 +187,9 @@
	80
	81	# how to build the libraries.
	82	libnetsnmp.$(LIB_EXTENSION)$(LIB_VERSION): ${TOBJS}
	83	- $(LIB_LD_CMD) libnetsnmp.$(LIB_EXTENSION)$(LIB_VERSION) ${TOBJS} ${LDFLAGS} @LIBCRYPTO@
	84	+ $(LIB_LD_CMD) libnetsnmp.$(LIB_EXTENSION)$(LIB_VERSION) ${TOBJS} ${LDFLAGS} @KRB5_LIBS@ @LIBCRYPTO@
04ea07b9 AM	85	$(RANLIB) libnetsnmp.$(LIB_EXTENSION)$(LIB_VERSION)
	86
	87	-libsnmp.$(LIB_EXTENSION)$(LIB_VERSION): ${TOBJS}
fdc083b5	88	- $(LIB_LD_CMD) libsnmp.$(LIB_EXTENSION)$(LIB_VERSION) ${TOBJS} ${LDFLAGS} @LIBCRYPTO@
04ea07b9 AM	89	- $(RANLIB) libsnmp.$(LIB_EXTENSION)$(LIB_VERSION)
	90	-
	91	#
	92	# internal test objects
	93	#