r11382: Require number of required M4 macros

Make MODULE handling a bit more like BINARY, LIBRARY and SUBSYSTEM
Add some more PUBLIC_HEADERS
(This used to be commit 875eb8f4cc658e6aebab070029fd499a726ad520)

19 files changed, 79 insertions, 109 deletions

diff --git a/source4/auth/gensec/config.m4 b/source4/auth/gensec/config.m4
index af17e896a4..b945afeea0 100644
--- a/source4/auth/gensec/config.m4
+++ b/source4/auth/gensec/config.m4
@@ -1,8 +1,2 @@
-SMB_MODULE_DEFAULT(gensec_krb5, NOT)
-SMB_MODULE_DEFAULT(gensec_gssapi, NOT)
-
-if test x"$HAVE_KRB5" = x"YES"; then
-	# krb5 is now disabled at runtime, not build time
-	SMB_MODULE_DEFAULT(gensec_krb5, STATIC)
-	SMB_MODULE_DEFAULT(gensec_gssapi, STATIC)
-fi
+SMB_ENABLE(gensec_krb5, $HAVE_KRB5)
+SMB_ENABLE(gensec_gssapi, $HAVE_KRB5)
diff --git a/source4/auth/gensec/config.mk b/source4/auth/gensec/config.mk
index d1a89038ad..57f7bc4f0d 100644
--- a/source4/auth/gensec/config.mk
+++ b/source4/auth/gensec/config.mk
@@ -4,6 +4,7 @@
 MAJOR_VERSION = 0
 MINOR_VERSION = 0
 RELEASE_VERSION = 1
+PUBLIC_HEADERS = gensec.h
 INIT_FUNCTION = gensec_init
 INIT_OBJ_FILES = gensec.o
 REQUIRED_SUBSYSTEMS = \
diff --git a/source4/build/m4/public.m4 b/source4/build/m4/public.m4
index 69bce86f4d..89ea0f3853 100644
--- a/source4/build/m4/public.m4
+++ b/source4/build/m4/public.m4
@@ -4,10 +4,6 @@ dnl Copyright (C) 2004 Stefan Metzmacher
 dnl Copyright (C) 2004-2005 Jelmer Vernooij
 dnl Published under the GPL
 dnl
-dnl SMB_MODULE_DEFAULT(name,default_build)
-dnl
-dnl SMB_SUBSYSTEM_ENABLE(name,default_build)
-dnl
 dnl SMB_SUBSYSTEM(name,init_obj_files,add_obj_files,required_subsystems)
 dnl
 dnl SMB_EXT_LIB_ENABLE(name,default_build)
@@ -16,36 +12,15 @@ dnl SMB_EXT_LIB_FROM_PKGCONFIG(name,pkg-config name)
 dnl
 dnl SMB_EXT_LIB(name,libs,cflags,cppflags,ldflags)
 dnl
-dnl SMB_BINARY_ENABLE(name,default_build)
+dnl SMB_ENABLE(name,default_build)
 dnl
 dnl #######################################################
 dnl ### And now the implementation			###
 dnl #######################################################
 
-dnl SMB_MODULE_DEFAULT(name,default_build)
-AC_DEFUN([SMB_MODULE_DEFAULT],
-[
-	[SMB_MODULE_DEFAULT][$1]="$2"
-SMB_INFO_ENABLES="$SMB_INFO_ENABLES
-\$enabled{$1} = \"$2\";"
-])
-
-dnl SMB_SUBSYSTEM_ENABLE(name,default_build)
-AC_DEFUN([SMB_SUBSYSTEM_ENABLE],
-[
-	[SMB_SUBSYSTEM_ENABLE_][$1]="$2"
-SMB_INFO_ENABLES="$SMB_INFO_ENABLES
-\$enabled{$1} = \"$2\";"
-])
-
 dnl SMB_SUBSYSTEM(name,init_obj_files,add_obj_files,required_subsystems)
 AC_DEFUN([SMB_SUBSYSTEM],
 [
-
-	if test -z "$[SMB_SUBSYSTEM_ENABLE_][$1]"; then
-		[SMB_SUBSYSTEM_ENABLE_][$1]="YES";
-	fi
-
 	if test -z "$[SMB_SUBSYSTEM_NOPROTO_][$1]"; then
 		[SMB_SUBSYSTEM_NOPROTO_][$1]="NO";
 	fi
@@ -148,10 +123,10 @@ LDFLAGS = $5
 "
 ])
 
