s3: Remove a pointless else branch

[nivanova/samba-autobuild/.git] / source3 / m4 / aclocal.m4

diff --git a/source3/m4/aclocal.m4 b/source3/m4/aclocal.m4
index afd7c7491a12d327ece8f4d68c2eecb11200aa1a..a4db42e5ca94eb7c6ee949bd6066e990b36d1dbb 100644 (file)
--- a/source3/m4/aclocal.m4
+++ b/source3/m4/aclocal.m4
@@ -25,7 +25,7 @@ AC_DEFUN(SMB_MODULE,
        fi
        
        if test x"$DEST" = xSHARED; then
-               AC_DEFINE([$1][_init], [init_samba_module], [Whether to build $1 as shared module])
+               AC_DEFINE([$1][_init], [samba_init_module], [Whether to build $1 as shared module])
                $4_MODULES="$$4_MODULES $3"
                AC_MSG_RESULT([shared])
                [$6]
@@ -76,6 +76,9 @@ LIBUC[_TARGET]=
 m4_if([$2], [], [LIBUC[_SOVER]=0], [LIBUC[_SOVER]=$2])
 m4_if([$3], [], [LIBUC[_FULLVER]=$LIBUC[_SOVER]], [LIBUC[_FULLVER]=$3])
 
+LIBUC[_SHARED_TARGET_SOVER]=$LIBUC[_SHARED_TARGET].$LIBUC[_SOVER]
+LIBUC[_SHARED_TARGET_FULLVER]=$LIBUC[_SHARED_TARGET].$LIBUC[_FULLVER]
+
 AC_SUBST(LIBUC[_SHARED_TARGET])
 AC_SUBST(LIBUC[_STATIC_TARGET])
 AC_SUBST(LIBUC[_SHARED])
@@ -86,6 +89,8 @@ AC_SUBST([INSTALL_]LIBUC)
 AC_SUBST([UNINSTALL_]LIBUC)
 AC_SUBST(LIBUC[_SOVER])
 AC_SUBST(LIBUC[_FULLVER])
+AC_SUBST(LIBUC[_SHARED_TARGET_SOVER])
+AC_SUBST(LIBUC[_SHARED_TARGET_FULLVER])
 
 AC_MSG_CHECKING([whether to build the LIBNAME shared library])
 m4_if([$4], [no], [
@@ -142,6 +147,7 @@ if eval test x"$build_lib" = "xyes" ; then
        if eval $BLDSHARED = true; then
                LIBUC[_SHARED]=$LIBUC[_SHARED_TARGET]
                LIBUC[_TARGET]=$LIBUC[_SHARED_TARGET]
+
                AC_MSG_RESULT(yes)
                if test x"$USESHARED" != x"true" -o x"$[LINK_]LIBUC" = "xSTATIC" ; then
                        enable_static=yes