diff options
| author | Andrew Tridgell <tridge@samba.org> | 2009-04-02 10:17:32 +1100 |
|---|---|---|
| committer | Andrew Tridgell <tridge@samba.org> | 2009-04-02 10:17:32 +1100 |
| commit | 1bc9c3923574d548810733b512716d5758814328 (patch) | |
| tree | aa128b82d3232a8c73de316aa5a7b8bd0caa9766 /source3/m4/aclocal.m4 | |
| parent | 2fe17ae61e4f80b7c864bd6777c71557c97c0125 (diff) | |
| parent | 36c1a52a57bc96c7586ca1bffbe8ef47c93bca1b (diff) | |
| download | samba-1bc9c3923574d548810733b512716d5758814328.tar.gz samba-1bc9c3923574d548810733b512716d5758814328.tar.bz2 samba-1bc9c3923574d548810733b512716d5758814328.zip | |
Merge commit 'master/master' into wspp-schema
Diffstat (limited to 'source3/m4/aclocal.m4')
| -rw-r--r-- | source3/m4/aclocal.m4 | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/source3/m4/aclocal.m4 b/source3/m4/aclocal.m4 index dff4970b2c..386829d1b0 100644 --- a/source3/m4/aclocal.m4 +++ b/source3/m4/aclocal.m4 @@ -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 @@ -152,7 +158,7 @@ else AC_MSG_RESULT(shared library not selected, but will supply static library) fi if test $enable_static = yes; then - LIBUC[_STATIC]=[\$\(]LIBUC[_OBJ0\)] + LIBUC[_STATIC]=$LIBUC[_STATIC_TARGET] fi m4_popdef([LIBNAME]) |