s3:build: first cut at fixing linking of shared/static libs internally
[ira/wip.git] / source3 / m4 / aclocal.m4
index dff4970b2cbe76788d42567625bffc3a590e42d4..5a07eddb942c2c4b474d7d355a37ce3b6f6c21d5 100644 (file)
@@ -68,7 +68,8 @@ LIBUC[_SHARED_TARGET]=bin/LIBNAME.$SHLIBEXT
 LIBUC[_STATIC_TARGET]=bin/LIBNAME.a
 LIBUC[_SHARED]=
 LIBUC[_STATIC]=
-LIBUC[_LIBS]=
+LIBUC[_LIBS]=LIBLIBS
+LIBUC[_TARGET]=
 [INSTALL_]LIBUC=
 [UNINSTALL_]LIBUC=
 
@@ -79,6 +80,7 @@ AC_SUBST(LIBUC[_STATIC_TARGET])
 AC_SUBST(LIBUC[_SHARED])
 AC_SUBST(LIBUC[_STATIC])
 AC_SUBST(LIBUC[_LIBS])
+AC_SUBST(LIBUC[_TARGET])
 AC_SUBST([INSTALL_]LIBUC)
 AC_SUBST([UNINSTALL_]LIBUC)
 AC_SUBST(LIBUC[_SOVER])
@@ -137,14 +139,18 @@ if eval test x"$build_lib" = "xyes" ; then
        [UNINSTALL_]LIBUC=[uninstall]LIBNAME
        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
+                       LIBUC[_TARGET]=$LIBUC[_STATIC_TARGET]
+                       LIBUC[_LIBS]=$LIBUC[_STATIC_TARGET]
                else
                        LIBUC[_LIBS]=LIBLIBS
                fi
        else
                enable_static=yes
+               LIBUC[_TARGET]=$LIBUC[_STATIC_TARGET]
                AC_MSG_RESULT(no shared library support -- will supply static library)
        fi
 else