summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJelmer Vernooij <jelmer@samba.org>2006-11-06 14:03:51 +0000
committerGerald (Jerry) Carter <jerry@samba.org>2007-10-10 14:24:54 -0500
commit66c17f778ac65d1b37a6c13187d52bb8dad005de (patch)
tree1f11ae18103c7648a326f78b941758699af51da7
parent8f89522a3fdb5160f7dc5748b8c10ca39c22d775 (diff)
downloadsamba-66c17f778ac65d1b37a6c13187d52bb8dad005de.tar.gz
samba-66c17f778ac65d1b37a6c13187d52bb8dad005de.tar.bz2
samba-66c17f778ac65d1b37a6c13187d52bb8dad005de.zip
r19571: Add a USESHARED parameter (different from BLDSHARED) + two small
shared-library related fixes. (This used to be commit 8c7276b6c6ccebfbc60de978fcb2c23e7fbc12b5)
-rw-r--r--source4/build/smb_build/main.pl8
-rw-r--r--source4/configure.ac10
-rw-r--r--source4/main.mk2
3 files changed, 9 insertions, 11 deletions
diff --git a/source4/build/smb_build/main.pl b/source4/build/smb_build/main.pl
index 908222d504..3e546d58ae 100644
--- a/source4/build/smb_build/main.pl
+++ b/source4/build/smb_build/main.pl
@@ -20,18 +20,14 @@ my $INPUT = {};
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";
diff --git a/source4/configure.ac b/source4/configure.ac
index be9f627d69..ac7998ba5f 100644
--- a/source4/configure.ac
+++ b/source4/configure.ac
@@ -50,14 +50,16 @@ m4_include(lib/appweb/config.m4)
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
diff --git a/source4/main.mk b/source4/main.mk
index 5d38cd5e1d..3eaf35da4e 100644
--- a/source4/main.mk
+++ b/source4/main.mk
@@ -335,7 +335,7 @@ unused_macros:
# 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 $<"