]>
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} |
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/configure.in net-snmp-5.4/configure.in |
34 | --- net-snmp-5.4.org/configure.in 2006-11-24 18:53:18.000000000 +0100 | |
35 | +++ net-snmp-5.4/configure.in 2006-12-21 01:17:16.166418250 +0100 | |
36 | @@ -1699,6 +1699,8 @@ | |
37 | rebuilt_new_with_security= | |
38 | already_checked_krb5=no | |
39 | ||
40 | +KRB5_LIBS= | |
41 | +AC_SUBST(KRB5_LIBS) | |
42 | for sec in $new_with_security | |
43 | do | |
44 | if test "x$sec" = "xksm" -a "xyes" = "x$already_checked_krb5"; then | |
45 | @@ -1718,7 +1720,7 @@ | |
46 | ||
47 | if test no != $krb5_config; then | |
48 | CPPFLAGS="$CPPFLAGS `$krb5_config --cflags`" | |
49 | - LIBS="$LIBS `$krb5_config --libs`" | |
50 | + KRB5_LIBS="`$krb5_config --libs`" | |
51 | elif test $krb5path != no; then | |
52 | AC_ADD_SEARCH_PATH($krb5path) | |
53 | else | |
54 | @@ -1755,10 +1757,10 @@ | |
55 | if test $ac_cv_heimdal = yes; then | |
56 | AC_DEFINE(NETSNMP_USE_KERBEROS_HEIMDAL) | |
57 | if test no = $krb5_config; then | |
58 | - LIBS="$LIBS -lkrb5 -lasn1 -lcom_err -lroken" | |
59 | + KRB5_LIBS="-lkrb5 -lasn1 -lcom_err -lroken" | |
60 | fi | |
61 | elif test no = $krb5_config; then | |
62 | - LIBS="$LIBS -lkrb5 -lcom_err" | |
63 | + KRB5_LIBS="-lkrb5 -lcom_err" | |
64 | fi | |
65 | ||
66 | AC_MSG_CHECKING([to see which crypto API we need to use]) | |
67 | @@ -1773,7 +1775,7 @@ | |
68 | AC_MSG_RESULT(new MIT crypto API) | |
69 | AC_DEFINE(NETSNMP_USE_KERBEROS_MIT) | |
70 | if test no = $krb5_config; then | |
71 | - LIBS="$LIBS -lk5crypto" | |
72 | + KRB5_LIBS="-lk5crypto" | |
73 | fi | |
74 | else | |
75 | AC_MSG_RESULT(old MIT crypto API)]) | |
76 | diff -urN net-snmp-5.4.org/Makefile.rules net-snmp-5.4/Makefile.rules | |
77 | --- net-snmp-5.4.org/Makefile.rules 2005-10-10 20:47:48.000000000 +0200 | |
78 | +++ net-snmp-5.4/Makefile.rules 2006-12-21 01:17:16.166418250 +0100 | |
40bc0036 JB |
79 | @@ -8,7 +8,7 @@ |
80 | ||
81 | # the standard items to build: libraries, bins, and sbins | |
82 | STANDARDTARGETS =$(INSTALLLIBS) $(INSTALLBINPROGS) $(INSTALLSBINPROGS) | |
83 | -STANDARDCLEANTARGETS=$(INSTALLLIBS) $(INSTALLBINPROGS) $(INSTALLSBINPROGS) $(INSTALLUCDLIBS) | |
84 | +STANDARDCLEANTARGETS=$(INSTALLLIBS) $(INSTALLBINPROGS) $(INSTALLSBINPROGS) | |
85 | ||
86 | standardall: subdirs $(STANDARDTARGETS) | |
87 | ||
04ea07b9 | 88 | @@ -175,17 +175,11 @@ |
40bc0036 JB |
89 | $(LIB_LDCONFIG_CMD) ; \ |
90 | fi | |
91 | ||
92 | -installucdlibs: $(INSTALLUCDLIBS) | |
93 | - @if test "$(INSTALLUCDLIBS)" != ""; then \ | |
94 | - it="$(INSTALLUCDLIBS)" ; \ | |
95 | - $(SHELL) $(top_srcdir)/mkinstalldirs $(INSTALL_PREFIX)$(libdir) ; \ | |
834a380a | 96 | - $(INSTALL) $(INSTALLUCDLIBS) $(INSTALL_PREFIX)$(libdir) ; \ |
97 | - for i in $$it ; do \ | |
98 | - echo "installing $$i in $(INSTALL_PREFIX)$(libdir)"; \ | |
99 | - $(RANLIB) $(INSTALL_PREFIX)$(libdir)/$$i ; \ | |
100 | - done ; \ | |
40bc0036 JB |
101 | - $(LIB_LDCONFIG_CMD) ; \ |
102 | - fi | |
103 | +installucdlibs: | |
104 | + $(SHELL) $(top_srcdir)/mkinstalldirs $(INSTALL_PREFIX)$(libdir) ; \ | |
105 | + ln -sf libnetsnmp.so $(INSTALL_PREFIX)$(libdir)/libsnmp.so ; \ | |
106 | + ln -sf libnetsnmp.la $(INSTALL_PREFIX)$(libdir)/libsnmp.la ; \ | |
107 | + ln -sf libnetsnmp.a $(INSTALL_PREFIX)$(libdir)/libsnmp.a | |
108 | ||
109 | installsubdirlibs: | |
110 | @if test "$(SUBDIRS)" != ""; then \ | |
f548e789 AM |
111 | diff -urN net-snmp-5.4.org/snmplib/Makefile.in net-snmp-5.4/snmplib/Makefile.in |
112 | --- net-snmp-5.4.org/snmplib/Makefile.in 2006-09-19 16:45:29.000000000 +0200 | |
113 | +++ net-snmp-5.4/snmplib/Makefile.in 2006-12-21 01:17:16.166418250 +0100 | |
114 | @@ -128,7 +128,6 @@ | |
40bc0036 | 115 | |
04ea07b9 AM |
116 | # libraries |
117 | INSTALLLIBS=libnetsnmp.$(LIB_EXTENSION)$(LIB_VERSION) | |
118 | -INSTALLUCDLIBS=libsnmp.$(LIB_EXTENSION)$(LIB_VERSION) | |
40bc0036 | 119 | |
04ea07b9 AM |
120 | # |
121 | # Things to build | |
f548e789 | 122 | @@ -188,13 +187,9 @@ |
40bc0036 | 123 | |
04ea07b9 AM |
124 | # how to build the libraries. |
125 | libnetsnmp.$(LIB_EXTENSION)$(LIB_VERSION): ${TOBJS} | |
fdc083b5 | 126 | - $(LIB_LD_CMD) libnetsnmp.$(LIB_EXTENSION)$(LIB_VERSION) ${TOBJS} ${LDFLAGS} @LIBCRYPTO@ |
bf8b8ba8 | 127 | + $(LIB_LD_CMD) libnetsnmp.$(LIB_EXTENSION)$(LIB_VERSION) ${TOBJS} ${LDFLAGS} @KRB5_LIBS@ @LIBCRYPTO@ |
04ea07b9 AM |
128 | $(RANLIB) libnetsnmp.$(LIB_EXTENSION)$(LIB_VERSION) |
129 | ||
130 | -libsnmp.$(LIB_EXTENSION)$(LIB_VERSION): ${TOBJS} | |
fdc083b5 | 131 | - $(LIB_LD_CMD) libsnmp.$(LIB_EXTENSION)$(LIB_VERSION) ${TOBJS} ${LDFLAGS} @LIBCRYPTO@ |
04ea07b9 AM |
132 | - $(RANLIB) libsnmp.$(LIB_EXTENSION)$(LIB_VERSION) |
133 | - | |
134 | # | |
135 | # internal test objects | |
136 | # |