tyler.durden/openssh-portable
1
0
Fork 0
mirror of https://github.com/PowerShell/openssh-portable.git synced 2025-09-26 03:18:54 +02:00
Code Issues Packages Projects Releases Wiki Activity

modified: configure.ac

Browse Source 
whitspace clean up. No code changes.
This commit is contained in:
Tim Rice 2016-05-31 11:13:22 -07:00
parent 604a037d84
commit e1d93705f8
1 changed files with 47 additions and 48 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
configure.ac
View File

@ -1437,7 +1437,7 @@ AC_ARG_WITH([skey],
AC_MSG_RESULT([no]) AC_MSG_RESULT([no])
AC_MSG_ERROR([** Incomplete or missing s/key libraries.]) AC_MSG_ERROR([** Incomplete or missing s/key libraries.])
]) ])
AC_MSG_CHECKING([if skeychallenge takes 4 arguments]) AC_MSG_CHECKING([if skeychallenge takes 4 arguments])
AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[ AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[
#include <stdio.h> #include <stdio.h>
#include <skey.h> #include <skey.h>
@ -1500,7 +1500,7 @@ AC_ARG_WITH([libedit],
AC_PATH_TOOL([PKGCONFIG], [pkg-config], [no]) AC_PATH_TOOL([PKGCONFIG], [pkg-config], [no])
if test "x$PKGCONFIG" != "xno"; then if test "x$PKGCONFIG" != "xno"; then
AC_MSG_CHECKING([if $PKGCONFIG knows about libedit]) AC_MSG_CHECKING([if $PKGCONFIG knows about libedit])
if "$PKGCONFIG" libedit; then if "$PKGCONFIG" libedit; then
AC_MSG_RESULT([yes]) AC_MSG_RESULT([yes])
use_pkgconfig_for_libedit=yes use_pkgconfig_for_libedit=yes
else else
@ -1571,9 +1571,9 @@ AC_ARG_WITH([audit],
AC_CHECK_FUNCS([getaudit_addr aug_get_machine]) AC_CHECK_FUNCS([getaudit_addr aug_get_machine])
AC_DEFINE([USE_BSM_AUDIT], [1], [Use BSM audit module]) AC_DEFINE([USE_BSM_AUDIT], [1], [Use BSM audit module])
if test "$sol2ver" -ge 11; then if test "$sol2ver" -ge 11; then
SSHDLIBS="$SSHDLIBS -lscf" SSHDLIBS="$SSHDLIBS -lscf"
AC_DEFINE([BROKEN_BSM_API], [1], AC_DEFINE([BROKEN_BSM_API], [1],
[The system has incomplete BSM API]) [The system has incomplete BSM API])
fi fi
;; ;;
linux) linux)
@ -2796,7 +2796,7 @@ AC_CHECK_LIB([iaf], [ia_openinfo], [
LIBS="$LIBS -liaf" LIBS="$LIBS -liaf"
AC_CHECK_FUNCS([set_id], [SSHDLIBS="$SSHDLIBS -liaf" AC_CHECK_FUNCS([set_id], [SSHDLIBS="$SSHDLIBS -liaf"
AC_DEFINE([HAVE_LIBIAF], [1], AC_DEFINE([HAVE_LIBIAF], [1],
[Define if system has libiaf that supports set_id]) [Define if system has libiaf that supports set_id])
]) ])
]) ])
LIBS="$saved_LIBS" LIBS="$saved_LIBS"
@ -4113,7 +4113,6 @@ AC_ARG_WITH([kerberos5],
[K5LIBS="$K5LIBS -ldes"]) [K5LIBS="$K5LIBS -ldes"])
], [ AC_MSG_RESULT([no]) ], [ AC_MSG_RESULT([no])
K5LIBS="-lkrb5 -lk5crypto -lcom_err" K5LIBS="-lkrb5 -lk5crypto -lcom_err"
]) ])
AC_SEARCH_LIBS([dn_expand], [resolv]) AC_SEARCH_LIBS([dn_expand], [resolv])
@ -4296,7 +4295,7 @@ AC_ARG_WITH([maildir],
exit(0); exit(0);
]])], ]])],
[ [
maildir_what=`awk -F: '{print $1}' conftest.maildir` maildir_what=`awk -F: '{print $1}' conftest.maildir`
maildir=`awk -F: '{print $2}' conftest.maildir \ maildir=`awk -F: '{print $2}' conftest.maildir \
| sed 's|/$||'` | sed 's|/$||'`
AC_MSG_RESULT([Using: $maildir from $maildir_what]) AC_MSG_RESULT([Using: $maildir from $maildir_what])