]>
Commit | Line | Data |
---|---|---|
bf8b8ba8 JB |
1 | --- net-snmp-5.4.org/agent/Makefile.in 2005-12-04 19:24:25.000000000 +0100 |
2 | +++ net-snmp-5.4/agent/Makefile.in 2006-01-09 00:58:58.598965000 +0100 | |
3 | @@ -137,11 +137,11 @@ | |
40bc0036 | 4 | |
edf6eebd | 5 | |
04ea07b9 AM |
6 | libnetsnmpagent.$(LIB_EXTENSION)$(LIB_VERSION): ${LLIBAGENTOBJS} |
7 | - $(LIB_LD_CMD) libnetsnmpagent.$(LIB_EXTENSION)$(LIB_VERSION) ${LLIBAGENTOBJS} $(LIB_LD_LIBS) | |
8 | + $(LIB_LD_CMD) libnetsnmpagent.$(LIB_EXTENSION)$(LIB_VERSION) ${LLIBAGENTOBJS} @WRAPLIBS@ $(LIB_LD_LIBS) | |
9 | $(RANLIB) libnetsnmpagent.$(LIB_EXTENSION)$(LIB_VERSION) | |
edf6eebd | 10 | |
04ea07b9 | 11 | libnetsnmpmibs.$(LIB_EXTENSION)$(LIB_VERSION): ${LMIBOBJS} |
bf8b8ba8 JB |
12 | - $(LIB_LD_CMD) libnetsnmpmibs.$(LIB_EXTENSION)$(LIB_VERSION) ${LMIBOBJS} $(LIB_LD_LIBS) @SENSORLIBS@ |
13 | + $(LIB_LD_CMD) libnetsnmpmibs.$(LIB_EXTENSION)$(LIB_VERSION) ${LMIBOBJS} $(LIB_LD_LIBS) @SENSORLIBS@ -ldl | |
14 | $(RANLIB) libnetsnmpmibs.$(LIB_EXTENSION)$(LIB_VERSION) | |
15 | ||
16 | agentlib: libnetsnmpagent.$(LIB_EXTENSION)$(LIB_VERSION) | |
04ea07b9 AM |
17 | diff -ur net-snmp-5.3.org/Makefile.rules net-snmp-5.3/Makefile.rules |
18 | --- net-snmp-5.3.org/Makefile.rules 2005-10-10 20:47:48.000000000 +0200 | |
19 | +++ net-snmp-5.3/Makefile.rules 2006-01-09 00:58:13.044118000 +0100 | |
40bc0036 JB |
20 | @@ -8,7 +8,7 @@ |
21 | ||
22 | # the standard items to build: libraries, bins, and sbins | |
23 | STANDARDTARGETS =$(INSTALLLIBS) $(INSTALLBINPROGS) $(INSTALLSBINPROGS) | |
24 | -STANDARDCLEANTARGETS=$(INSTALLLIBS) $(INSTALLBINPROGS) $(INSTALLSBINPROGS) $(INSTALLUCDLIBS) | |
25 | +STANDARDCLEANTARGETS=$(INSTALLLIBS) $(INSTALLBINPROGS) $(INSTALLSBINPROGS) | |
26 | ||
27 | standardall: subdirs $(STANDARDTARGETS) | |
28 | ||
04ea07b9 | 29 | @@ -175,17 +175,11 @@ |
40bc0036 JB |
30 | $(LIB_LDCONFIG_CMD) ; \ |
31 | fi | |
32 | ||
33 | -installucdlibs: $(INSTALLUCDLIBS) | |
34 | - @if test "$(INSTALLUCDLIBS)" != ""; then \ | |
35 | - it="$(INSTALLUCDLIBS)" ; \ | |
36 | - $(SHELL) $(top_srcdir)/mkinstalldirs $(INSTALL_PREFIX)$(libdir) ; \ | |
834a380a | 37 | - $(INSTALL) $(INSTALLUCDLIBS) $(INSTALL_PREFIX)$(libdir) ; \ |
38 | - for i in $$it ; do \ | |
39 | - echo "installing $$i in $(INSTALL_PREFIX)$(libdir)"; \ | |
40 | - $(RANLIB) $(INSTALL_PREFIX)$(libdir)/$$i ; \ | |
41 | - done ; \ | |
40bc0036 JB |
42 | - $(LIB_LDCONFIG_CMD) ; \ |
43 | - fi | |
44 | +installucdlibs: | |
45 | + $(SHELL) $(top_srcdir)/mkinstalldirs $(INSTALL_PREFIX)$(libdir) ; \ | |
46 | + ln -sf libnetsnmp.so $(INSTALL_PREFIX)$(libdir)/libsnmp.so ; \ | |
47 | + ln -sf libnetsnmp.la $(INSTALL_PREFIX)$(libdir)/libsnmp.la ; \ | |
48 | + ln -sf libnetsnmp.a $(INSTALL_PREFIX)$(libdir)/libsnmp.a | |
49 | ||
50 | installsubdirlibs: | |
51 | @if test "$(SUBDIRS)" != ""; then \ | |
04ea07b9 AM |
52 | diff -ur net-snmp-5.3.org/snmplib/Makefile.in net-snmp-5.3/snmplib/Makefile.in |
53 | --- net-snmp-5.3.org/snmplib/Makefile.in 2005-10-30 20:01:14.000000000 +0100 | |
54 | +++ net-snmp-5.3/snmplib/Makefile.in 2006-01-09 00:58:13.044118000 +0100 | |
55 | @@ -127,7 +127,6 @@ | |
40bc0036 | 56 | |
04ea07b9 AM |
57 | # libraries |
58 | INSTALLLIBS=libnetsnmp.$(LIB_EXTENSION)$(LIB_VERSION) | |
59 | -INSTALLUCDLIBS=libsnmp.$(LIB_EXTENSION)$(LIB_VERSION) | |
40bc0036 | 60 | |
04ea07b9 AM |
61 | # |
62 | # Things to build | |
63 | @@ -187,13 +186,9 @@ | |
40bc0036 | 64 | |
04ea07b9 AM |
65 | # how to build the libraries. |
66 | libnetsnmp.$(LIB_EXTENSION)$(LIB_VERSION): ${TOBJS} | |
fdc083b5 | 67 | - $(LIB_LD_CMD) libnetsnmp.$(LIB_EXTENSION)$(LIB_VERSION) ${TOBJS} ${LDFLAGS} @LIBCRYPTO@ |
bf8b8ba8 | 68 | + $(LIB_LD_CMD) libnetsnmp.$(LIB_EXTENSION)$(LIB_VERSION) ${TOBJS} ${LDFLAGS} @KRB5_LIBS@ @LIBCRYPTO@ |
04ea07b9 AM |
69 | $(RANLIB) libnetsnmp.$(LIB_EXTENSION)$(LIB_VERSION) |
70 | ||
71 | -libsnmp.$(LIB_EXTENSION)$(LIB_VERSION): ${TOBJS} | |
fdc083b5 | 72 | - $(LIB_LD_CMD) libsnmp.$(LIB_EXTENSION)$(LIB_VERSION) ${TOBJS} ${LDFLAGS} @LIBCRYPTO@ |
04ea07b9 AM |
73 | - $(RANLIB) libsnmp.$(LIB_EXTENSION)$(LIB_VERSION) |
74 | - | |
75 | # | |
76 | # internal test objects | |
77 | # | |
bf8b8ba8 JB |
78 | --- net-snmp-5.4/configure.in.orig 2006-12-03 19:46:10.257988000 +0100 |
79 | +++ net-snmp-5.4/configure.in 2006-12-03 20:31:42.153670517 +0100 | |
80 | @@ -1699,6 +1699,8 @@ | |
81 | rebuilt_new_with_security= | |
82 | already_checked_krb5=no | |
83 | ||
84 | +KRB5_LIBS= | |
85 | +AC_SUBST(KRB5_LIBS) | |
86 | for sec in $new_with_security | |
87 | do | |
88 | if test "x$sec" = "xksm" -a "xyes" = "x$already_checked_krb5"; then | |
89 | @@ -1718,7 +1720,7 @@ | |
90 | ||
91 | if test no != $krb5_config; then | |
92 | CPPFLAGS="$CPPFLAGS `$krb5_config --cflags`" | |
93 | - LIBS="$LIBS `$krb5_config --libs`" | |
94 | + KRB5_LIBS="`$krb5_config --libs`" | |
95 | elif test $krb5path != no; then | |
96 | AC_ADD_SEARCH_PATH($krb5path) | |
97 | else | |
98 | @@ -1755,10 +1757,10 @@ | |
99 | if test $ac_cv_heimdal = yes; then | |
100 | AC_DEFINE(NETSNMP_USE_KERBEROS_HEIMDAL) | |
101 | if test no = $krb5_config; then | |
102 | - LIBS="$LIBS -lkrb5 -lasn1 -lcom_err -lroken" | |
103 | + KRB5_LIBS="-lkrb5 -lasn1 -lcom_err -lroken" | |
104 | fi | |
105 | elif test no = $krb5_config; then | |
106 | - LIBS="$LIBS -lkrb5 -lcom_err" | |
107 | + KRB5_LIBS="-lkrb5 -lcom_err" | |
108 | fi | |
109 | ||
110 | AC_MSG_CHECKING([to see which crypto API we need to use]) | |
111 | @@ -1773,7 +1775,7 @@ | |
112 | AC_MSG_RESULT(new MIT crypto API) | |
113 | AC_DEFINE(NETSNMP_USE_KERBEROS_MIT) | |
114 | if test no = $krb5_config; then | |
115 | - LIBS="$LIBS -lk5crypto" | |
116 | + KRB5_LIBS="-lk5crypto" | |
117 | fi | |
118 | else | |
119 | AC_MSG_RESULT(old MIT crypto API)]) |