summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog4
-rw-r--r--Makefile.in8
-rw-r--r--configure.ac28
3 files changed, 23 insertions, 17 deletions
diff --git a/ChangeLog b/ChangeLog
index a87e7fb5a..706ec6262 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
120120222
2 - (dtucker) [Makefile.in configure.ac] bz#2072: don't link krb5 libs to
3 ssh(1) since they're not needed. Patch from Pierre Ossman.
4
120130221 520130221
2 - (tim) [regress/forward-control.sh] shell portability fix. 6 - (tim) [regress/forward-control.sh] shell portability fix.
3 7
diff --git a/Makefile.in b/Makefile.in
index 44d594441..6067063a2 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -1,4 +1,4 @@
1# $Id: Makefile.in,v 1.332 2013/02/20 03:01:51 tim Exp $ 1# $Id: Makefile.in,v 1.333 2013/02/21 23:40:00 dtucker Exp $
2 2
3# uncomment if you run a non bourne compatable shell. Ie. csh 3# uncomment if you run a non bourne compatable shell. Ie. csh
4#SHELL = @SH@ 4#SHELL = @SH@
@@ -44,6 +44,8 @@ LD=@LD@
44CFLAGS=@CFLAGS@ 44CFLAGS=@CFLAGS@
45CPPFLAGS=-I. -I$(srcdir) @CPPFLAGS@ $(PATHS) @DEFS@ 45CPPFLAGS=-I. -I$(srcdir) @CPPFLAGS@ $(PATHS) @DEFS@
46LIBS=@LIBS@ 46LIBS=@LIBS@
47K5LIBS=@K5LIBS@
48GSSLIBS=@GSSLIBS@
47SSHLIBS=@SSHLIBS@ 49SSHLIBS=@SSHLIBS@
48SSHDLIBS=@SSHDLIBS@ 50SSHDLIBS=@SSHDLIBS@
49LIBEDIT=@LIBEDIT@ 51LIBEDIT=@LIBEDIT@
@@ -139,10 +141,10 @@ libssh.a: $(LIBSSH_OBJS)
139 $(RANLIB) $@ 141 $(RANLIB) $@
140 142
141ssh$(EXEEXT): $(LIBCOMPAT) libssh.a $(SSHOBJS) 143ssh$(EXEEXT): $(LIBCOMPAT) libssh.a $(SSHOBJS)
142 $(LD) -o $@ $(SSHOBJS) $(LDFLAGS) -lssh -lopenbsd-compat $(SSHLIBS) $(LIBS) 144 $(LD) -o $@ $(SSHOBJS) $(LDFLAGS) -lssh -lopenbsd-compat $(SSHLIBS) $(LIBS) $(GSSLIBS)
143 145
144sshd$(EXEEXT): libssh.a $(LIBCOMPAT) $(SSHDOBJS) 146sshd$(EXEEXT): libssh.a $(LIBCOMPAT) $(SSHDOBJS)
145 $(LD) -o $@ $(SSHDOBJS) $(LDFLAGS) -lssh -lopenbsd-compat $(SSHDLIBS) $(LIBS) 147 $(LD) -o $@ $(SSHDOBJS) $(LDFLAGS) -lssh -lopenbsd-compat $(SSHDLIBS) $(LIBS) $(GSSLIBS) $(K5LIBS)
146 148
147scp$(EXEEXT): $(LIBCOMPAT) libssh.a scp.o progressmeter.o 149scp$(EXEEXT): $(LIBCOMPAT) libssh.a scp.o progressmeter.o
148 $(LD) -o $@ scp.o progressmeter.o bufaux.o $(LDFLAGS) -lssh -lopenbsd-compat $(LIBS) 150 $(LD) -o $@ scp.o progressmeter.o bufaux.o $(LDFLAGS) -lssh -lopenbsd-compat $(LIBS)
diff --git a/configure.ac b/configure.ac
index d62323d97..088bcb652 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,4 +1,4 @@
1# $Id: configure.ac,v 1.505 2013/02/15 01:13:01 dtucker Exp $ 1# $Id: configure.ac,v 1.506 2013/02/21 23:40:00 dtucker Exp $
2# 2#
3# Copyright (c) 1999-2004 Damien Miller 3# Copyright (c) 1999-2004 Damien Miller
4# 4#
@@ -15,7 +15,7 @@
15# OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. 15# OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
16 16
17AC_INIT([OpenSSH], [Portable], [openssh-unix-dev@mindrot.org]) 17AC_INIT([OpenSSH], [Portable], [openssh-unix-dev@mindrot.org])
18AC_REVISION($Revision: 1.505 $) 18AC_REVISION($Revision: 1.506 $)
19AC_CONFIG_SRCDIR([ssh.c]) 19AC_CONFIG_SRCDIR([ssh.c])
20AC_LANG([C]) 20AC_LANG([C])
21 21
@@ -3624,6 +3624,9 @@ AC_ARG_WITH([kerberos5],
3624 [$KRB5ROOT/bin/krb5-config], 3624 [$KRB5ROOT/bin/krb5-config],
3625 [$KRB5ROOT/bin:$PATH]) 3625 [$KRB5ROOT/bin:$PATH])
3626 if test -x $KRB5CONF ; then 3626 if test -x $KRB5CONF ; then
3627 K5CFLAGS="`$KRB5CONF --cflags`"
3628 K5LIBS="`$KRB5CONF --libs`"
3629 CPPFLAGS="$CPPFLAGS $K5CFLAGS"
3627 3630
3628 AC_MSG_CHECKING([for gssapi support]) 3631 AC_MSG_CHECKING([for gssapi support])
3629 if $KRB5CONF | grep gssapi >/dev/null ; then 3632 if $KRB5CONF | grep gssapi >/dev/null ; then
@@ -3631,14 +3634,12 @@ AC_ARG_WITH([kerberos5],
3631 AC_DEFINE([GSSAPI], [1], 3634 AC_DEFINE([GSSAPI], [1],
3632 [Define this if you want GSSAPI 3635 [Define this if you want GSSAPI
3633 support in the version 2 protocol]) 3636 support in the version 2 protocol])
3634 k5confopts=gssapi 3637 GSSCFLAGS="`$KRB5CONF --cflags gssapi`"
3638 GSSLIBS="`$KRB5CONF --libs gssapi`"
3639 CPPFLAGS="$CPPFLAGS $GSSCFLAGS"
3635 else 3640 else
3636 AC_MSG_RESULT([no]) 3641 AC_MSG_RESULT([no])
3637 k5confopts=""
3638 fi 3642 fi
3639 K5CFLAGS="`$KRB5CONF --cflags $k5confopts`"
3640 K5LIBS="`$KRB5CONF --libs $k5confopts`"
3641 CPPFLAGS="$CPPFLAGS $K5CFLAGS"
3642 AC_MSG_CHECKING([whether we are using Heimdal]) 3643 AC_MSG_CHECKING([whether we are using Heimdal])
3643 AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[ #include <krb5.h> 3644 AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[ #include <krb5.h>
3644 ]], [[ char *tmp = heimdal_version; ]])], 3645 ]], [[ char *tmp = heimdal_version; ]])],
@@ -3670,14 +3671,12 @@ AC_ARG_WITH([kerberos5],
3670 3671
3671 AC_CHECK_LIB([gssapi_krb5], [gss_init_sec_context], 3672 AC_CHECK_LIB([gssapi_krb5], [gss_init_sec_context],
3672 [ AC_DEFINE([GSSAPI]) 3673 [ AC_DEFINE([GSSAPI])
3673 K5LIBS="-lgssapi_krb5 $K5LIBS" ], 3674 GSSLIBS="-lgssapi_krb5" ],
3674 [ AC_CHECK_LIB([gssapi], [gss_init_sec_context], 3675 [ AC_CHECK_LIB([gssapi], [gss_init_sec_context],
3675 [ AC_DEFINE([GSSAPI]) 3676 [ AC_DEFINE([GSSAPI])
3676 K5LIBS="-lgssapi $K5LIBS" ], 3677 GSSLIBS="-lgssapi" ],
3677 AC_MSG_WARN([Cannot find any suitable gss-api library - build may fail]), 3678 AC_MSG_WARN([Cannot find any suitable gss-api library - build may fail]))
3678 $K5LIBS) 3679 ])
3679 ],
3680 $K5LIBS)
3681 3680
3682 AC_CHECK_HEADER([gssapi.h], , 3681 AC_CHECK_HEADER([gssapi.h], ,
3683 [ unset ac_cv_header_gssapi_h 3682 [ unset ac_cv_header_gssapi_h
@@ -3705,12 +3704,13 @@ AC_ARG_WITH([kerberos5],
3705 AC_CHECK_HEADERS([gssapi_krb5.h gssapi/gssapi_krb5.h]) 3704 AC_CHECK_HEADERS([gssapi_krb5.h gssapi/gssapi_krb5.h])
3706 AC_CHECK_HEADERS([gssapi_generic.h gssapi/gssapi_generic.h]) 3705 AC_CHECK_HEADERS([gssapi_generic.h gssapi/gssapi_generic.h])
3707 3706
3708 LIBS="$LIBS $K5LIBS"
3709 AC_SEARCH_LIBS([k_hasafs], [kafs], [AC_DEFINE([USE_AFS], [1], 3707 AC_SEARCH_LIBS([k_hasafs], [kafs], [AC_DEFINE([USE_AFS], [1],
3710 [Define this if you want to use libkafs' AFS support])]) 3708 [Define this if you want to use libkafs' AFS support])])
3711 fi 3709 fi
3712 ] 3710 ]
3713) 3711)
3712AC_SUBST([GSSLIBS])
3713AC_SUBST([K5LIBS])
3714 3714
3715# Looking for programs, paths and files 3715# Looking for programs, paths and files
3716 3716