tyler.durden/openssh-portable
1
0
Fork 0
mirror of https://github.com/PowerShell/openssh-portable.git synced 2025-07-25 14:54:45 +02:00
Code Issues Packages Projects Releases Wiki Activity

Re-indent krb5 section after pkg-config addition.

Browse Source
This commit is contained in:
John Ericson 2020-12-26 11:40:49 -05:00 committed by Darren Tucker
parent 32dd2daa56
commit e860978134
1 changed files with 70 additions and 70 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

140
configure.ac
View File

@ -4618,82 +4618,82 @@ AC_ARG_WITH([kerberos5],
[AC_MSG_RESULT([no]) [AC_MSG_RESULT([no])
]) ])
else else
AC_PATH_TOOL([KRB5CONF], [krb5-config], AC_PATH_TOOL([KRB5CONF], [krb5-config],
[$KRB5ROOT/bin/krb5-config], [$KRB5ROOT/bin/krb5-config],
[$KRB5ROOT/bin:$PATH]) [$KRB5ROOT/bin:$PATH])
if test -x $KRB5CONF ; then if test -x $KRB5CONF ; then
K5CFLAGS="`$KRB5CONF --cflags`" K5CFLAGS="`$KRB5CONF --cflags`"
K5LIBS="`$KRB5CONF --libs`" K5LIBS="`$KRB5CONF --libs`"
CPPFLAGS="$CPPFLAGS $K5CFLAGS" CPPFLAGS="$CPPFLAGS $K5CFLAGS"
AC_MSG_CHECKING([for gssapi support]) AC_MSG_CHECKING([for gssapi support])
if $KRB5CONF | grep gssapi >/dev/null ; then if $KRB5CONF | grep gssapi >/dev/null ; then
AC_MSG_RESULT([yes]) AC_MSG_RESULT([yes])
AC_DEFINE([GSSAPI], [1], AC_DEFINE([GSSAPI], [1],
[Define this if you want GSSAPI [Define this if you want GSSAPI
support in the version 2 protocol]) support in the version 2 protocol])
GSSCFLAGS="`$KRB5CONF --cflags gssapi`" GSSCFLAGS="`$KRB5CONF --cflags gssapi`"
GSSLIBS="`$KRB5CONF --libs gssapi`" GSSLIBS="`$KRB5CONF --libs gssapi`"
CPPFLAGS="$CPPFLAGS $GSSCFLAGS" CPPFLAGS="$CPPFLAGS $GSSCFLAGS"
else else
AC_MSG_RESULT([no]) AC_MSG_RESULT([no])
fi fi
AC_MSG_CHECKING([whether we are using Heimdal]) AC_MSG_CHECKING([whether we are using Heimdal])
AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[ #include <krb5.h> AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[ #include <krb5.h>
]], [[ char *tmp = heimdal_version; ]])], ]], [[ char *tmp = heimdal_version; ]])],
[ AC_MSG_RESULT([yes])
AC_DEFINE([HEIMDAL], [1],
[Define this if you are using the Heimdal
version of Kerberos V5]) ],
[AC_MSG_RESULT([no])
])
else
CPPFLAGS="$CPPFLAGS -I${KRB5ROOT}/include"
LDFLAGS="$LDFLAGS -L${KRB5ROOT}/lib"
AC_MSG_CHECKING([whether we are using Heimdal])
AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[ #include <krb5.h>
]], [[ char *tmp = heimdal_version; ]])],
[ AC_MSG_RESULT([yes]) [ AC_MSG_RESULT([yes])
AC_DEFINE([HEIMDAL]) AC_DEFINE([HEIMDAL], [1],
K5LIBS="-lkrb5" [Define this if you are using the Heimdal
K5LIBS="$K5LIBS -lcom_err -lasn1" version of Kerberos V5]) ],
AC_CHECK_LIB([roken], [net_write], [AC_MSG_RESULT([no])
[K5LIBS="$K5LIBS -lroken"])
AC_CHECK_LIB([des], [des_cbc_encrypt],
[K5LIBS="$K5LIBS -ldes"])
], [ AC_MSG_RESULT([no])
K5LIBS="-lkrb5 -lk5crypto -lcom_err"
])
AC_SEARCH_LIBS([dn_expand], [resolv])
AC_CHECK_LIB([gssapi_krb5], [gss_init_sec_context],
[ AC_DEFINE([GSSAPI])
GSSLIBS="-lgssapi_krb5" ],
[ AC_CHECK_LIB([gssapi], [gss_init_sec_context],
[ AC_DEFINE([GSSAPI])
GSSLIBS="-lgssapi" ],
[ AC_CHECK_LIB([gss], [gss_init_sec_context],
[ AC_DEFINE([GSSAPI])
GSSLIBS="-lgss" ],
AC_MSG_WARN([Cannot find any suitable gss-api library - build may fail]))
])
]) ])
else
CPPFLAGS="$CPPFLAGS -I${KRB5ROOT}/include"
LDFLAGS="$LDFLAGS -L${KRB5ROOT}/lib"
AC_MSG_CHECKING([whether we are using Heimdal])
AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[ #include <krb5.h>
]], [[ char *tmp = heimdal_version; ]])],
[ AC_MSG_RESULT([yes])
AC_DEFINE([HEIMDAL])
K5LIBS="-lkrb5"
K5LIBS="$K5LIBS -lcom_err -lasn1"
AC_CHECK_LIB([roken], [net_write],
[K5LIBS="$K5LIBS -lroken"])
AC_CHECK_LIB([des], [des_cbc_encrypt],
[K5LIBS="$K5LIBS -ldes"])
], [ AC_MSG_RESULT([no])
K5LIBS="-lkrb5 -lk5crypto -lcom_err"
])
AC_SEARCH_LIBS([dn_expand], [resolv])
AC_CHECK_HEADER([gssapi.h], , AC_CHECK_LIB([gssapi_krb5], [gss_init_sec_context],
[ unset ac_cv_header_gssapi_h [ AC_DEFINE([GSSAPI])
CPPFLAGS="$CPPFLAGS -I${KRB5ROOT}/include/gssapi" GSSLIBS="-lgssapi_krb5" ],
AC_CHECK_HEADERS([gssapi.h], , [ AC_CHECK_LIB([gssapi], [gss_init_sec_context],
AC_MSG_WARN([Cannot find any suitable gss-api header - build may fail]) [ AC_DEFINE([GSSAPI])
) GSSLIBS="-lgssapi" ],
] [ AC_CHECK_LIB([gss], [gss_init_sec_context],
) [ AC_DEFINE([GSSAPI])
GSSLIBS="-lgss" ],
AC_MSG_WARN([Cannot find any suitable gss-api library - build may fail]))
])
])
oldCPP="$CPPFLAGS" AC_CHECK_HEADER([gssapi.h], ,
CPPFLAGS="$CPPFLAGS -I${KRB5ROOT}/include/gssapi" [ unset ac_cv_header_gssapi_h
AC_CHECK_HEADER([gssapi_krb5.h], , CPPFLAGS="$CPPFLAGS -I${KRB5ROOT}/include/gssapi"
[ CPPFLAGS="$oldCPP" ]) AC_CHECK_HEADERS([gssapi.h], ,
AC_MSG_WARN([Cannot find any suitable gss-api header - build may fail])
)
]
)
fi oldCPP="$CPPFLAGS"
CPPFLAGS="$CPPFLAGS -I${KRB5ROOT}/include/gssapi"
AC_CHECK_HEADER([gssapi_krb5.h], ,
[ CPPFLAGS="$oldCPP" ])
fi
fi fi
if test -n "${rpath_opt}" ; then if test -n "${rpath_opt}" ; then
LDFLAGS="$LDFLAGS ${rpath_opt}${KRB5ROOT}/lib" LDFLAGS="$LDFLAGS ${rpath_opt}${KRB5ROOT}/lib"