summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--source4/build/smb_build/makefile.pm2
-rw-r--r--source4/configure.in1
-rw-r--r--source4/libcli/config.m48
3 files changed, 1 insertions, 10 deletions
diff --git a/source4/build/smb_build/makefile.pm b/source4/build/smb_build/makefile.pm
index 8313044bc9..b422cbc307 100644
--- a/source4/build/smb_build/makefile.pm
+++ b/source4/build/smb_build/makefile.pm
@@ -325,7 +325,7 @@ sub StaticLibrary($$)
return unless (defined($ctx->{OBJ_FILES}));
- push (@{$self->{static_libs}}, $ctx->{TARGET});
+ push (@{$self->{static_libs}}, $ctx->{TARGET}) if ($ctx->{TYPE} eq "LIBRARY");
$self->output("$ctx->{TYPE}_$ctx->{NAME}_OUTPUT = $ctx->{OUTPUT}\n");
$self->_prepare_list($ctx, "OBJ_LIST");
diff --git a/source4/configure.in b/source4/configure.in
index bec62f5b0a..a392bc8e01 100644
--- a/source4/configure.in
+++ b/source4/configure.in
@@ -35,7 +35,6 @@ dnl disabled until we support external heimdal again
dnl sinclude(auth/kerberos/config.m4)
sinclude(auth/gensec/config.m4)
-sinclude(libcli/config.m4)
sinclude(smbd/process_model.m4)
sinclude(lib/registry/config.m4)
sinclude(scripting/swig/config.m4)
diff --git a/source4/libcli/config.m4 b/source4/libcli/config.m4
deleted file mode 100644
index feb9e79d38..0000000000
--- a/source4/libcli/config.m4
+++ /dev/null
@@ -1,8 +0,0 @@
-dnl # LIBCLI subsystem
-
-LIBCLI_RAW_LIBS=
-if test x"$with_ads_support" = x"yes"; then
- LIBCLI_RAW_LIBS="KRB5"
-fi
-
-SMB_SUBSYSTEM(LIBCLI_RAW_KRB5, [], [${LIBCLI_RAW_LIBS}])