diff options
| author | Michael Adam <obnox@samba.org> | 2008-02-12 15:18:56 +0100 |
|---|---|---|
| committer | Michael Adam <obnox@samba.org> | 2008-02-13 09:25:31 +0100 |
| commit | cb697240505d502a5abf86b405d1b786779b076f (patch) | |
| tree | e07be810796e745dbd50a0c792969d788a76815a /source3/configure.in | |
| parent | 79a3ed88cca77a0c5b5f245d039e5b454545bfe4 (diff) | |
| download | samba-cb697240505d502a5abf86b405d1b786779b076f.tar.gz samba-cb697240505d502a5abf86b405d1b786779b076f.tar.bz2 samba-cb697240505d502a5abf86b405d1b786779b076f.zip | |
Put talloc lib targets into variables and uses these.
LIBTALLOC_STATIC_TARGET and LIBTALLOC_SHARED_TARGET.
Michael
(This used to be commit d1bec3882908086747e1176a275617700cada097)
Diffstat (limited to 'source3/configure.in')
| -rw-r--r-- | source3/configure.in | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/source3/configure.in b/source3/configure.in index 34fac655c4..81296abde0 100644 --- a/source3/configure.in +++ b/source3/configure.in @@ -332,6 +332,8 @@ AC_SUBST(UNINSTALL_LIBADDNS) AC_SUBST(LIBADDNS_SHARED) AC_SUBST(LIBADDNS) +AC_SUBST(LIBTALLOC_STATIC_TARGET) +AC_SUBST(LIBTALLOC_SHARED_TARGET) AC_SUBST(INSTALL_LIBTALLOC) AC_SUBST(UNINSTALL_LIBTALLOC) AC_SUBST(LIBTALLOC_SHARED) @@ -5164,6 +5166,8 @@ AC_ARG_WITH([static-libs], # should we build libtalloc? INSTALL_LIBTALLOC= UNINSTALL_LIBTALLOC= +LIBTALLOC_SHARED_TARGET=bin/libtalloc.$SHLIBEXT +LIBTALLOC_STATIC_TARGET=bin/libtalloc.a LIBTALLOC_SHARED= LIBTALLOC= LIBTALLOC_STATIC= @@ -5190,10 +5194,10 @@ samba_cv_with_libtalloc=yes ) if test x"$samba_cv_with_libtalloc" = "xyes" -a $BLDSHARED = true; then - LIBTALLOC_SHARED=bin/libtalloc.$SHLIBEXT + LIBTALLOC_SHARED=$LIBTALLOC_SHARED_TARGET AC_MSG_RESULT(yes) if test x"$LIB_TALLOC" = "xSTATIC" ; then - LIBTALLOC_STATIC=bin/libtalloc.a + LIBTALLOC_STATIC=$LIBTALLOC_STATIC_TARGET else LIBTALLOC_LIBS=-ltalloc fi @@ -5202,7 +5206,7 @@ else AC_MSG_RESULT(no shared library support -- will supply static library) fi if test $enable_static = yes; then - LIBTALLOC_STATIC=bin/libtalloc.a + LIBTALLOC_STATIC=$LIBTALLOC_STATIC_TARGET fi LIBTALLOC=libtalloc INSTALL_LIBTALLOC=installlibtalloc |