1.1 --- a/configure.ac	Fri Jan 09 15:28:50 2009 +0000
     1.2 +++ b/configure.ac	Mon Jan 12 18:53:02 2009 +0000
     1.3 @@ -138,7 +138,7 @@
     1.4  fi
     1.5  AC_MSG_RESULT($have_gcc4)
     1.6  
     1.7 -
     1.8 +REQUIREMENTS=""
     1.9  AC_ARG_WITH([curl],
    1.10              [AS_HELP_STRING([--without-curl], [disable support for curl])],
    1.11              [],
    1.12 @@ -148,6 +148,7 @@
    1.13  CURL_LIBS=
    1.14  AS_IF([test "x$with_curl" != xno],
    1.15    [PKG_CHECK_MODULES(CURL, [libcurl])
    1.16 +   REQUIREMENTS="$REQUIREMENTS libcurl"
    1.17     AC_DEFINE([HAVE_CURL], [1], [Define if you have curl])])
    1.18  AC_SUBST(CURL_CFLAGS)
    1.19  AC_SUBST(CURL_LIBS)
    1.20 @@ -157,13 +158,15 @@
    1.21                        [
    1.22                        zlib=$withval
    1.23                        CPPFLAGS="$CPPFLAGS -I$withval/include"
    1.24 -                      LDFLAGS="$LDFLAGS -L$withval/lib"
    1.25                        ]
    1.26                        )
    1.27  AC_CHECK_HEADERS(zlib.h, [AC_DEFINE(HAVE_ZLIB_H)],
    1.28                   [AC_MSG_ERROR([Can't find zlib.h. Please install zlib.])])
    1.29 -AC_CHECK_LIB(z, inflate, [ZLIB_LIBS="-lz"],
    1.30 +save_ldflags="$LDFLAGS"
    1.31 +LDFLAGS="$LDFLAGS -L$zlib/lib"
    1.32 +AC_CHECK_LIB(z, inflate, [ZLIB_LIBS="-L$zlib/lib -lz"],
    1.33  	     [AC_MSG_ERROR([Can't find zlib library. Please install zlib.])])
    1.34 +LDFLAGS="$save_ldflags"
    1.35  AC_SUBST(ZLIB_LIBS)
    1.36  
    1.37  EXPAT_LIB=""
    1.38 @@ -171,13 +174,15 @@
    1.39                        [
    1.40                        expat=$withval
    1.41                        CPPFLAGS="$CPPFLAGS -I$withval/include"
    1.42 -                      LDFLAGS="$LDFLAGS -L$withval/lib"
    1.43                        ]
    1.44                        )
    1.45  AC_CHECK_HEADERS(expat.h, [AC_DEFINE(HAVE_EXPAT_H)], 
    1.46  		 [AC_MSG_ERROR([Can't find expat.h. Please install expat.])])
    1.47 -AC_CHECK_LIB(expat, XML_ParserCreate, [EXPAT_LIBS="-lexpat"],
    1.48 +save_ldflags="$LDFLAGS"
    1.49 +LDFLAGS="$LDFLAGS -L$expat/lib"
    1.50 +AC_CHECK_LIB(expat, XML_ParserCreate, [EXPAT_LIBS="-L$expat/lib -lexpat"],
    1.51  	     [AC_MSG_ERROR([Can't find expat library. Please install expat.])])
    1.52 +LDFLAGS="$save_ldflags"
    1.53  AC_SUBST(EXPAT_LIBS)
    1.54  
    1.55  RPM_LIBS=""
    1.56 @@ -186,15 +191,18 @@
    1.57  AS_IF([test "$with_rpm" != no],
    1.58        [if test "$with_rpm" != yes; then
    1.59  	    CPPFLAGS="$CPPFLAGS -I$with_rpm/include"
    1.60 -            LDFLAGS="$LDFLAGS -L$with_rpm/lib"
    1.61         fi
    1.62         AC_CHECK_HEADERS(rpm/rpmlib.h, [], 
    1.63  		 [AC_MSG_ERROR([Can't find rpm/rpmlib.h. Please install rpm-devel or use --without-rpm.])])
    1.64 -       AC_CHECK_LIB(rpm,rpmdbOpen,[RPM_LIBS="-lrpm"],
    1.65 +       save_ldflags="$LDFLAGS"
    1.66 +       LDFLAGS="$LDFLAGS -L$with_rpm/lib"
    1.67 +       AC_CHECK_LIB(rpm,rpmdbOpen,[RPM_LIBS="-L$with_rpm/lib -lrpm"],
    1.68  	     [AC_MSG_ERROR([Can't find rpm library. Please install rpm-devel or use --without-rpm.])])
    1.69 +       LDFLAGS="$save_ldflags"
    1.70         AC_DEFINE([HAVE_RPMLIB], [1], [Define if you have librpm])])
    1.71  AC_SUBST(RPM_LIBS)
    1.72  AM_CONDITIONAL([HAVE_RPMLIB], [test -n "$RPM_LIBS"])
    1.73 +AC_SUBST(REQUIREMENTS)
    1.74  
    1.75  if test "x$GCC" = "xyes"; then
    1.76    LDFLAGS="-Wl,--as-needed $LDFLAGS"