tyler.durden
/
openssh-portable
mirror of https://github.com/PowerShell/openssh-portable.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

- (dtucker) [Makefile.in configure.ac] bz#2072: don't link krb5 libs to 

ssh(1) since they're not needed.  Patch from Pierre Ossman.
This commit is contained in:
Darren Tucker 2013-02-22 10:39:59 +11:00
parent 0ec7423692
commit 964de184a8
3 changed files with 23 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
ChangeLog
View File

@ -1,3 +1,7 @@
20120222
- (dtucker) [Makefile.in configure.ac] bz#2072: don't link krb5 libs to
ssh(1) since they're not needed. Patch from Pierre Ossman.
20130221 20130221
- (tim) [regress/forward-control.sh] shell portability fix. - (tim) [regress/forward-control.sh] shell portability fix.

8
Makefile.in
View File

@ -1,4 +1,4 @@
# $Id: Makefile.in,v 1.332 2013/02/20 03:01:51 tim Exp $ # $Id: Makefile.in,v 1.333 2013/02/21 23:40:00 dtucker Exp $
# uncomment if you run a non bourne compatable shell. Ie. csh # uncomment if you run a non bourne compatable shell. Ie. csh
#SHELL = @SH@ #SHELL = @SH@
@ -44,6 +44,8 @@ LD=@LD@
CFLAGS=@CFLAGS@ CFLAGS=@CFLAGS@
CPPFLAGS=-I. -I$(srcdir) @CPPFLAGS@ $(PATHS) @DEFS@ CPPFLAGS=-I. -I$(srcdir) @CPPFLAGS@ $(PATHS) @DEFS@
LIBS=@LIBS@ LIBS=@LIBS@
K5LIBS=@K5LIBS@
GSSLIBS=@GSSLIBS@
SSHLIBS=@SSHLIBS@ SSHLIBS=@SSHLIBS@
SSHDLIBS=@SSHDLIBS@ SSHDLIBS=@SSHDLIBS@
LIBEDIT=@LIBEDIT@ LIBEDIT=@LIBEDIT@
@ -139,10 +141,10 @@ libssh.a: $(LIBSSH_OBJS)
$(RANLIB) $@ $(RANLIB) $@
ssh$(EXEEXT): $(LIBCOMPAT) libssh.a $(SSHOBJS) ssh$(EXEEXT): $(LIBCOMPAT) libssh.a $(SSHOBJS)
$(LD) -o $@ $(SSHOBJS) $(LDFLAGS) -lssh -lopenbsd-compat $(SSHLIBS) $(LIBS) $(LD) -o $@ $(SSHOBJS) $(LDFLAGS) -lssh -lopenbsd-compat $(SSHLIBS) $(LIBS) $(GSSLIBS)
sshd$(EXEEXT): libssh.a $(LIBCOMPAT) $(SSHDOBJS) sshd$(EXEEXT): libssh.a $(LIBCOMPAT) $(SSHDOBJS)
$(LD) -o $@ $(SSHDOBJS) $(LDFLAGS) -lssh -lopenbsd-compat $(SSHDLIBS) $(LIBS) $(LD) -o $@ $(SSHDOBJS) $(LDFLAGS) -lssh -lopenbsd-compat $(SSHDLIBS) $(LIBS) $(GSSLIBS) $(K5LIBS)
scp$(EXEEXT): $(LIBCOMPAT) libssh.a scp.o progressmeter.o scp$(EXEEXT): $(LIBCOMPAT) libssh.a scp.o progressmeter.o
$(LD) -o $@ scp.o progressmeter.o bufaux.o $(LDFLAGS) -lssh -lopenbsd-compat $(LIBS) $(LD) -o $@ scp.o progressmeter.o bufaux.o $(LDFLAGS) -lssh -lopenbsd-compat $(LIBS)

28
configure.ac
View File

