cvs commit: src Makefile.inc1

[Mark Murray]

Marius Strobl writes:
> There are two bogons left in Makefile.inc1 where it's not checked if
> kerberos5 can be built (regarding dependency on OpenSSL and existence
> of crypto and kerberos5 sources), see diff below.

Thank you!

> It would be also fine if a comment to src/share/examples/etc/make.conf
> could be added that NO_OPENSSL implies NO_KERBEROS.

Yes. This would indeed be good. Thanks!

M

> Index: Makefile.inc1
> ===================================================================
> RCS file: /usr/data/bsd/cvs/fbsd/src/Makefile.inc1,v
> retrieving revision 1.356
> diff -u -r1.356 Makefile.inc1
> --- Makefile.inc1	5 May 2003 12:54:26 -0000	1.356
> +++ Makefile.inc1	11 May 2003 19:55:16 -0000
> @@ -693,7 +693,7 @@
>  .endif
>  
>  .if exists(${.CURDIR}/kerberos5) && exists(${.CURDIR}/crypto) && \
> -    !defined(NOCRYPT) && !defined(NO_KERBEROS)
> +    !defined(NOCRYPT) && !defined(NO_OPENSSL) && !defined(NO_KERBEROS)
>  _libkrb5= kerberos5/lib/libroken kerberos5/lib/libvers \
>      kerberos5/lib/libasn1 kerberos5/lib/libhdb kerberos5/lib/libsl
>  .endif
> @@ -780,7 +780,8 @@
>  
>  _generic_libs=	gnu/lib
>  
> -.if !defined(NOCRYPT) && !defined(NO_KERBEROS)
> +.if exists(${.CURDIR}/kerberos5) && exists(${.CURDIR}/crypto) && \
> +    !defined(NOCRYPT) && !defined(NO_OPENSSL) && !defined(NO_KERBEROS)
>  _prebuild_libs+=	kerberos5/lib/libasn1
>  _prebuild_libs+=	kerberos5/lib/libgssapi
>  _prebuild_libs+=	kerberos5/lib/libkrb5
--
Mark Murray
iumop ap!sdn w,I idlaH