svn commit: samba r19571 - in branches/SAMBA_4_0/source: . bin build/smb_build

[jelmer at samba.org]

Author: jelmer
Date: 2006-11-06 14:03:51 +0000 (Mon, 06 Nov 2006)
New Revision: 19571

WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=19571

Log:
Add a USESHARED parameter (different from BLDSHARED) + two small 
shared-library related fixes. 

Added:
   branches/SAMBA_4_0/source/bin/shared/
Modified:
   branches/SAMBA_4_0/source/build/smb_build/main.pl
   branches/SAMBA_4_0/source/configure.ac
   branches/SAMBA_4_0/source/main.mk


Changeset:
Modified: branches/SAMBA_4_0/source/build/smb_build/main.pl
===================================================================
--- branches/SAMBA_4_0/source/build/smb_build/main.pl	2006-11-06 13:14:21 UTC (rev 19570)
+++ branches/SAMBA_4_0/source/build/smb_build/main.pl	2006-11-06 14:03:51 UTC (rev 19571)
@@ -20,18 +20,14 @@
 my $mkfile = smb_build::config_mk::run_config_mk($INPUT, $config::config{srcdir}, $config::config{builddir}, "main.mk");
 
 my $library_output_type;
-if (defined($ENV{"LIBRARY_OUTPUT_TYPE"})) {
-	$library_output_type = $ENV{LIBRARY_OUTPUT_TYPE};
-} elsif ($config::config{BLDSHARED} eq "true") {
+if ($config::config{USESHARED} eq "true") {
 	$library_output_type = "SHARED_LIBRARY";
 } else {
 	$library_output_type = "STATIC_LIBRARY";
 }
 
 my $module_output_type;
-if (defined($ENV{"MODULE_OUTPUT_TYPE"})) {
-	$module_output_type = $ENV{MODULE_OUTPUT_TYPE};
-} elsif ($config::config{BLDSHARED} eq "true") {
+if ($config::config{USESHARED} eq "true") {
 	$module_output_type = "SHARED_LIBRARY";
 } else {
 	$module_output_type = "INTEGRATED";

Modified: branches/SAMBA_4_0/source/configure.ac
===================================================================
--- branches/SAMBA_4_0/source/configure.ac	2006-11-06 13:14:21 UTC (rev 19570)
+++ branches/SAMBA_4_0/source/configure.ac	2006-11-06 14:03:51 UTC (rev 19571)
@@ -50,14 +50,16 @@
 m4_include(nsswitch/config.m4)
 m4_include(libcli/config.m4)
 
-dnl disabled until we support external heimdal again
+USESHARED=$BLDSHARED
+
 AC_ARG_ENABLE(dso,
-[  --enable-dso 		Enable building internal libraries as DSO's (experimental)],
+[  --enable-dso 		Enable using shared libraries internally (experimental)],
 [ if test x$enable_dso != xno; then
- 	BLDSHARED=true
+ 	USESHARED=true
   fi], 
-[BLDSHARED=false])
+[USESHARED=false])
 
+AC_SUBST(USESHARED)
 
 #################################################
 # add *_CFLAGS only for the real build

Modified: branches/SAMBA_4_0/source/main.mk
===================================================================
--- branches/SAMBA_4_0/source/main.mk	2006-11-06 13:14:21 UTC (rev 19570)
+++ branches/SAMBA_4_0/source/main.mk	2006-11-06 14:03:51 UTC (rev 19571)
@@ -335,7 +335,7 @@
 # File types
 ###############################################################################
 
-.SUFFIXES: .x .c .et .y .l .d .o .h .h.gch .a .so .1 .1.xml .3 .3.xml .5 .5.xml .7 .7.xml .8 .8.xml .ho .idl .hd
+.SUFFIXES: .x .c .et .y .l .d .o .h .h.gch .a .$(SHLIBEXT) .1 .1.xml .3 .3.xml .5 .5.xml .7 .7.xml .8 .8.xml .ho .idl .hd
 
 .c.d:
 	@echo "Generating dependencies for $<"