Attachment #95719 for bug #145960

Lines 185-195 all: standardall Link Here

(-)net-snmp-5.2.2/snmplib/Makefile.in (-2 / +2 lines)
185		185
186	# how to build the libraries.	186	# how to build the libraries.
187	libnetsnmp.$(LIB_EXTENSION)$(LIB_VERSION): ${TOBJS}	187	libnetsnmp.$(LIB_EXTENSION)$(LIB_VERSION): ${TOBJS}
188	$(LIB_LD_CMD) libnetsnmp.$(LIB_EXTENSION)$(LIB_VERSION) ${TOBJS}	188	$(LIB_LD_CMD) ${TOBJS} -o $@ @LIBCRYPTO@ $(LIBS) @WRAPLIBS@
189	$(RANLIB) libnetsnmp.$(LIB_EXTENSION)$(LIB_VERSION)	189	$(RANLIB) libnetsnmp.$(LIB_EXTENSION)$(LIB_VERSION)
190		190
191	libsnmp.$(LIB_EXTENSION)$(LIB_VERSION): ${TOBJS}	191	libsnmp.$(LIB_EXTENSION)$(LIB_VERSION): ${TOBJS}
192	$(LIB_LD_CMD) libsnmp.$(LIB_EXTENSION)$(LIB_VERSION) ${TOBJS}	192	$(LIB_LD_CMD) ${TOBJS} -o $@ @LIBCRYPTO@ $(LIBS) @WRAPLIBS@
193	$(RANLIB) libsnmp.$(LIB_EXTENSION)$(LIB_VERSION)	193	$(RANLIB) libsnmp.$(LIB_EXTENSION)$(LIB_VERSION)
194		194
195	#	195	#




        *)
            AC_CHECK_HEADER(sensors/sensors.h,,
                [AC_MSG_ERROR([asked to use lm_sensors but I couldn't find sensors/sensors.h])])
            AC_CHECK_LIB(sensors, sensors_get_detected_chips, SENSORLIBS="-lsensors",
                [AC_MSG_ERROR([asked to use lm_sensors but I couldn't find -lsensors])])
            ;;
        esac
fi
AC_SUBST(SENSORLIBS)

#
# Install the various perl modules

        encrmodes="[disabled]"
    fi
    AC_DEFINE(USE_OPENSSL)
    LIBCRYPTO="-lcrypto"
    AC_MSG_RESULT(OpenSSL Support)
elif test "x$usepkcs" != "xno" ; then
    authmodes="MD5 SHA1"

if test "x$enable_md5" = "xno"; then
    authmodes=`echo $authmodes | sed 's/MD5 *//;'`
fi
AC_SUBST(LIBCRYPTO)

AC_MSG_CACHE_ADD(Authentication support:     $authmodes)
AC_MSG_CACHE_ADD(Encryption support:         $encrmodes)

Lines 130-140 snmpd$(EXEEXT): ${LAGENTOBJS} $(USELIBS) Link Here

(-)net-snmp-5.2.2/agent/Makefile.in (-2 / +2 lines)
130		130
131		131
132	libnetsnmpagent.$(LIB_EXTENSION)$(LIB_VERSION): ${LLIBAGENTOBJS} libnetsnmpmibs.$(LIB_EXTENSION)$(LIB_VERSION)	132	libnetsnmpagent.$(LIB_EXTENSION)$(LIB_VERSION): ${LLIBAGENTOBJS} libnetsnmpmibs.$(LIB_EXTENSION)$(LIB_VERSION)
133	$(LIB_LD_CMD) libnetsnmpagent.$(LIB_EXTENSION)$(LIB_VERSION) ${LLIBAGENTOBJS} $(LIB_LD_LIBS)	133	$(LIB_LD_CMD) ${LLIBAGENTOBJS} -o $@ $(LIB_LD_LIBS) $(LIBS) helpers/libnetsnmphelpers.la
134	$(RANLIB) libnetsnmpagent.$(LIB_EXTENSION)$(LIB_VERSION)	134	$(RANLIB) libnetsnmpagent.$(LIB_EXTENSION)$(LIB_VERSION)
135		135
136	libnetsnmpmibs.$(LIB_EXTENSION)$(LIB_VERSION): ${LMIBOBJS}	136	libnetsnmpmibs.$(LIB_EXTENSION)$(LIB_VERSION): ${LMIBOBJS}
137	$(LIB_LD_CMD) libnetsnmpmibs.$(LIB_EXTENSION)$(LIB_VERSION) ${LMIBOBJS} $(LIB_LD_LIBS)	137	$(LIB_LD_CMD) ${LMIBOBJS} -o $@ $(LIB_LD_LIBS) $(LIBS) @SENSORLIBS@
138	$(RANLIB) libnetsnmpmibs.$(LIB_EXTENSION)$(LIB_VERSION)	138	$(RANLIB) libnetsnmpmibs.$(LIB_EXTENSION)$(LIB_VERSION)
139		139
140	embedperlinstall:	140	embedperlinstall:

Return to bug 145960

Lines 2362-2372 if test $? -eq 0 ; then Link Here

(-)net-snmp-5.2.2/configure.in (-1 / +4 lines)
2362	*)	2362	*)
2363	AC_CHECK_HEADER(sensors/sensors.h,,	2363	AC_CHECK_HEADER(sensors/sensors.h,,
2364	[AC_MSG_ERROR([asked to use lm_sensors but I couldn't find sensors/sensors.h])])	2364	[AC_MSG_ERROR([asked to use lm_sensors but I couldn't find sensors/sensors.h])])
2365	AC_CHECK_LIB(sensors, sensors_get_detected_chips, LIBS="${LIBS} -lsensors",	2365	AC_CHECK_LIB(sensors, sensors_get_detected_chips, SENSORLIBS="-lsensors",
2366	[AC_MSG_ERROR([asked to use lm_sensors but I couldn't find -lsensors])])	2366	[AC_MSG_ERROR([asked to use lm_sensors but I couldn't find -lsensors])])
2367	;;	2367	;;
2368	esac	2368	esac
2369	fi	2369	fi
		2370	AC_SUBST(SENSORLIBS)
2370		2371
2371	#	2372	#
2372	# Install the various perl modules	2373	# Install the various perl modules
Lines 2691-2696 if test "x$useopenssl" != "xno" ; then Link Here
2691	encrmodes="[disabled]"	2692	encrmodes="[disabled]"
2692	fi	2693	fi
2693	AC_DEFINE(USE_OPENSSL)	2694	AC_DEFINE(USE_OPENSSL)
		2695	LIBCRYPTO="-lcrypto"
2694	AC_MSG_RESULT(OpenSSL Support)	2696	AC_MSG_RESULT(OpenSSL Support)
2695	elif test "x$usepkcs" != "xno" ; then	2697	elif test "x$usepkcs" != "xno" ; then
2696	authmodes="MD5 SHA1"	2698	authmodes="MD5 SHA1"
Lines 2710-2715 fi Link Here
2710	if test "x$enable_md5" = "xno"; then	2712	if test "x$enable_md5" = "xno"; then
2711	authmodes=`echo $authmodes \| sed 's/MD5 *//;'`	2713	authmodes=`echo $authmodes \| sed 's/MD5 *//;'`
2712	fi	2714	fi
		2715	AC_SUBST(LIBCRYPTO)
2713		2716
2714	AC_MSG_CACHE_ADD(Authentication support: $authmodes)	2717	AC_MSG_CACHE_ADD(Authentication support: $authmodes)
2715	AC_MSG_CACHE_ADD(Encryption support: $encrmodes)	2718	AC_MSG_CACHE_ADD(Encryption support: $encrmodes)