-dnl SMB_BINARY_ENABLE(name,default_build)
-AC_DEFUN([SMB_BINARY_ENABLE],
+dnl SMB_ENABLE(name,default_build)
+AC_DEFUN([SMB_ENABLE],
 [
-	[SMB_BINARY_ENABLE_][$1]="$2";
+	[SMB_ENABLE_][$1]="$2";
 
 SMB_INFO_ENABLES="$SMB_INFO_ENABLES
 \$enabled{$1} = \"$2\";"
diff --git a/source4/build/smb_build/input.pm b/source4/build/smb_build/input.pm
index 88d7c24af8..5dcbb8c904 100644
--- a/source4/build/smb_build/input.pm
+++ b/source4/build/smb_build/input.pm
@@ -10,10 +10,11 @@
 use strict;
 package smb_build::input;
 
-use vars qw($library_output_type $subsystem_output_type);
+use vars qw($library_output_type $subsystem_output_type $module_output_type);
 
 $library_output_type = "OBJ_LIST";
 $subsystem_output_type = "OBJ_LIST";
+$module_output_type = "OBJ_LIST";
 my $srcdir = ".";
 
 sub strtrim($)
@@ -54,43 +55,32 @@ sub check_module($$)
 
 	die("Module $mod->{NAME} does not have a SUBSYSTEM set") if not defined($mod->{SUBSYSTEM});
 
-	($mod->{DEFAULT_BUILD} = "STATIC") if not defined($mod->{DEFAULT_BUILD});
-	
 	my $use_default = 0;
 
 	if (!(defined($INPUT->{$mod->{SUBSYSTEM}}))) {
-		$mod->{BUILD} = "NOT";
 		$mod->{ENABLE} = "NO";
 		return;
 	}
 
-	if (($mod->{ENABLE} eq "STATIC") or 
-	 	($mod->{ENABLE} eq "NOT") or 
-		($mod->{ENABLE} eq "SHARED")) {
-		$mod->{DEFAULT_BUILD} = $mod->{ENABLE};
-	} elsif ($mod->{ENABLE} ne "YES")
+	if ($mod->{ENABLE} ne "YES")
 	{
-		$mod->{CHOSEN_BUILD} = "NOT";
+		printf("Module `%s' disabled\n",$mod->{NAME});
+		return;
 	}
 
-	if (not defined($mod->{CHOSEN_BUILD}) or $mod->{CHOSEN_BUILD} eq "DEFAULT") 
+	if (defined($mod->{CHOSEN_BUILD}) and $mod->{CHOSEN_BUILD} ne "DEFAULT") 
 	{
-		$mod->{CHOSEN_BUILD} = $mod->{DEFAULT_BUILD};
+		$mod->{OUTPUT_TYPE} = $mod->{CHOSEN_BUILD};
+	} else {
+		$mod->{OUTPUT_TYPE} = $module_output_type;
 	}
 
-	if ($mod->{CHOSEN_BUILD} eq "SHARED") {
-		$mod->{ENABLE} = "YES";
-		$mod->{OUTPUT_TYPE} = "SHARED_LIBRARY";
+	if ($mod->{OUTPUT_TYPE} eq "SHARED_LIBRARY" or 
+	    $mod->{OUTPUT_TYPE} eq "STATIC_LIBRARY") {
 		$mod->{INSTALLDIR} = "LIBDIR/$mod->{SUBSYSTEM}";
 		push (@{$mod->{REQUIRED_SUBSYSTEMS}}, $mod->{SUBSYSTEM});
-	} elsif ($mod->{CHOSEN_BUILD} eq "STATIC") {
-		$mod->{ENABLE} = "YES";
-		push (@{$INPUT->{$mod->{SUBSYSTEM}}{REQUIRED_SUBSYSTEMS}}, $mod->{NAME});
-		$mod->{OUTPUT_TYPE} = $subsystem_output_type;
 	} else {
-		$mod->{ENABLE} = "NO";
-		printf("Module `%s' disabled\n",$mod->{NAME});
-		return;
+		push (@{$INPUT->{$mod->{SUBSYSTEM}}{REQUIRED_SUBSYSTEMS}}, $mod->{NAME});
 	}
 }
 
diff --git a/source4/build/smb_build/main.pl b/source4/build/smb_build/main.pl
index a207062d34..1bc4d45aaa 100644
--- a/source4/build/smb_build/main.pl
+++ b/source4/build/smb_build/main.pl
@@ -37,6 +37,16 @@ if (defined($ENV{"LIBRARY_OUTPUT_TYPE"})) {
 	$smb_build::input::library_output_type = "MERGEDOBJ";
 }
 
+if (defined($ENV{"MODULE_OUTPUT_TYPE"})) {
+	$smb_build::input::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
+	$smb_build::input::module_output_type = "MERGEDOBJ";
+} elsif ($config::config{BLDMERGED} eq "true") {
+	$smb_build::input::module_output_type = "MERGEDOBJ";
+}
+
 my $DEPEND = smb_build::input::check($INPUT, \%config::enabled);
 my $OUTPUT = output::create_output($DEPEND);
 my $mkenv = new smb_build::makefile(\%config::config, $mkfile);
diff --git a/source4/build/smb_build/output.pm b/source4/build/smb_build/output.pm
index 2dc74562f6..d7618766f6 100644
--- a/source4/build/smb_build/output.pm
+++ b/source4/build/smb_build/output.pm
@@ -161,9 +161,8 @@ sub create_output($)
 			    push(@{$part->{DEPEND_LIST}}, $elem->{TARGET}) if defined($elem->{TARGET});
 			}
 			push(@{$part->{SUBSYSTEM_INIT_FUNCTIONS}}, $elem->{INIT_FUNCTION}) if 
-				$part->{OUTPUT_TYPE} eq "BINARY" and 
+			#$part->{OUTPUT_TYPE} eq "BINARY" and 
 				defined($elem->{INIT_FUNCTION}) and 
-				$elem->{INIT_FUNCTION} ne "" and
 				$part->{OUTPUT_TYPE} ne "SHARED_LIBRARY";
 		}
 	}
