--- configure.in.old	2006-09-01 15:01:14.000000000 +0200
+++ configure.in	2006-09-01 15:57:16.000000000 +0200
@@ -2212,13 +2212,14 @@
 # check for tcp wrapper support
 _cppflags="${CPPFLAGS}"
 _ldflags="${LDFLAGS}"
+_libs=${LIBS}
 
 AC_ARG_WITH(libwrap,
 [  --with-libwrap[=LIBPATH] Compile in libwrap (tcp_wrappers) support.],[
   if test "$with_libwrap" != "no"; then
     if test "$with_libwrap" != "yes"; then
       CPPFLAGS="${CPPFLAGS} -I$with_libwrap/include"
-      LDFLAGS="${LDFLAGS} -L$with_libwrap/lib"
+      LIBS="${LIBS} -L$with_libwrap/lib"
     fi
 
     _libs=${LIBS}
@@ -2274,28 +2275,28 @@
 
   # zlib is required for newer versions of rpm
   _cppflags="${CPPFLAGS}"
-  _ldflags="${LDFLAGS}"
+  _ldflags="${LIBS}"
 
   AC_ARG_WITH(zlib,
   [  --with-zlib[=DIR]        use libz in DIR],[
     if test -d "$withval"; then
       CPPFLAGS="${CPPFLAGS} -I$withval/include"
-      LDFLAGS="${LDFLAGS} -L$withval/lib"
+      LIBS="${LIBS} -L$withval/lib"
     fi
   ])
 
 
   # dunno if this is needed for rpm-4.0.x, earlier probably needs.
   AC_CHECK_HEADER(zlib.h,
-      AC_CHECK_LIB(z, gzread, , CPPFLAGS=${_cppflags} LDFLAGS=${_ldflags}),
-      CPPFLAGS=${_cppflags} LDFLAGS=${_ldflags})
+      AC_CHECK_LIB(z, gzread, , CPPFLAGS=${_cppflags} LIBS=${_ldflags}),
+      CPPFLAGS=${_cppflags} LIBS=${_ldflags})
 
   # two variants of bzip2 need checking.
   AC_ARG_WITH(bzip2,
   [  --with-bzip2[=DIR]          use libbzip2 in DIR],[
     if test -d "$withval"; then
       CPPFLAGS="${CPPFLAGS} -I$withval/include"
-      LDFLAGS="${LDFLAGS} -L$withval/lib"
+      LIBS="${LIBS} -L$withval/lib"
     fi
     if test "x$with_bzip2" != "xno"; then
       AC_CHECK_LIB(bz2, bzread, [_rpmlibs="$_rpmlibs -lbz2"],
@@ -2409,18 +2410,18 @@
     AC_MSG_RESULT($perlcflags)
     CPPFLAGS="$CPPFLAGS $perlcflags"
 
-    AC_MSG_CHECKING([for perl LDFLAGS])
+    AC_MSG_CHECKING([for perl LIBS])
     perlldopts=`$myperl -MExtUtils::Embed -e ldopts`
     AC_MSG_RESULT($perlldopts)
     PERLLDOPTS="$perlldopts"
 
-    OLDLDFLAGS="$LDFLAGS"
-    LDFLAGS="$LDFLAGS $PERLLDOPTS"
+    OLDLDFLAGS="$LIBS"
+    LIBS="$LIBS $PERLLDOPTS"
 
     # newer perl vs older perl call functions
     AC_CHECK_FUNCS(Perl_eval_pv eval_pv perl_eval_pv)
 
-    LDFLAGS="$OLDLDFLAGS"
+    LIBS="$OLDLDFLAGS"
 
     AC_DEFINE(NETSNMP_EMBEDDED_PERL)
     OTHERAGENTLIBOBJS="snmp_perl.o"
--- agent/helpers/Makefile.in.old	2005-06-10 21:51:50.000000000 +0200
+++ agent/helpers/Makefile.in	2006-09-01 17:19:01.000000000 +0200
@@ -122,5 +122,5 @@
 all: standardall
 
 libnetsnmphelpers.$(LIB_EXTENSION)$(LIB_VERSION):    ${LOBJS}
-	$(LIB_LD_CMD) libnetsnmphelpers.$(LIB_EXTENSION)$(LIB_VERSION) ${LOBJS}  $(LIB_LD_LIBS)
+	$(LIB_LD_CMD) ${LOBJS}  -o $@ $(LIB_LD_LIBS) $(LIBS)
 	$(RANLIB) libnetsnmphelpers.$(LIB_EXTENSION)$(LIB_VERSION)
--- apps/Makefile.in.old	2005-11-17 11:05:27.000000000 +0100
+++ apps/Makefile.in	2006-09-01 17:24:02.000000000 +0200
@@ -137,7 +137,7 @@
 	$(LINK) -o $@ snmpdf.$(OSUFFIX) $(LOCAL_LIBS) ${LDFLAGS} ${LIBS} 
 
 libnetsnmptrapd.$(LIB_EXTENSION)$(LIB_VERSION): $(LLIBTRAPD_OBJS)
-	$(LIB_LD_CMD) libnetsnmptrapd.$(LIB_EXTENSION)$(LIB_VERSION) ${LLIBTRAPD_OBJS}  $(LIB_LD_LIBS)
+	$(LIB_LD_CMD) ${LLIBTRAPD_OBJS}  -o $@ $(LIB_LD_LIBS) $(LIBS)
 	$(RANLIB) libnetsnmptrapd.$(LIB_EXTENSION)$(LIB_VERSION)
 
 snmpinforminstall: