diff options
Diffstat (limited to 'source4/configure.in')
| -rw-r--r-- | source4/configure.in | 48 |
1 files changed, 16 insertions, 32 deletions
diff --git a/source4/configure.in b/source4/configure.in index 746fb9eb89..b0a8b950a4 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 ]) |