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

[jelmer at samba.org]

Author: jelmer
Date: 2006-03-07 16:27:01 +0000 (Tue, 07 Mar 2006)
New Revision: 13954

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

Log:
Add --enable-dso flag to ./configure that simplifies the ability to 
do shared library-enabled builds.

Modified:
   branches/SAMBA_4_0/source/build/smb_build/main.pl
   branches/SAMBA_4_0/source/configure.in


Changeset:
Modified: branches/SAMBA_4_0/source/build/smb_build/main.pl
===================================================================
--- branches/SAMBA_4_0/source/build/smb_build/main.pl	2006-03-07 16:25:28 UTC (rev 13953)
+++ branches/SAMBA_4_0/source/build/smb_build/main.pl	2006-03-07 16:27:01 UTC (rev 13954)
@@ -33,9 +33,7 @@
 if (defined($ENV{"LIBRARY_OUTPUT_TYPE"})) {
 	$library_output_type = $ENV{LIBRARY_OUTPUT_TYPE};
 } elsif ($config::config{BLDSHARED} eq "true") {
-	#FIXME: This should eventually become SHARED_LIBRARY 
-	# rather then MERGEDOBJ once I'm certain it works ok -- jelmer
-	$library_output_type = "MERGEDOBJ";
+	$library_output_type = "SHARED_LIBRARY";
 } elsif ($config::config{BLDMERGED} eq "true") {
 	$library_output_type = "MERGEDOBJ";
 } else {
@@ -46,9 +44,7 @@
 if (defined($ENV{"MODULE_OUTPUT_TYPE"})) {
 	$module_output_type = $ENV{MODULE_OUTPUT_TYPE};
 } elsif ($config::config{BLDSHARED} eq "true") {
-	#FIXME: This should eventually become SHARED_LIBRARY 
-	# rather then MERGEDOBJ once I'm certain it works ok -- jelmer
-	$module_output_type = "MERGEDOBJ";
+	$module_output_type = "SHARED_LIBRARY";
 } elsif ($config::config{BLDMERGED} eq "true") {
 	$module_output_type = "MERGEDOBJ";
 } else {

Modified: branches/SAMBA_4_0/source/configure.in
===================================================================
--- branches/SAMBA_4_0/source/configure.in	2006-03-07 16:25:28 UTC (rev 13953)
+++ branches/SAMBA_4_0/source/configure.in	2006-03-07 16:27:01 UTC (rev 13954)
@@ -43,16 +43,14 @@
 sinclude(auth/config.m4)
 sinclude(kdc/config.m4)
 
-AC_DEFINE_UNQUOTED(STRING_STATIC_MODULES, "$string_static_modules", [String list of builtin modules])
+AC_ARG_ENABLE(dso,
+[  --enable-dso 		Enable building internal libraries as DSO's (experimental)],
+[ if test x$enable_dso != xyes; then
+ 	BLDSHARED=false
+  fi], 
+[BLDSHARED=false])
 
 #################################################
-# do extra things if we are running insure
-
-if test "${ac_cv_prog_CC}" = "insure"; then
-	CPPFLAGS="$CPPFLAGS -D__INSURE__"
-fi
-
-#################################################
 # add *_CFLAGS only for the real build
 CFLAGS="${CFLAGS} ${VISIBILITY_CFLAGS} ${DEVELOPER_CFLAGS}"