@ -1,4 +1,4 @@
# $Id: configure.ac,v 1.505 2013/02/15 01:13:01 dtucker Exp $ # $Id: configure.ac,v 1.506 2013/02/21 23:40:00 dtucker Exp $
# #
# Copyright (c) 1999-2004 Damien Miller # Copyright (c) 1999-2004 Damien Miller
# #
@ -15,7 +15,7 @@
# OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. # OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
AC_INIT([OpenSSH], [Portable], [openssh-unix-dev@mindrot.org]) AC_INIT([OpenSSH], [Portable], [openssh-unix-dev@mindrot.org])
AC_REVISION($Revision: 1.505 $) AC_REVISION($Revision: 1.506 $)
AC_CONFIG_SRCDIR([ssh.c]) AC_CONFIG_SRCDIR([ssh.c])
AC_LANG([C]) AC_LANG([C])
@ -3624,6 +3624,9 @@ AC_ARG_WITH([kerberos5],
[$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`"
K5LIBS="`$KRB5CONF --libs`"
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
@ -3631,14 +3634,12 @@ AC_ARG_WITH([kerberos5],
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])
k5confopts=gssapi GSSCFLAGS="`$KRB5CONF --cflags gssapi`"
GSSLIBS="`$KRB5CONF --libs gssapi`"
CPPFLAGS="$CPPFLAGS $GSSCFLAGS"
else else
AC_MSG_RESULT([no]) AC_MSG_RESULT([no])
k5confopts=""
fi fi
K5CFLAGS="`$KRB5CONF --cflags $k5confopts`"
K5LIBS="`$KRB5CONF --libs $k5confopts`"
CPPFLAGS="$CPPFLAGS $K5CFLAGS"
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; ]])],
@ -3670,14 +3671,12 @@ AC_ARG_WITH([kerberos5],
AC_CHECK_LIB([gssapi_krb5], [gss_init_sec_context], AC_CHECK_LIB([gssapi_krb5], [gss_init_sec_context],
[ AC_DEFINE([GSSAPI]) [ AC_DEFINE([GSSAPI])
K5LIBS="-lgssapi_krb5 $K5LIBS" ], GSSLIBS="-lgssapi_krb5" ],
[ AC_CHECK_LIB([gssapi], [gss_init_sec_context], [ AC_CHECK_LIB([gssapi], [gss_init_sec_context],
[ AC_DEFINE([GSSAPI]) [ AC_DEFINE([GSSAPI])
K5LIBS="-lgssapi $K5LIBS" ], GSSLIBS="-lgssapi" ],
AC_MSG_WARN([Cannot find any suitable gss-api library - build may fail]), AC_MSG_WARN([Cannot find any suitable gss-api library - build may fail]))
$K5LIBS) ])
],
$K5LIBS)
AC_CHECK_HEADER([gssapi.h], , AC_CHECK_HEADER([gssapi.h], ,
[ unset ac_cv_header_gssapi_h [ unset ac_cv_header_gssapi_h
@ -3705,12 +3704,13 @@ AC_ARG_WITH([kerberos5],
AC_CHECK_HEADERS([gssapi_krb5.h gssapi/gssapi_krb5.h]) AC_CHECK_HEADERS([gssapi_krb5.h gssapi/gssapi_krb5.h])
AC_CHECK_HEADERS([gssapi_generic.h gssapi/gssapi_generic.h]) AC_CHECK_HEADERS([gssapi_generic.h gssapi/gssapi_generic.h])
LIBS="$LIBS $K5LIBS"
AC_SEARCH_LIBS([k_hasafs], [kafs], [AC_DEFINE([USE_AFS], [1], AC_SEARCH_LIBS([k_hasafs], [kafs], [AC_DEFINE([USE_AFS], [1],
[Define this if you want to use libkafs' AFS support])]) [Define this if you want to use libkafs' AFS support])])
fi fi
] ]
) )
AC_SUBST([GSSLIBS])
AC_SUBST([K5LIBS])
# Looking for programs, paths and files # Looking for programs, paths and files