Skip to content

Commit

Permalink
configure: Use KRB5CONFIG for krb5-config
Browse files Browse the repository at this point in the history
Allows the user to easier override its path.

Bug: http://curl.haxx.se/bug/view.cgi?id=1486
  • Loading branch information
dago authored and bagder committed Mar 30, 2015
1 parent 787c2ae commit 5b66860
Showing 1 changed file with 6 additions and 2 deletions.
8 changes: 6 additions & 2 deletions configure.ac
Expand Up @@ -1184,6 +1184,8 @@ AC_ARG_WITH(gssapi,
fi
])

: ${KRB5CONFIG:="$GSSAPI_ROOT/bin/krb5-config"}

save_CPPFLAGS="$CPPFLAGS"
AC_MSG_CHECKING([if GSS-API support is requested])
if test x"$want_gss" = xyes; then
Expand All @@ -1194,6 +1196,8 @@ if test x"$want_gss" = xyes; then
GSSAPI_INCS=`$GSSAPI_ROOT/bin/$host_alias-krb5-config --cflags gssapi`
elif test -f "$GSSAPI_ROOT/bin/krb5-config"; then
GSSAPI_INCS=`$GSSAPI_ROOT/bin/krb5-config --cflags gssapi`
elif test -f "$KRB5CONFIG"; then
GSSAPI_INCS=`$KRB5CONFIG --cflags gssapi`
elif test "$GSSAPI_ROOT" != "yes"; then
GSSAPI_INCS="-I$GSSAPI_ROOT/include"
fi
Expand Down Expand Up @@ -1283,10 +1287,10 @@ if test x"$want_gss" = xyes; then
dnl into LIBS
gss_libs=`$GSSAPI_ROOT/bin/$host_alias-krb5-config --libs gssapi`
LIBS="$gss_libs $LIBS"
elif test -f "$GSSAPI_ROOT/bin/krb5-config"; then
elif test -f "$KRB5CONFIG"; then
dnl krb5-config doesn't have --libs-only-L or similar, put everything
dnl into LIBS
gss_libs=`$GSSAPI_ROOT/bin/krb5-config --libs gssapi`
gss_libs=`$KRB5CONFIG --libs gssapi`
LIBS="$gss_libs $LIBS"
else
case $host in
Expand Down

2 comments on commit 5b66860

@dago
Copy link
Contributor Author

@dago dago commented on 5b66860 Mar 30, 2015

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think it would be good if L1197-L1198 would be removed as $KRB5CONFIG may have been set to a specific value whereas $GSSAPI_ROOT/bin/krb5-config does exist and falsely takes precedence. Also as the latter is the default it should be safe as L1199-L1200 are identical to them in the default case.

@bagder
Copy link
Member

@bagder bagder commented on 5b66860 Apr 26, 2015

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

thanks, pushed a follow-up fix

Please sign in to comment.