(try to) use LIBS for libraries (-l) and LDFLAGS for paths (-L) in the

gssapi check. Cleans up curl-config --libs output when REQUIRE_LIB_DEPS=no
This commit is contained in:
Michal Marek 2008-03-10 09:56:49 +00:00
parent 82e095a275
commit 9bb51d767e
1 changed files with 11 additions and 6 deletions

View File

@ -1010,18 +1010,23 @@ if test x"$want_gss" = xyes; then
if test -n "$gnu_gss"; then if test -n "$gnu_gss"; then
curl_gss_msg="enabled (GNU GSS)" curl_gss_msg="enabled (GNU GSS)"
LDFLAGS="$LDFLAGS $GSSAPI_LIB_DIR -lgss" LDFLAGS="$LDFLAGS $GSSAPI_LIB_DIR"
LIBS="$LIBS -lgss"
elif test -z "$GSSAPI_LIB_DIR"; then elif test -z "$GSSAPI_LIB_DIR"; then
if test -f "$GSSAPI_ROOT/bin/krb5-config"; then if test -f "$GSSAPI_ROOT/bin/krb5-config"; then
gss_ldflags=`$GSSAPI_ROOT/bin/krb5-config --libs gssapi` dnl krb5-config doesn't have --libs-only-L or similar, put everything
LDFLAGS="$LDFLAGS $gss_ldflags" dnl into LIBS
gss_libs=`$GSSAPI_ROOT/bin/krb5-config --libs gssapi`
LIBS="$LIBS $gss_libs"
elif test "$GSSAPI_ROOT" != "yes"; then elif test "$GSSAPI_ROOT" != "yes"; then
LDFLAGS="$LDFLAGS -L$GSSAPI_ROOT/lib$libsuff -lgssapi" LDFLAGS="$LDFLAGS -L$GSSAPI_ROOT/lib$libsuff"
LIBS="$LIBS -lgssapi"
else else
LDFLAGS="$LDFLAGS -lgssapi" LIBS="$LIBS -lgssapi"
fi fi
else else
LDFLAGS="$LDFLAGS $GSSAPI_LIB_DIR -lgssapi" LDFLAGS="$LDFLAGS $GSSAPI_LIB_DIR"
LIBS="$LIBS -lgssapi"
fi fi
else else
CPPFLAGS="$save_CPPFLAGS" CPPFLAGS="$save_CPPFLAGS"