Permalink
Browse files

configure: Use KRB5CONFIG for krb5-config

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 5b668606527613179d0349f21b4ab0df2971e3d2
Showing with 6 additions and 2 deletions.
  1. +6 −2 configure.ac
View
@@ -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
@@ -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
@@ -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

2 comments on commit 5b66860

@dago

This comment has been minimized.

Show comment
Hide comment
@dago

dago Mar 30, 2015

Contributor

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.

Contributor

dago replied Mar 30, 2015

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

This comment has been minimized.

Show comment
Hide comment
@bagder

bagder Apr 26, 2015

Member

thanks, pushed a follow-up fix

Member

bagder replied Apr 26, 2015

thanks, pushed a follow-up fix

Please sign in to comment.