1 diff -ur net-snmp-5.3.org/configure.in net-snmp-5.3/configure.in
2 --- net-snmp-5.3.org/configure.in 2005-12-28 18:20:56.000000000 +0100
3 +++ net-snmp-5.3/configure.in 2006-01-09 01:07:39.031490000 +0100
4 @@ -1699,16 +1699,18 @@
5 rebuilt_new_with_security=
6 already_checked_krb5=no
10 for sec in $new_with_security
12 if test "x$sec" = "xksm" -a "xyes" = "x$already_checked_krb5"; then
15 - already_checked_krb5=yes
17 if test x$sec != xksm; then
18 rebuilt_new_with_security="$rebuilt_new_with_security $sec"
20 + already_checked_krb5=yes
21 if test no = $trykrb5; then
22 AC_MSG_NOTICE([configured not to use krb5. disabling ksm])
26 if test no != $krb5_config; then
27 CPPFLAGS="$CPPFLAGS `$krb5_config --cflags`"
28 - LIBS="$LIBS `$krb5_config --libs`"
29 + KRB5_LIBS="`$krb5_config --libs`"
30 elif test $krb5path != no; then
31 AC_ADD_SEARCH_PATH($krb5path)
33 @@ -1755,29 +1757,34 @@
34 if test $ac_cv_heimdal = yes; then
35 AC_DEFINE(NETSNMP_USE_KERBEROS_HEIMDAL)
36 if test no = $krb5_config; then
37 - LIBS="$LIBS -lkrb5 -lasn1 -lcom_err -lroken"
38 + KRB5_LIBS="-lkrb5 -lasn1 -lcom_err -lroken"
40 elif test no = $krb5_config; then
41 - LIBS="$LIBS -lkrb5 -lcom_err"
42 + KRB5_LIBS="-lkrb5 -lcom_err"
46 + LIBS="$LIBS $KRB5_LIBS"
47 AC_MSG_CHECKING([to see which crypto API we need to use])
48 AC_CHECK_FUNC(krb5_c_encrypt,[
49 - AC_CACHE_VAL(ac_cv_NETSNMP_USE_KERBEROS_MIT,
50 - AC_CHECK_LIB(k5crypto, krb5_init_context,
51 - ac_cv_NETSNMP_USE_KERBEROS_MIT=yes, ac_cv_MIT_NEW_CRYPTo=no
54 + AC_CHECK_LIB(k5crypto, krb5_init_context,
55 + ac_cv_MIT_NEW_CRYPTo=yes, ac_cv_MIT_NEW_CRYPTo=no
58 - if test yes = $ac_cv_NETSNMP_USE_KERBEROS_MIT; then
59 + AC_DEFINE(NETSNMP_USE_KERBEROS_MIT)
60 + if test yes = $ac_cv_MIT_NEW_CRYPTo; then
61 AC_MSG_RESULT(new MIT crypto API)
62 - AC_DEFINE(NETSNMP_USE_KERBEROS_MIT)
63 if test no = $krb5_config; then
64 - LIBS="$LIBS -lk5crypto"
65 + KRB5_LIBS="$LIBS -lk5crypto"
67 + CFLAGS="$CFLAGS `$krb5_config --cflags`"
68 + KRB5_LIBS="$LIBS `$krb5_config --libs`"
71 - AC_MSG_RESULT(old MIT crypto API)])
72 + AC_MSG_RESULT(old MIT crypto API)
79 @@ -2661,23 +2661,6 @@
81 AGENTLIBS="${AGENTLIBS} -ladm"))
84 - aix*) # AIX perfstat library, needed for CPU/memory statistics
85 - AC_CHECK_HEADERS(libperfstat.h,
86 - AC_CHECK_LIB(perfstat, perfstat_cpu_total, AC_DEFINE(HAVE_PERFSTAT)
87 - AGENTLIBS="${AGENTLIBS} -lperfstat"), AC_MSG_ERROR([
89 -*** To monitor CPU/memory values in AIX you need to install
90 -*** libperfstat which can be found in bos.perf
93 - hpux*) # HP-UX agent needs open_mib
94 - AC_CHECK_LIB(nm, open_mib, AC_DEFINE(HAVE_LIBNM)
95 - AGENTLIBS="${AGENTLIBS} -lnm")
101 # (mingw32 must link winsock explicitly)
102 AC_CHECK_HEADERS(winsock.h,[
103 @@ -2880,7 +2863,7 @@
105 AC_MSG_RESULT([$ac_cv_type_ssize_t])
106 if test $ac_cv_type_ssize_t = yes; then
107 - AC_DEFINE(HAVE_SSIZE_T)
108 + AC_DEFINE(HAVE_SSIZE_T,,[have ssize_t])
112 --- net-snmp-5.4/agent/mibgroup/Makefile.in.orig 2006-09-13 19:00:27.000000000 +0200
113 +++ net-snmp-5.4/agent/mibgroup/Makefile.in 2006-12-02 11:51:38.369040000 +0100
116 $(CC) -c $(CPPFLAGS) $(CFLAGS) -o $@ $<
118 -OBJS = @mib_module_list_o@
119 -LOBJS = @mib_module_list_lo@
120 -SRCS = @mib_module_list_c@
122 +@mib_module_list_lo@
125 +OBJS = $(mib_module_list_o)
126 +LOBJS = $(mib_module_list_lo)
127 +SRCS = $(mib_module_list_c)
129 all: standardall $(LOBJS)