diff --git a/source4/gtk/config.m4 b/source4/gtk/config.m4
index 8338470bf9..c15d93ddef 100644
--- a/source4/gtk/config.m4
+++ b/source4/gtk/config.m4
@@ -1,17 +1,17 @@
 dnl # LIB GTK SMB subsystem
 
 SMB_EXT_LIB_FROM_PKGCONFIG(gtk, [glib-2.0 gtk+-2.0 >= 2.4])
-SMB_SUBSYSTEM_ENABLE(GTKSMB, NO)
-SMB_BINARY_ENABLE(gregedit, NO)
-SMB_BINARY_ENABLE(gwcrontab, NO)
-SMB_BINARY_ENABLE(gwsam, NO)
-SMB_BINARY_ENABLE(gepdump, NO)
+SMB_ENABLE(GTKSMB, NO)
+SMB_ENABLE(gregedit, NO)
+SMB_ENABLE(gwcrontab, NO)
+SMB_ENABLE(gwsam, NO)
+SMB_ENABLE(gepdump, NO)
 
 if test t$SMB_EXT_LIB_ENABLE_gtk = tYES; then
-	SMB_SUBSYSTEM_ENABLE(GTKSMB, YES)
-	SMB_BINARY_ENABLE(gregedit, YES)
-	SMB_BINARY_ENABLE(gwcrontab, YES)
-	SMB_BINARY_ENABLE(gwsam, YES)
-	SMB_BINARY_ENABLE(gepdump, YES)
+	SMB_ENABLE(GTKSMB, YES)
+	SMB_ENABLE(gregedit, YES)
+	SMB_ENABLE(gwcrontab, YES)
+	SMB_ENABLE(gwsam, YES)
+	SMB_ENABLE(gepdump, YES)
 	AC_DEFINE(HAVE_GTK, 1, [Whether GTK+ is available])
 fi
