Attachment 2221 Details for Bug 2072 – no-krb5.patch

[patch] no-krb5.patch

no-krb5.patch (text/plain), 3.01 KB, created by Pierre Ossman on 2013-02-22 02:13:15 AEDT

(hide)

Description:

Filename:

MIME Type:

Creator: Pierre Ossman

Created: 2013-02-22 02:13:15 AEDT

Size: 3.01 KB

patch

obsolete

>Index: Makefile.in
>===================================================================
>--- Makefile.in	(revision 26197)
>+++ Makefile.in	(working copy)
>@@ -44,6 +44,8 @@
> CFLAGS=@CFLAGS@
> CPPFLAGS=-I. -I$(srcdir) @CPPFLAGS@ $(PATHS) @DEFS@
> LIBS=@LIBS@
>+K5LIBS=@K5LIBS@
>+GSSLIBS=@GSSLIBS@
> SSHLIBS=@SSHLIBS@
> SSHDLIBS=@SSHDLIBS@
> LIBEDIT=@LIBEDIT@
>@@ -139,10 +141,10 @@
> 	$(RANLIB) $@
> 
> 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)
>-	$(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
> 	$(LD) -o $@ scp.o progressmeter.o bufaux.o $(LDFLAGS) -lssh -lopenbsd-compat $(LIBS)
>Index: configure.ac
>===================================================================
>--- configure.ac	(revision 26197)
>+++ configure.ac	(working copy)
>@@ -3560,6 +3560,9 @@
> 			     [$KRB5ROOT/bin/krb5-config],
> 			     [$KRB5ROOT/bin:$PATH])
> 		if test -x $KRB5CONF ; then
>+			K5CFLAGS="`$KRB5CONF --cflags`"
>+			K5LIBS="`$KRB5CONF --libs`"
>+			CPPFLAGS="$CPPFLAGS $K5CFLAGS"
> 
> 			AC_MSG_CHECKING([for gssapi support])
> 			if $KRB5CONF | grep gssapi >/dev/null ; then
>@@ -3567,14 +3570,12 @@
> 				AC_DEFINE([GSSAPI], [1],
> 					[Define this if you want GSSAPI
> 					support in the version 2 protocol])
>-				k5confopts=gssapi
>+				GSSCFLAGS="`$KRB5CONF --cflags gssapi`"
>+				GSSLIBS="`$KRB5CONF --libs gssapi`"
>+				CPPFLAGS="$CPPFLAGS $GSSCFLAGS"
> 			else
> 				AC_MSG_RESULT([no])
>-				k5confopts=""
> 			fi
>-			K5CFLAGS="`$KRB5CONF --cflags $k5confopts`"
>-			K5LIBS="`$KRB5CONF --libs $k5confopts`"
>-			CPPFLAGS="$CPPFLAGS $K5CFLAGS"
> 			AC_MSG_CHECKING([whether we are using Heimdal])
> 			AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[ #include <krb5.h>
> 				]], [[ char *tmp = heimdal_version; ]])],
>@@ -3606,14 +3607,12 @@
> 
> 			AC_CHECK_LIB([gssapi_krb5], [gss_init_sec_context],
> 				[ AC_DEFINE([GSSAPI])
>-				  K5LIBS="-lgssapi_krb5 $K5LIBS" ],
>+				  GSSLIBS="-lgssapi_krb5" ],
> 				[ AC_CHECK_LIB([gssapi], [gss_init_sec_context],
> 					[ AC_DEFINE([GSSAPI])
>-					  K5LIBS="-lgssapi $K5LIBS" ],
>-					AC_MSG_WARN([Cannot find any suitable gss-api library - build may fail]),
>-					$K5LIBS)
>-				],
>-				$K5LIBS)
>+					  GSSLIBS="-lgssapi" ],
>+					AC_MSG_WARN([Cannot find any suitable gss-api library - build may fail]))
>+				])
> 
> 			AC_CHECK_HEADER([gssapi.h], ,
> 				[ unset ac_cv_header_gssapi_h
>@@ -3641,12 +3640,13 @@
> 		AC_CHECK_HEADERS([gssapi_krb5.h gssapi/gssapi_krb5.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],
> 			[Define this if you want to use libkafs' AFS support])])
> 	fi
> 	]
> )
>+AC_SUBST([GSSLIBS])
>+AC_SUBST([K5LIBS])
> 
> # Looking for programs, paths and files
>

Actions: View | Diff

Attachments on bug 2072: 2221