From eb701ed73512b4f0f8da03d935eb3daa779f9825 Mon Sep 17 00:00:00 2001 From: kouril Date: Thu, 16 Sep 2004 08:55:27 +0000 Subject: [PATCH] Don't compile ASN.1 routines when using Heimdal -- use the ones from Heimdal --- configure.in | 47 +++++++++++++++++++++++++++++------------------ 1 file changed, 29 insertions(+), 18 deletions(-) diff --git a/configure.in b/configure.in index 2062257..4a83820 100644 --- a/configure.in +++ b/configure.in @@ -119,33 +119,44 @@ if test "x$with_krb5" != "xno" ; then AC_DEFINE(KRB5) # check for Heimdal + have_heimdal="" AC_MSG_CHECKING(whether we are using Heimdal) ac_save_CFLAGS="$CFLAGS" CFLAGS="$KRB5_CPPFLAGS" AC_TRY_COMPILE([#include ], [ char *tmp = heimdal_version; ], [ AC_MSG_RESULT(yes) - AC_DEFINE(HEIMDAL) ], + AC_DEFINE(HEIMDAL) ] + have_heimdal=yes, [ AC_MSG_RESULT(no) ]) CFLAGS="$ac_save_CFLAGS" - SPNEGO_SRCS="\ - spnegokrb5/asn1_MechType.c \ - spnegokrb5/asn1_MechTypeList.c \ - spnegokrb5/asn1_ContextFlags.c \ - spnegokrb5/asn1_NegTokenInit.c \ - spnegokrb5/asn1_NegTokenTarg.c \ - spnegokrb5/der_get.c \ - spnegokrb5/der_put.c \ - spnegokrb5/der_free.c \ - spnegokrb5/der_length.c \ - spnegokrb5/der_copy.c \ - spnegokrb5/timegm.c \ - spnegokrb5/init_sec_context.c \ - spnegokrb5/accept_sec_context.c \ - spnegokrb5/encapsulate.c \ - spnegokrb5/decapsulate.c \ - spnegokrb5/external.c" + if test -n "$have_heimdal"; then + SPNEGO_SRCS="\ + spnegokrb5/init_sec_context.c \ + spnegokrb5/accept_sec_context.c \ + spnegokrb5/encapsulate.c \ + spnegokrb5/decapsulate.c \ + spnegokrb5/external.c" + else + SPNEGO_SRCS="\ + spnegokrb5/asn1_MechType.c \ + spnegokrb5/asn1_MechTypeList.c \ + spnegokrb5/asn1_ContextFlags.c \ + spnegokrb5/asn1_NegTokenInit.c \ + spnegokrb5/asn1_NegTokenTarg.c \ + spnegokrb5/der_get.c \ + spnegokrb5/der_put.c \ + spnegokrb5/der_free.c \ + spnegokrb5/der_length.c \ + spnegokrb5/der_copy.c \ + spnegokrb5/timegm.c \ + spnegokrb5/init_sec_context.c \ + spnegokrb5/accept_sec_context.c \ + spnegokrb5/encapsulate.c \ + spnegokrb5/decapsulate.c \ + spnegokrb5/external.c" + fi fi fi AC_SUBST(KRB5_CPPFLAGS) -- 2.1.4