sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2024-12-24 21:34:56 +03:00
Code

build: slightly change and extend the logic of SMB_LIBRARY().

Browse Source 
Only call the install/uninstall targets (from make (un)install)
for libraries configured with SMB_LIBRARY(), when the user did
not set --with-libname=no.

Make sure to always (at least) build the static version of the library.

Michael
(This used to be commit f440538c94)
This commit is contained in:
Michael Adam 2008-07-06 23:37:06 +02:00
parent c9178983e8
commit 2e694978f5
2 changed files with 25 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
source3/Makefile.in
View File

@ -2311,10 +2311,10 @@ bin/rpc_open_tcp@EXEEXT@: $(BINARY_PREREQS) $(RPC_OPEN_TCP_OBJ) @LIBTALLOC_SHARE
install:: installservers installbin @INSTALL_CIFSMOUNT@ @INSTALL_CIFSSPNEGO@ installman \
installscripts installdat installmodules @SWAT_INSTALL_TARGETS@ \
installlibtalloc \
installlibtdb \
@INSTALL_LIBTALLOC@ \
@INSTALL_LIBTDB@ \
@INSTALL_LIBSMBCLIENT@ @INSTALL_PAM_MODULES@ \
@INSTALL_LIBSMBSHAREMODES@ @INSTALL_LIBWBCLIENT@ installlibnetapi
@INSTALL_LIBSMBSHAREMODES@ @INSTALL_LIBWBCLIENT@ @INSTALL_LIBNETAPI@
install-everything:: install installmodules
@ -2419,7 +2419,7 @@ showlayout::
@echo " swatdir: $(SWATDIR)"
uninstall:: uninstallman uninstallservers uninstallbin @UNINSTALL_CIFSMOUNT@ @UNINSTALL_CIFSSPNEGO@ uninstallscripts uninstalldat uninstallswat uninstallmodules uninstalllibtalloc uninstalllibtdb @UNINSTALL_LIBSMBCLIENT@ @UNINSTALL_PAM_MODULES@ @UNINSTALL_LIBSMBSHAREMODES@ uninstalllibnetapi uninstalllibwbclient
uninstall:: uninstallman uninstallservers uninstallbin @UNINSTALL_CIFSMOUNT@ @UNINSTALL_CIFSSPNEGO@ uninstallscripts uninstalldat uninstallswat uninstallmodules @UNINSTALL_LIBTALLOC@ @UNINSTALL_LIBTDB@ @UNINSTALL_LIBSMBCLIENT@ @UNINSTALL_PAM_MODULES@ @UNINSTALL_LIBSMBSHAREMODES@ @UNINSTALL_LIBNETAPI@ uninstalllibwbclient
uninstallman::
@$(SHELL) $(srcdir)/script/uninstallman.sh $(DESTDIR)$(MANDIR) $(srcdir) C

30
source3/m4/aclocal.m4 vendored
View File

@ -69,12 +69,16 @@ LIBUC[_STATIC_TARGET]=bin/LIBNAME.a
LIBUC[_SHARED]=
LIBUC[_STATIC]=
LIBUC[_LIBS]=
[INSTALL_]LIBUC=
[UNINSTALL_]LIBUC=
AC_SUBST(LIBUC[_SHARED_TARGET])
AC_SUBST(LIBUC[_STATIC_TARGET])
AC_SUBST(LIBUC[_SHARED])
AC_SUBST(LIBUC[_STATIC])
AC_SUBST(LIBUC[_LIBS])
AC_SUBST([INSTALL_]LIBUC)
AC_SUBST([UNINSTALL_]LIBUC)
AC_MSG_CHECKING([whether to build the LIBNAME shared library])
AC_ARG_WITH(LIBNAME,
@ -82,11 +86,11 @@ AS_HELP_STRING([--with-]LIBNAME,
[Build the LIBNAME shared library (default=yes if shared libs supported)]),
[
case "$withval" in
*)
no)
AC_MSG_RESULT(no)
build_lib=no
;;
yes)
*)
build_lib=yes
;;
esac
@ -97,17 +101,25 @@ build_lib=yes
]
)
if eval test x"$build_lib" = "xyes" -a $BLDSHARED = true; then
LIBUC[_SHARED]=$LIBUC[_SHARED_TARGET]
AC_MSG_RESULT(yes)
if test x"$USESHARED" != x"true" -o x"$[LINK_]LIBUC" = "xSTATIC" ; then
LIBUC[_STATIC]=$LIBUC[_STATIC_TARGET]
if eval test x"$build_lib" = "xyes" ; then
# only set the install targets if the user chose the library
[INSTALL_]LIBUC=[install]LIBNAME
[UNINSTALL_]LIBUC=[uninstall]LIBNAME
if eval $BLDSHARED = true; then
LIBUC[_SHARED]=$LIBUC[_SHARED_TARGET]
AC_MSG_RESULT(yes)
if test x"$USESHARED" != x"true" -o x"$[LINK_]LIBUC" = "xSTATIC" ; then
LIBUC[_STATIC]=$LIBUC[_STATIC_TARGET]
else
LIBUC[_LIBS]=LIBLIBS
fi
else
LIBUC[_LIBS]=LIBLIBS
enable_static=yes
AC_MSG_RESULT(no shared library support -- will supply static library)
fi
else
enable_static=yes
AC_MSG_RESULT(no shared library support -- will supply static library)
AC_MSG_RESULT(shared library not selected, but will supply static library)
fi
if test $enable_static = yes; then
LIBUC[_STATIC]=$LIBUC[_STATIC_TARGET]