moparisthebest/curl
1
0
Fork 0
mirror of https://github.com/moparisthebest/curl synced 2025-01-03 18:08:02 -05:00
Code Issues Releases Wiki Activity

configure: Use KRB5CONFIG for krb5-config

Browse Source 
Allows the user to easier override its path.

Bug: http://curl.haxx.se/bug/view.cgi?id=1486
This commit is contained in:
Dagobert Michelsen 2015-03-30 14:18:21 +02:00 committed by Daniel Stenberg
parent 787c2ae91b
commit 5b66860652
1 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
configure.ac
View File

@ -1184,6 +1184,8 @@ AC_ARG_WITH(gssapi,
fi fi
]) ])
: ${KRB5CONFIG:="$GSSAPI_ROOT/bin/krb5-config"}
save_CPPFLAGS="$CPPFLAGS" save_CPPFLAGS="$CPPFLAGS"
AC_MSG_CHECKING([if GSS-API support is requested]) AC_MSG_CHECKING([if GSS-API support is requested])
if test x"$want_gss" = xyes; then 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` GSSAPI_INCS=`$GSSAPI_ROOT/bin/$host_alias-krb5-config --cflags gssapi`
elif test -f "$GSSAPI_ROOT/bin/krb5-config"; then elif test -f "$GSSAPI_ROOT/bin/krb5-config"; then
GSSAPI_INCS=`$GSSAPI_ROOT/bin/krb5-config --cflags gssapi` 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 elif test "$GSSAPI_ROOT" != "yes"; then
GSSAPI_INCS="-I$GSSAPI_ROOT/include" GSSAPI_INCS="-I$GSSAPI_ROOT/include"
fi fi
@ -1283,10 +1287,10 @@ if test x"$want_gss" = xyes; then
dnl into LIBS dnl into LIBS
gss_libs=`$GSSAPI_ROOT/bin/$host_alias-krb5-config --libs gssapi` gss_libs=`$GSSAPI_ROOT/bin/$host_alias-krb5-config --libs gssapi`
LIBS="$gss_libs $LIBS" 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 krb5-config doesn't have --libs-only-L or similar, put everything
dnl into LIBS dnl into LIBS
gss_libs=`$GSSAPI_ROOT/bin/krb5-config --libs gssapi` gss_libs=`$KRB5CONFIG --libs gssapi`
LIBS="$gss_libs $LIBS" LIBS="$gss_libs $LIBS"
else else
case $host in case $host in