summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Adam <obnox@samba.org>2008-07-06 23:37:06 +0200
committerMichael Adam <obnox@samba.org>2008-07-07 20:34:01 +0200
commit2e694978f5a21cfd8ce21f5a34ab5bd4ad817dda (patch)
tree6c593a1f119920b7d8a4057e07a73cdc477c8bfb
parentc9178983e82e91104028e01c2550a05a5bc8666e (diff)
downloadsamba-2e694978f5a21cfd8ce21f5a34ab5bd4ad817dda.tar.gz
samba-2e694978f5a21cfd8ce21f5a34ab5bd4ad817dda.tar.bz2
samba-2e694978f5a21cfd8ce21f5a34ab5bd4ad817dda.zip
build: slightly change and extend the logic of SMB_LIBRARY().
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 f440538c9480134ff05cf9c9f78a565808161101)
-rw-r--r--source3/Makefile.in8
-rw-r--r--source3/m4/aclocal.m430
2 files changed, 25 insertions, 13 deletions
diff --git a/source3/Makefile.in b/source3/Makefile.in
index df5ec7ff3f..eb9a6a26ee 100644
--- a/source3/Makefile.in
+++ b/source3/Makefile.in
@@ -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
diff --git a/source3/m4/aclocal.m4 b/source3/m4/aclocal.m4
index 69bf95ef31..25f9912bef 100644
--- a/source3/m4/aclocal.m4
+++ b/source3/m4/aclocal.m4
@@ -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]