- remove all STFS related stuff

  (which were already removed in revision 1.37 and
   readded by mistake in revision 1.39)

- change the SMB_MODULE() macro a bit
  Now we have:

dnl Specify the default build method of this module
dnl SMB_MODULE_DEFAULT(name,default_build)
AC_DEFUN(SMB_MODULE_DEFAULT,...

dnl Mark specified module as shared
dnl SMB_MODULE(name,default_build,static_files,shared_files,subsystem,whatif-static,whatif-shared,whatif-not)

  this let us specify the default build method inside of the included config.m4
  files

metze
(This used to be commit 92a3eb83d4bb07a7f1f87232e26831d05ab42915)

1 files changed, 16 insertions, 32 deletions

diff --git a/source4/configure.in b/source4/configure.in
index 746fb9eb891..b0a8b950a48 100644
--- a/source4/configure.in
+++ b/source4/configure.in
@@ -229,18 +229,6 @@ AC_VALIDATE_CACHE_SYSTEM_TYPE
 
 DYNEXP=
 
-dnl Add modules that have to be built by default here
-dnl These have to be built static:
-default_static_modules="ntvfs_ipc ntvfs_simple ntvfs_print ntvfs_cifs dcerpc_rpcecho dcerpc_epmapper dcerpc_remote"
-
-dnl These are preferably build shared, and static if dlopen() is not available
-default_shared_modules=""
-
-if test "x$developer" = xyes; then
-   default_static_modules="$default_static_modules"
-   default_shared_modules="$default_shared_modules"
-fi
-
 #
 # Config CPPFLAG settings for strange OS's that must be set
 # before other tests.
@@ -2791,37 +2779,33 @@ samba_cv_HAVE_SENDFILEV=yes,samba_cv_HAVE_SENDFILEV=no)])
 sinclude(nsswitch/config.m4)
 sinclude(popt/config.m4)
 
-for i in `echo $default_static_modules | sed -e's/,/ /g'`
-do
-	eval MODULE_DEFAULT_$i=STATIC
-done
-
-for i in `echo $default_shared_modules | sed -e's/,/ /g'`
-do
-	dnl Fall back to static if dlopen() is not available
-	eval MODULE_DEFAULT_$i=STATIC
-
-	if test x"$ac_cv_func_dlopen" = xyes; then
-		eval MODULE_DEFAULT_$i=SHARED
-	fi
-done
-
-dnl Always built these modules static
-AC_ARG_WITH(static-modules,
-[  --with-static-modules=MODULES  Comma-seperated list of names of modules to statically link in],
+dnl exclude these modules 
+AC_ARG_WITH(exclude-modules,
+[  --with-exclude-modules=MODULES Comma-seperated list of names of modules to exclude from build],
 [ if test $withval; then
 	for i in `echo $withval | sed -e's/,/ /g'`
 	do
-		eval MODULE_$i=STATIC
+		eval MODULE_$i=NOT
 	done
 fi ])
 
+dnl Always built these modules shared
 AC_ARG_WITH(shared-modules,
 [  --with-shared-modules=MODULES  Comma-seperated list of names of modules to build shared],
 [ if test $withval; then
 	for i in `echo $withval | sed -e's/,/ /g'`
 	do
-			eval MODULE_$i=SHARED
+		eval MODULE_$i=SHARED
+	done
+fi ])
+
+dnl Always built these modules static
+AC_ARG_WITH(static-modules,
+[  --with-static-modules=MODULES  Comma-seperated list of names of modules to statically link in],
+[ if test $withval; then
+	for i in `echo $withval | sed -e's/,/ /g'`
+	do
+		eval MODULE_$i=STATIC
 	done
 fi ])