diff options
| author | Simo Sorce <idra@samba.org> | 2010-07-19 13:48:31 -0400 |
|---|---|---|
| committer | Simo Sorce <idra@samba.org> | 2010-07-19 13:48:31 -0400 |
| commit | f9f3358348229b14d368316e327cfd2a4cb48c7c (patch) | |
| tree | 9fb61c2ed61dd1ff93a64fc4498a4ec8d3a0607d /source3/m4/aclocal.m4 | |
| parent | 7e4de49bfceed18c81abf93703a61d0a22617a24 (diff) | |
| parent | 630a2eb68af0d523a1bb4451bbaa75d2ba47d252 (diff) | |
| download | samba-f9f3358348229b14d368316e327cfd2a4cb48c7c.tar.gz samba-f9f3358348229b14d368316e327cfd2a4cb48c7c.tar.bz2 samba-f9f3358348229b14d368316e327cfd2a4cb48c7c.zip | |
Merge branch 'master' of ssh://git.samba.org/data/git/samba
Diffstat (limited to 'source3/m4/aclocal.m4')
| -rw-r--r-- | source3/m4/aclocal.m4 | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/source3/m4/aclocal.m4 b/source3/m4/aclocal.m4 index f7f3497a23..3ca44bd496 100644 --- a/source3/m4/aclocal.m4 +++ b/source3/m4/aclocal.m4 @@ -30,9 +30,17 @@ AC_DEFUN(SMB_MODULE, AC_MSG_RESULT([shared]) [$6] string_shared_modules="$string_shared_modules $1" + elif test x"$DEST" = xSTATIC && test x"$4" = xRPC; then + [init_static_modules_]translit([$4], [A-Z], [a-z])="$[init_static_modules_]translit([$4], [A-Z], [a-z]) $1_init(NULL);" + [decl_static_modules_]translit([$4], [A-Z], [a-z])="$[decl_static_modules_]translit([$4], [A-Z], [a-z]) extern NTSTATUS $1_init(const struct rpc_srv_callbacks *rpc_srv_cb);" + string_static_modules="$string_static_modules $1" + $4_STATIC="$$4_STATIC $2" + AC_SUBST($4_STATIC) + [$5] + AC_MSG_RESULT([static]) elif test x"$DEST" = xSTATIC; then [init_static_modules_]translit([$4], [A-Z], [a-z])="$[init_static_modules_]translit([$4], [A-Z], [a-z]) $1_init();" - [decl_static_modules_]translit([$4], [A-Z], [a-z])="$[decl_static_modules_]translit([$4], [A-Z], [a-z]) extern NTSTATUS $1_init(void);" + [decl_static_modules_]translit([$4], [A-Z], [a-z])="$[decl_static_modules_]translit([$4], [A-Z], [a-z]) extern NTSTATUS $1_init(void);" string_static_modules="$string_static_modules $1" $4_STATIC="$$4_STATIC $2" AC_SUBST($4_STATIC) |