Skip to content

Commit 5b66860

Browse files
dagobagder
authored andcommitted
configure: Use KRB5CONFIG for krb5-config
Allows the user to easier override its path. Bug: http://curl.haxx.se/bug/view.cgi?id=1486
1 parent 787c2ae commit 5b66860

File tree

1 file changed

+6
-2
lines changed

1 file changed

+6
-2
lines changed

configure.ac

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1184,6 +1184,8 @@ AC_ARG_WITH(gssapi,
11841184
fi
11851185
])
11861186

1187+
: ${KRB5CONFIG:="$GSSAPI_ROOT/bin/krb5-config"}
1188+
11871189
save_CPPFLAGS="$CPPFLAGS"
11881190
AC_MSG_CHECKING([if GSS-API support is requested])
11891191
if test x"$want_gss" = xyes; then
@@ -1194,6 +1196,8 @@ if test x"$want_gss" = xyes; then
11941196
GSSAPI_INCS=`$GSSAPI_ROOT/bin/$host_alias-krb5-config --cflags gssapi`
11951197
elif test -f "$GSSAPI_ROOT/bin/krb5-config"; then
11961198
GSSAPI_INCS=`$GSSAPI_ROOT/bin/krb5-config --cflags gssapi`
1199+
elif test -f "$KRB5CONFIG"; then
1200+
GSSAPI_INCS=`$KRB5CONFIG --cflags gssapi`
11971201
elif test "$GSSAPI_ROOT" != "yes"; then
11981202
GSSAPI_INCS="-I$GSSAPI_ROOT/include"
11991203
fi
@@ -1283,10 +1287,10 @@ if test x"$want_gss" = xyes; then
12831287
dnl into LIBS
12841288
gss_libs=`$GSSAPI_ROOT/bin/$host_alias-krb5-config --libs gssapi`
12851289
LIBS="$gss_libs $LIBS"
1286-
elif test -f "$GSSAPI_ROOT/bin/krb5-config"; then
1290+
elif test -f "$KRB5CONFIG"; then
12871291
dnl krb5-config doesn't have --libs-only-L or similar, put everything
12881292
dnl into LIBS
1289-
gss_libs=`$GSSAPI_ROOT/bin/krb5-config --libs gssapi`
1293+
gss_libs=`$KRB5CONFIG --libs gssapi`
12901294
LIBS="$gss_libs $LIBS"
12911295
else
12921296
case $host in

0 commit comments

Comments
 (0)