summaryrefslogtreecommitdiff
path: root/source4
diff options
context:
space:
mode:
authorJelmer Vernooij <jelmer@samba.org>2006-03-07 16:27:01 +0000
committerGerald (Jerry) Carter <jerry@samba.org>2007-10-10 13:52:31 -0500
commit2761caf567aac966590e9a920e531f4df72a3a1b (patch)
treea74452e83257c3e4115f53d9c933e8eaa9bac14f /source4
parentf3f19158bb3e1307337c77f06991441f3c70a1e6 (diff)
downloadsamba-2761caf567aac966590e9a920e531f4df72a3a1b.tar.gz
samba-2761caf567aac966590e9a920e531f4df72a3a1b.tar.bz2
samba-2761caf567aac966590e9a920e531f4df72a3a1b.zip
r13954: Add --enable-dso flag to ./configure that simplifies the ability to
do shared library-enabled builds. (This used to be commit 9a1d76c13d44d6a8e4557893f485c5b81c68e01a)
Diffstat (limited to 'source4')
-rw-r--r--source4/build/smb_build/main.pl8
-rw-r--r--source4/configure.in14
2 files changed, 8 insertions, 14 deletions
diff --git a/source4/build/smb_build/main.pl b/source4/build/smb_build/main.pl
index bf11e8c896..747118db33 100644
--- a/source4/build/smb_build/main.pl
+++ b/source4/build/smb_build/main.pl
@@ -33,9 +33,7 @@ my $library_output_type;
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 @@ my $module_output_type;
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 {
diff --git a/source4/configure.in b/source4/configure.in
index 7fb6ccf38a..625557fca5 100644
--- a/source4/configure.in
+++ b/source4/configure.in
@@ -43,14 +43,12 @@ sinclude(web_server/config.m4)
sinclude(auth/config.m4)
sinclude(kdc/config.m4)
-AC_DEFINE_UNQUOTED(STRING_STATIC_MODULES, "$string_static_modules", [String list of builtin modules])
-
-#################################################
-# do extra things if we are running insure
-
-if test "${ac_cv_prog_CC}" = "insure"; then
- CPPFLAGS="$CPPFLAGS -D__INSURE__"
-fi
+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])
#################################################
# add *_CFLAGS only for the real build