diff options
| author | Michael Adam <obnox@samba.org> | 2011-08-11 10:49:30 +0200 |
|---|---|---|
| committer | Michael Adam <obnox@samba.org> | 2011-08-11 13:26:27 +0200 |
| commit | 91a45490a57e160acd3cbecd58cf2c614cda70be (patch) | |
| tree | 6424abd8b1fae4b4ea8669a5afaa97b63229d374 /source3/m4 | |
| parent | f7b820c3590ac78dd0dea67ac882f53ae6f550d9 (diff) | |
| download | samba-91a45490a57e160acd3cbecd58cf2c614cda70be.tar.gz samba-91a45490a57e160acd3cbecd58cf2c614cda70be.tar.bz2 samba-91a45490a57e160acd3cbecd58cf2c614cda70be.zip | |
s3:build(autoconf): fix bug #8369: remove irritating "." targets when recent system libs exist
Autobuild-User: Michael Adam <obnox@samba.org>
Autobuild-Date: Thu Aug 11 13:26:27 CEST 2011 on sn-devel-104
Diffstat (limited to 'source3/m4')
| -rw-r--r-- | source3/m4/aclocal.m4 | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/source3/m4/aclocal.m4 b/source3/m4/aclocal.m4 index afd7c7491a..6112a647fe 100644 --- a/source3/m4/aclocal.m4 +++ b/source3/m4/aclocal.m4 @@ -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 |