diff --git a/source4/gtk/config.mk b/source4/gtk/config.mk
index 62697743ba..da3ee1353d 100644
--- a/source4/gtk/config.mk
+++ b/source4/gtk/config.mk
@@ -7,6 +7,7 @@ MAJOR_VERSION = 0
 MINOR_VERSION = 0
 RELEASE_VERSION = 1
 NOPROTO = YES
+PUBLIC_HEADERS = common/gtk-smb.h common/select.h
 INIT_OBJ_FILES = common/gtk-smb.o 
 ADD_OBJ_FILES = common/select.o \
 		common/gtk_events.o \
diff --git a/source4/gtk/tools/gregedit.c b/source4/gtk/tools/gregedit.c
index ae34bf2745..57a30c091e 100644
--- a/source4/gtk/tools/gregedit.c
+++ b/source4/gtk/tools/gregedit.c
@@ -545,11 +545,12 @@ static void on_value_activate(GtkTreeView *treeview, GtkTreePath *arg1,
 	if (result == GTK_RESPONSE_OK) 
 	{
 		WERROR error;
-		struct registry_value *val;
+		DATA_BLOB data;
+		uint32_t data_type;
 		
-		reg_string_to_val(mem_ctx,str_regtype(gtk_combo_box_get_active(GTK_COMBO_BOX(entry_type))), gtk_entry_get_text(GTK_ENTRY(entry_value)), &val->data_type, &val->data);
+		reg_string_to_val(mem_ctx,str_regtype(gtk_combo_box_get_active(GTK_COMBO_BOX(entry_type))), gtk_entry_get_text(GTK_ENTRY(entry_value)), &data_type, &data);
 		
-		error = reg_val_set(current_key, gtk_entry_get_text(GTK_ENTRY(entry_name)), val->data_type, val->data);
+		error = reg_val_set(current_key, gtk_entry_get_text(GTK_ENTRY(entry_name)), data_type, data);
 
 		if (!W_ERROR_IS_OK(error)) {
 			gtk_show_werror(NULL, "Error while setting value", error);
@@ -566,11 +567,12 @@ static void on_set_value_activate(GtkMenuItem *menuitem, gpointer user_data)
 	if (result == GTK_RESPONSE_OK) 
 	{
 		WERROR error;
-		struct registry_value *val;
+		uint32_t data_type;
+		DATA_BLOB data;
 		
-		reg_string_to_val(mem_ctx,str_regtype(gtk_combo_box_get_active(GTK_COMBO_BOX(entry_type))), gtk_entry_get_text(GTK_ENTRY(entry_value)), &val->data_type, &val->data);
+		reg_string_to_val(mem_ctx,str_regtype(gtk_combo_box_get_active(GTK_COMBO_BOX(entry_type))), gtk_entry_get_text(GTK_ENTRY(entry_value)), &data_type, &data);
 		
-		error = reg_val_set(current_key, gtk_entry_get_text(GTK_ENTRY(entry_name)), val->data_type, val->data);
+		error = reg_val_set(current_key, gtk_entry_get_text(GTK_ENTRY(entry_name)), data_type, data);
 
 		if (!W_ERROR_IS_OK(error)) {
 			gtk_show_werror(NULL, "Error while setting value", error);
diff --git a/source4/heimdal_build/config.m4 b/source4/heimdal_build/config.m4
index 6713730a84..fb4f27387f 100644
--- a/source4/heimdal_build/config.m4
+++ b/source4/heimdal_build/config.m4
@@ -205,9 +205,9 @@ SMB_EXT_LIB(RESOLV,[${RESOLV_LIBS}],[${RESOLV_CFLAGS}],[${RESOLV_CPPFLAGS}],[${R
 
 
 # these are disabled unless heimdal is found below
-SMB_SUBSYSTEM_ENABLE(KERBEROS_LIB, NO)
-SMB_BINARY_ENABLE(asn1_compile, NO)
-SMB_BINARY_ENABLE(compile_et, NO)
+SMB_ENABLE(KERBEROS_LIB, NO)
+SMB_ENABLE(asn1_compile, NO)
+SMB_ENABLE(compile_et, NO)
 
 AC_PROG_LEX
 AC_PROG_YACC
@@ -219,30 +219,30 @@ AC_PROG_YACC
 AC_DEFINE(HAVE_KRB5,1,[Whether kerberos is available])
 CFLAGS="${CFLAGS} -Iheimdal_build -Iheimdal/lib/krb5 -Iheimdal/lib/gssapi -Iheimdal/lib/asn1 -Iheimdal/lib/com_err -Iheimdal/lib/hdb -Iheimdal/kdc -Iheimdal/lib/roken -Iheimdal/lib/des"
 HAVE_KRB5=YES
-SMB_SUBSYSTEM_ENABLE(KERBEROS_LIB, YES)
-SMB_BINARY_ENABLE(asn1_compile, YES)
-SMB_BINARY_ENABLE(compile_et, YES)
+SMB_ENABLE(KERBEROS_LIB, YES)
+SMB_ENABLE(asn1_compile, YES)
+SMB_ENABLE(compile_et, YES)
 
 # only add getaddrinfo and related functions if needed
-SMB_SUBSYSTEM_ENABLE(HEIMDAL_ROKEN_ADDRINFO, NO)
+SMB_ENABLE(HEIMDAL_ROKEN_ADDRINFO, NO)
 if test t$ac_cv_func_getaddrinfo != tyes; then
-	SMB_SUBSYSTEM_ENABLE(HEIMDAL_ROKEN_ADDRINFO, YES)
+	SMB_ENABLE(HEIMDAL_ROKEN_ADDRINFO, YES)
 fi
 
 # only add inet_aton if needed
-SMB_SUBSYSTEM_ENABLE(HEIMDAL_ROKEN_INET_ATON, NO)
+SMB_ENABLE(HEIMDAL_ROKEN_INET_ATON, NO)
 if test t$ac_cv_func_inet_aton != tyes; then
-	SMB_SUBSYSTEM_ENABLE(HEIMDAL_ROKEN_INET_ATON, YES)
+	SMB_ENABLE(HEIMDAL_ROKEN_INET_ATON, YES)
 fi
 
 # only add gai_strerror if needed
-SMB_SUBSYSTEM_ENABLE(HEIMDAL_ROKEN_GAI_STRERROR, NO)
+SMB_ENABLE(HEIMDAL_ROKEN_GAI_STRERROR, NO)
 AC_CHECK_FUNC(gai_strerror)
 if test t$ac_cv_func_gai_strerror != tyes; then
     AC_SEARCH_LIBS_EXT(gai_strerror, [xnet], XNET_LIBS)
     AC_CHECK_FUNC_EXT(gai_strerror, $XNET_LIBS)
     if test t$ac_cv_func_ext_gai_strerror != tyes; then
-	SMB_SUBSYSTEM_ENABLE(HEIMDAL_ROKEN_GAI_STRERROR, YES)
+	SMB_ENABLE(HEIMDAL_ROKEN_GAI_STRERROR, YES)
     else
 	AC_DEFINE(HAVE_GAI_STRERROR,1,[Whether gai_strerror() is available])
     fi
diff --git a/source4/kdc/config.m4 b/source4/kdc/config.m4
index c086b27936..409968e8b5 100644
--- a/source4/kdc/config.m4
+++ b/source4/kdc/config.m4
@@ -1,5 +1 @@
-SMB_MODULE_DEFAULT(server_service_kdc, NOT)
-
-if test t$HAVE_KRB5 = tYES; then
-	SMB_MODULE_DEFAULT(server_service_kdc, STATIC)
-fi
+SMB_ENABLE(server_service_kdc, $HAVE_KRB5)
diff --git a/source4/lib/basic.mk b/source4/lib/basic.mk
index eb65d27852..06470a1079 100644
--- a/source4/lib/basic.mk
+++ b/source4/lib/basic.mk
@@ -27,6 +27,7 @@ ADD_OBJ_FILES = \
 ##############################
 
 [LIBRARY::TDR]
+PUBLIC_HEADERS = tdr/tdr.h
 MAJOR_VERSION = 0
 MINOR_VERSION = 0
 RELEASE_VERSION = 1
diff --git a/source4/lib/ldb/config.m4 b/source4/lib/ldb/config.m4
index 551bacf5c9..8d311bfa64 100644
--- a/source4/lib/ldb/config.m4
+++ b/source4/lib/ldb/config.m4
@@ -1,4 +1 @@
-SMB_MODULE_DEFAULT(libldb_sqlite3,NOT)
-if test x"$with_sqlite3_support" = x"yes"; then
-    SMB_MODULE_DEFAULT(libldb_sqlite3,STATIC)
-fi
+SMB_ENABLE(libldb_sqlite3,$with_sqlite3_support)
diff --git a/source4/lib/registry/config.m4 b/source4/lib/registry/config.m4
index ffea96c829..af885825ee 100644
--- a/source4/lib/registry/config.m4
+++ b/source4/lib/registry/config.m4
@@ -1,12 +1,12 @@
 # Registry backends
-SMB_MODULE_DEFAULT(registry_gconf, NOT)
+SMB_ENABLE(registry_gconf, NO)
 
 SMB_EXT_LIB_FROM_PKGCONFIG(gconf, gconf-2.0)
 
 AC_ARG_ENABLE(reg-gconf,
 [   --enable-reg-gconf     Enable support for GConf registry backend],
 [
-	if test t$enable = tyes && test t$SMB_EXT_LIB_ENABLE_gconf = tYES; then
-		SMB_MODULE_DEFAULT(registry_gconf, STATIC)
+	if test t$enable = tyes; then
+		SMB_ENABLE(registry_gconf, $SMB_EXT_LIB_ENABLE_gconf)
 	fi
 ])
diff --git a/source4/lib/replace/repdir/config.m4 b/source4/lib/replace/repdir/config.m4
index 02fb6e1816..b17c92e7d6 100644
--- a/source4/lib/replace/repdir/config.m4
+++ b/source4/lib/replace/repdir/config.m4
@@ -12,8 +12,8 @@ AC_CACHE_CHECK([for replacing readdir],samba_cv_REPLACE_READDIR,[
        	   samba_cv_REPLACE_READDIR=yes,samba_cv_REPLACE_READDIR=no)])
 fi
 
-SMB_SUBSYSTEM_ENABLE(REPLACE_READDIR, NO)
+SMB_ENABLE(REPLACE_READDIR, NO)
 if test x"$samba_cv_REPLACE_READDIR" = x"yes"; then
 	AC_DEFINE(REPLACE_READDIR,1,[replace readdir])
-	SMB_SUBSYSTEM_ENABLE(REPLACE_READDIR, YES)
+	SMB_ENABLE(REPLACE_READDIR, YES)
 fi
diff --git a/source4/lib/samba3/config.mk b/source4/lib/samba3/config.mk
index 00b9ad7173..f98a456261 100644
--- a/source4/lib/samba3/config.mk
+++ b/source4/lib/samba3/config.mk
@@ -4,6 +4,7 @@
 MAJOR_VERSION = 0
 MINOR_VERSION = 0
 RELEASE_VERSION = 1
+PUBLIC_HEADERS = samba3.h
 ADD_OBJ_FILES = smbpasswd.o tdbsam.o policy.o \
 		idmap.o winsdb.o samba3.o group.o \
 		registry.o secrets.o share_info.o
diff --git a/source4/lib/socket/config.m4 b/source4/lib/socket/config.m4
index 01cd28baa3..e95b88f23f 100644
--- a/source4/lib/socket/config.m4
+++ b/source4/lib/socket/config.m4
@@ -44,9 +44,9 @@ AC_CACHE_CHECK([for unix domain sockets],samba_cv_unixsocket, [
   sunaddr.sun_family = AF_UNIX;
 ],
 	samba_cv_unixsocket=yes,samba_cv_unixsocket=no)])
-SMB_MODULE_DEFAULT(socket_unix, NOT)
+SMB_ENABLE(socket_unix, NO)
 if test x"$samba_cv_unixsocket" = x"yes"; then
-    SMB_MODULE_DEFAULT(socket_unix, STATIC)
+    SMB_ENABLE(socket_unix, YES)
     AC_DEFINE(HAVE_UNIXSOCKET,1,[If we need to build with unixscoket support])
 fi
 
@@ -63,9 +63,9 @@ fi
 dnl test for ipv6 using the gethostbyname2() function. That should be sufficient
 dnl for now
 AC_CHECK_FUNCS(gethostbyname2, have_ipv6=true, have_ipv6=false)
-SMB_MODULE_DEFAULT(socket_ipv6, NOT)
+SMB_ENABLE(socket_ipv6, NO)
 if $have_ipv6 = true; then
-    SMB_MODULE_DEFAULT(socket_ipv6, STATIC)
+    SMB_ENABLE(socket_ipv6, YES)
     AC_DEFINE(HAVE_SOCKET_IPV6,1,[Whether the system has ipv6 support])
 fi
 dnl don't build ipv6 by default, unless the above test enables it, or
diff --git a/source4/libnet/config.mk b/source4/libnet/config.mk
index 71c80dc0bc..0234f3f866 100644
--- a/source4/libnet/config.mk
+++ b/source4/libnet/config.mk
@@ -4,6 +4,9 @@
 MAJOR_VERSION = 0
 MINOR_VERSION = 0
 RELEASE_VERSION = 1
+PUBLIC_HEADERS = libnet.h libnet_join.h libnet_lookup.h libnet_passwd.h \
+				 libnet_rpc.h libnet_share.h libnet_time.h libnet_user.h \
+				 libnet_vampire.h userinfo.h userman.h
 INIT_OBJ_FILES = \
 		libnet.o
 ADD_OBJ_FILES = \
diff --git a/source4/smbd/process_model.m4 b/source4/smbd/process_model.m4
index 94ef6f13d2..673d5e5e2b 100644
--- a/source4/smbd/process_model.m4
+++ b/source4/smbd/process_model.m4
@@ -1,6 +1,6 @@
 dnl # Server process model subsystem
 
-SMB_MODULE_DEFAULT(process_model_thread,NOT)
+SMB_ENABLE(process_model_thread,NO)
 
 #################################################
 # check for pthread support
@@ -13,7 +13,7 @@ AC_ARG_WITH(pthreads,
 		if test x"$ac_cv_func_pread" != x"yes" -o x"$ac_cv_func_pwrite" != x"yes";then
 			AC_MSG_ERROR([You cannot enable threads when you don't have pread/pwrite!])
 		fi
-		SMB_MODULE_DEFAULT(process_model_thread,STATIC)
+		SMB_ENABLE(process_model_thread,YES)
 		SMB_EXT_LIB_ENABLE(PTHREAD,YES)
 	;;
 	*)