svn commit: samba r19621 - in branches/SAMBA_4_0/source: . build/m4

[Jelmer Vernooij]

Hi Metze,

On Tue, 2006-11-07 at 14:13 +0000, metze at samba.org wrote:
> Changeset:
> Modified: branches/SAMBA_4_0/source/build/m4/check_ld.m4
> ===================================================================
> --- branches/SAMBA_4_0/source/build/m4/check_ld.m4	2006-11-07 14:06:58 UTC (rev 19620)
> +++ branches/SAMBA_4_0/source/build/m4/check_ld.m4	2006-11-07 14:13:59 UTC (rev 19621)
> @@ -185,3 +185,21 @@
>  	    AC_MSG_RESULT(yes),
>  	    AC_MSG_ERROR([we cannot link with the selected cc and ld flags. Aborting configure]),
>  	    AC_MSG_WARN([cannot run when cross-compiling]))
> +
> +try_dso=no
^^^ This variable doesn't appear to be used.

> +USESHARED=false
> +AC_SUBST(USESHARED)
> +
> +AC_ARG_ENABLE(dso,
> +[  --enable-dso 		Enable using shared libraries internally (experimental)])
> +
> +if test x"$enable_dso" = x"yes" -a x"$BLDSHARED" != x"true"; then
> +	AC_MSG_ERROR([--enable-dso: no support for shared libraries])
> +fi
> +
> +if test x"$enable_dso" != x"no"; then
> +	USESHARED=$BLDSHARED
> +fi
> +
> +AC_MSG_CHECKING([if binaries will use shared libraries])
> +AC_MSG_RESULT([$USESHARED])
> 
> Modified: branches/SAMBA_4_0/source/configure.ac
> ===================================================================
> --- branches/SAMBA_4_0/source/configure.ac	2006-11-07 14:06:58 UTC (rev 19620)
> +++ branches/SAMBA_4_0/source/configure.ac	2006-11-07 14:13:59 UTC (rev 19621)
> @@ -50,17 +50,6 @@
>  m4_include(nsswitch/config.m4)
>  m4_include(libcli/config.m4)
>  
> -USESHARED=$BLDSHARED
> -
> -AC_ARG_ENABLE(dso,
> -[  --enable-dso 		Enable using shared libraries internally (experimental)],
> -[ if test x$enable_dso != xno; then
> - 	USESHARED=true
> -  fi], 
> -[USESHARED=false])
> -
> -AC_SUBST(USESHARED)
> -
>  #################################################
>  # add *_CFLAGS only for the real build
>  CFLAGS="${CFLAGS} ${DEVELOPER_CFLAGS}"
> 
-- 
Jelmer Vernooij <jelmer at samba.org> - http://samba.org/~jelmer/
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 307 bytes
Desc: This is a digitally signed message part
Url : http://lists.samba.org/archive/samba-cvs/attachments/20061107/ba2cf8bc/attachment.bin