View | Details | Raw Unified | Return to bug 2072
Collapse All | Expand All

(-)Makefile.in (-2 / +4 lines)
Lines 44-49 Link Here
44
CFLAGS=@CFLAGS@
44
CFLAGS=@CFLAGS@
45
CPPFLAGS=-I. -I$(srcdir) @CPPFLAGS@ $(PATHS) @DEFS@
45
CPPFLAGS=-I. -I$(srcdir) @CPPFLAGS@ $(PATHS) @DEFS@
46
LIBS=@LIBS@
46
LIBS=@LIBS@
47
K5LIBS=@K5LIBS@
48
GSSLIBS=@GSSLIBS@
47
SSHLIBS=@SSHLIBS@
49
SSHLIBS=@SSHLIBS@
48
SSHDLIBS=@SSHDLIBS@
50
SSHDLIBS=@SSHDLIBS@
49
LIBEDIT=@LIBEDIT@
51
LIBEDIT=@LIBEDIT@
Lines 139-148 Link Here
139
	$(RANLIB) $@
141
	$(RANLIB) $@
140
142
141
ssh$(EXEEXT): $(LIBCOMPAT) libssh.a $(SSHOBJS)
143
ssh$(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
144
sshd$(EXEEXT): libssh.a	$(LIBCOMPAT) $(SSHDOBJS)
146
sshd$(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
147
scp$(EXEEXT): $(LIBCOMPAT) libssh.a scp.o progressmeter.o
149
scp$(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)
(-)configure.ac (-12 / +12 lines)
Lines 3560-3565 Link Here
3560
			     [$KRB5ROOT/bin/krb5-config],
3560
			     [$KRB5ROOT/bin/krb5-config],
3561
			     [$KRB5ROOT/bin:$PATH])
3561
			     [$KRB5ROOT/bin:$PATH])
3562
		if test -x $KRB5CONF ; then
3562
		if test -x $KRB5CONF ; then
3563
			K5CFLAGS="`$KRB5CONF --cflags`"
3564
			K5LIBS="`$KRB5CONF --libs`"
3565
			CPPFLAGS="$CPPFLAGS $K5CFLAGS"
3563
3566
3564
			AC_MSG_CHECKING([for gssapi support])
3567
			AC_MSG_CHECKING([for gssapi support])
3565
			if $KRB5CONF | grep gssapi >/dev/null ; then
3568
			if $KRB5CONF | grep gssapi >/dev/null ; then
Lines 3567-3580 Link Here
3567
				AC_DEFINE([GSSAPI], [1],
3570
				AC_DEFINE([GSSAPI], [1],
3568
					[Define this if you want GSSAPI
3571
					[Define this if you want GSSAPI
3569
					support in the version 2 protocol])
3572
					support in the version 2 protocol])
3570
				k5confopts=gssapi
3573
				GSSCFLAGS="`$KRB5CONF --cflags gssapi`"
3574
				GSSLIBS="`$KRB5CONF --libs gssapi`"
3575
				CPPFLAGS="$CPPFLAGS $GSSCFLAGS"
3571
			else
3576
			else
3572
				AC_MSG_RESULT([no])
3577
				AC_MSG_RESULT([no])
3573
				k5confopts=""
3574
			fi
3578
			fi
3575
			K5CFLAGS="`$KRB5CONF --cflags $k5confopts`"
3576
			K5LIBS="`$KRB5CONF --libs $k5confopts`"
3577
			CPPFLAGS="$CPPFLAGS $K5CFLAGS"
3578
			AC_MSG_CHECKING([whether we are using Heimdal])
3579
			AC_MSG_CHECKING([whether we are using Heimdal])
3579
			AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[ #include <krb5.h>
3580
			AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[ #include <krb5.h>
3580
				]], [[ char *tmp = heimdal_version; ]])],
3581
				]], [[ char *tmp = heimdal_version; ]])],
Lines 3606-3619 Link Here
3606
3607
3607
			AC_CHECK_LIB([gssapi_krb5], [gss_init_sec_context],
3608
			AC_CHECK_LIB([gssapi_krb5], [gss_init_sec_context],
3608
				[ AC_DEFINE([GSSAPI])
3609
				[ AC_DEFINE([GSSAPI])
3609
				  K5LIBS="-lgssapi_krb5 $K5LIBS" ],
3610
				  GSSLIBS="-lgssapi_krb5" ],
3610
				[ AC_CHECK_LIB([gssapi], [gss_init_sec_context],
3611
				[ AC_CHECK_LIB([gssapi], [gss_init_sec_context],
3611
					[ AC_DEFINE([GSSAPI])
3612
					[ AC_DEFINE([GSSAPI])
3612
					  K5LIBS="-lgssapi $K5LIBS" ],
3613
					  GSSLIBS="-lgssapi" ],
3613
					AC_MSG_WARN([Cannot find any suitable gss-api library - build may fail]),
3614
					AC_MSG_WARN([Cannot find any suitable gss-api library - build may fail]))
3614
					$K5LIBS)
3615
				])
3615
				],
3616
				$K5LIBS)
3617
3616
3618
			AC_CHECK_HEADER([gssapi.h], ,
3617
			AC_CHECK_HEADER([gssapi.h], ,
3619
				[ unset ac_cv_header_gssapi_h
3618
				[ unset ac_cv_header_gssapi_h
Lines 3641-3652 Link Here
3641
		AC_CHECK_HEADERS([gssapi_krb5.h gssapi/gssapi_krb5.h])
3640
		AC_CHECK_HEADERS([gssapi_krb5.h gssapi/gssapi_krb5.h])
3642
		AC_CHECK_HEADERS([gssapi_generic.h gssapi/gssapi_generic.h])
3641
		AC_CHECK_HEADERS([gssapi_generic.h gssapi/gssapi_generic.h])
3643
3642
3644
		LIBS="$LIBS $K5LIBS"
3645
		AC_SEARCH_LIBS([k_hasafs], [kafs], [AC_DEFINE([USE_AFS], [1],
3643
		AC_SEARCH_LIBS([k_hasafs], [kafs], [AC_DEFINE([USE_AFS], [1],
3646
			[Define this if you want to use libkafs' AFS support])])
3644
			[Define this if you want to use libkafs' AFS support])])
3647
	fi
3645
	fi
3648
	]
3646
	]
3649
)
3647
)
3648
AC_SUBST([GSSLIBS])
3649
AC_SUBST([K5LIBS])
3650
3650
3651
# Looking for programs, paths and files
3651
# Looking for programs, paths and files
3652
3652

Return to bug 2072