mirror of
https://github.com/samba-team/samba.git
synced 2025-02-09 09:57:48 +03:00
- remove unused 'evel ...' calls, we don't need them inside of
AC_XXX() macros - handle --with-shared-modules=process_model --with-static-modules=process_model_single right. ( build 'single' static and the rest of the process_model modules shared, if they're not declared as NOT. metze (This used to be commit a57734877dd58ab3159435a145b307bd546a9e99)
This commit is contained in:
parent
e7d68c3f7a
commit
e2327d727d
16
source4/aclocal.m4
vendored
16
source4/aclocal.m4
vendored
@ -41,10 +41,10 @@ dnl SMB_MODULE_DEFAULT(1:name,2:default_build)
|
|||||||
AC_DEFUN(SMB_MODULE_DEFAULT,
|
AC_DEFUN(SMB_MODULE_DEFAULT,
|
||||||
[
|
[
|
||||||
dnl Fall back to static if dlopen() is not available
|
dnl Fall back to static if dlopen() is not available
|
||||||
eval MODULE_DEFAULT_$1=$2
|
[MODULE_DEFAULT_][$1]=$2
|
||||||
|
|
||||||
if test x"MODULE_DEFAULT_$1" = xSHARED -a x"$ac_cv_func_dlopen" != xyes; then
|
if test x"$[MODULE_DEFAULT_][$1]" = xSHARED -a x"$ac_cv_func_dlopen" != xyes; then
|
||||||
eval MODULE_DEFAULT_$1=STATIC
|
[MODULE_DEFAULT_][$1]=STATIC
|
||||||
fi
|
fi
|
||||||
])
|
])
|
||||||
|
|
||||||
@ -54,21 +54,21 @@ AC_DEFUN(SMB_MODULE,
|
|||||||
[
|
[
|
||||||
AC_MSG_CHECKING([how to build $1])
|
AC_MSG_CHECKING([how to build $1])
|
||||||
if test -z "$[MODULE_DEFAULT_][$1]"; then
|
if test -z "$[MODULE_DEFAULT_][$1]"; then
|
||||||
eval MODULE_DEFAULT_$1=$3
|
[MODULE_DEFAULT_][$1]=$3
|
||||||
|
|
||||||
if test x"MODULE_DEFAULT_$1" = xSHARED -a x"$ac_cv_func_dlopen" != xyes; then
|
if test x"$[MODULE_DEFAULT_][$1]" = xSHARED -a x"$ac_cv_func_dlopen" != xyes; then
|
||||||
eval MODULE_DEFAULT_$1=STATIC
|
[MODULE_DEFAULT_][$1]=STATIC
|
||||||
fi
|
fi
|
||||||
fi
|
fi
|
||||||
|
|
||||||
if test "$[MODULE_][$1]"; then
|
if test "$[MODULE_][$1]"; then
|
||||||
DEST=$[MODULE_][$1]
|
DEST=$[MODULE_][$1]
|
||||||
elif test "$[MODULE_]translit([$2], [A-Z], [a-z])" -a "$[MODULE_DEFAULT_][$1]"; then
|
elif test "$[MODULE_]translit([$2], [A-Z], [a-z])" -a x"$[MODULE_DEFAULT_][$1]" != xNOT; then
|
||||||
DEST=$[MODULE_]translit([$2], [A-Z], [a-z])
|
DEST=$[MODULE_]translit([$2], [A-Z], [a-z])
|
||||||
else
|
else
|
||||||
DEST=$[MODULE_DEFAULT_][$1]
|
DEST=$[MODULE_DEFAULT_][$1]
|
||||||
fi
|
fi
|
||||||
|
|
||||||
if test x"$DEST" = xSHARED; then
|
if test x"$DEST" = xSHARED; then
|
||||||
AC_DEFINE([$1][_init], [init_module], [Whether to build $1 as shared module])
|
AC_DEFINE([$1][_init], [init_module], [Whether to build $1 as shared module])
|
||||||
$2_MODULES="$$2_MODULES bin/$1.$SHLIBEXT"
|
$2_MODULES="$$2_MODULES bin/$1.$SHLIBEXT"
|
||||||
|
Loading…
x
Reference in New Issue
Block a user