diff -r 5962a461a5a3 -r 1555934cfb04 configure.ac
--- a/configure.ac	Fri Jan 09 15:28:50 2009 +0000
+++ b/configure.ac	Wed Jan 14 12:21:38 2009 +0000
@@ -138,7 +138,7 @@
 fi
 AC_MSG_RESULT($have_gcc4)
 
-
+REQUIREMENTS=""
 AC_ARG_WITH([curl],
             [AS_HELP_STRING([--without-curl], [disable support for curl])],
             [],
@@ -148,6 +148,7 @@
 CURL_LIBS=
 AS_IF([test "x$with_curl" != xno],
   [PKG_CHECK_MODULES(CURL, [libcurl])
+   REQUIREMENTS="$REQUIREMENTS libcurl"
    AC_DEFINE([HAVE_CURL], [1], [Define if you have curl])])
 AC_SUBST(CURL_CFLAGS)
 AC_SUBST(CURL_LIBS)
@@ -157,13 +158,15 @@
                       [
                       zlib=$withval
                       CPPFLAGS="$CPPFLAGS -I$withval/include"
-                      LDFLAGS="$LDFLAGS -L$withval/lib"
                       ]
                       )
 AC_CHECK_HEADERS(zlib.h, [AC_DEFINE(HAVE_ZLIB_H)],
                  [AC_MSG_ERROR([Can't find zlib.h. Please install zlib.])])
-AC_CHECK_LIB(z, inflate, [ZLIB_LIBS="-lz"],
+save_ldflags="$LDFLAGS"
+LDFLAGS="$LDFLAGS -L$zlib/lib"
+AC_CHECK_LIB(z, inflate, [ZLIB_LIBS="-L$zlib/lib -lz"],
 	     [AC_MSG_ERROR([Can't find zlib library. Please install zlib.])])
+LDFLAGS="$save_ldflags"
 AC_SUBST(ZLIB_LIBS)
 
 EXPAT_LIB=""
@@ -171,13 +174,15 @@
                       [
                       expat=$withval
                       CPPFLAGS="$CPPFLAGS -I$withval/include"
-                      LDFLAGS="$LDFLAGS -L$withval/lib"
                       ]
                       )
 AC_CHECK_HEADERS(expat.h, [AC_DEFINE(HAVE_EXPAT_H)], 
 		 [AC_MSG_ERROR([Can't find expat.h. Please install expat.])])
-AC_CHECK_LIB(expat, XML_ParserCreate, [EXPAT_LIBS="-lexpat"],
+save_ldflags="$LDFLAGS"
+LDFLAGS="$LDFLAGS -L$expat/lib"
+AC_CHECK_LIB(expat, XML_ParserCreate, [EXPAT_LIBS="-L$expat/lib -lexpat"],
 	     [AC_MSG_ERROR([Can't find expat library. Please install expat.])])
+LDFLAGS="$save_ldflags"
 AC_SUBST(EXPAT_LIBS)
 
 RPM_LIBS=""
@@ -186,15 +191,18 @@
 AS_IF([test "$with_rpm" != no],
       [if test "$with_rpm" != yes; then
 	    CPPFLAGS="$CPPFLAGS -I$with_rpm/include"
-            LDFLAGS="$LDFLAGS -L$with_rpm/lib"
        fi
        AC_CHECK_HEADERS(rpm/rpmlib.h, [], 
 		 [AC_MSG_ERROR([Can't find rpm/rpmlib.h. Please install rpm-devel or use --without-rpm.])])
-       AC_CHECK_LIB(rpm,rpmdbOpen,[RPM_LIBS="-lrpm"],
+       save_ldflags="$LDFLAGS"
+       LDFLAGS="$LDFLAGS -L$with_rpm/lib"
+       AC_CHECK_LIB(rpm,rpmdbOpen,[RPM_LIBS="-L$with_rpm/lib -lrpm"],
 	     [AC_MSG_ERROR([Can't find rpm library. Please install rpm-devel or use --without-rpm.])])
+       LDFLAGS="$save_ldflags"
        AC_DEFINE([HAVE_RPMLIB], [1], [Define if you have librpm])])
 AC_SUBST(RPM_LIBS)
 AM_CONDITIONAL([HAVE_RPMLIB], [test -n "$RPM_LIBS"])
+AC_SUBST(REQUIREMENTS)
 
 if test "x$GCC" = "xyes"; then
   LDFLAGS="-Wl,--as-needed $LDFLAGS"