diff options
| author | Michael Adam <obnox@samba.org> | 2008-07-07 00:02:50 +0200 |
|---|---|---|
| committer | Michael Adam <obnox@samba.org> | 2008-07-07 20:34:02 +0200 |
| commit | 1b20cf1324e154cd7b3dcee3450a5c8af4361d16 (patch) | |
| tree | 4709ed9778cd09ec5474b7ccb72fafa15fc9c836 /source3/configure.in | |
| parent | 2e694978f5a21cfd8ce21f5a34ab5bd4ad817dda (diff) | |
| download | samba-1b20cf1324e154cd7b3dcee3450a5c8af4361d16.tar.gz samba-1b20cf1324e154cd7b3dcee3450a5c8af4361d16.tar.bz2 samba-1b20cf1324e154cd7b3dcee3450a5c8af4361d16.zip | |
build: handle libsmbclient by SMB_LIBRARY() and correctly create soname file.
Create libsmbclient.so as a symlink to libsmbclient.so.0.
Michael
(This used to be commit c463bd0cb9927176eec89e25788c6ea78eafdd16)
Diffstat (limited to 'source3/configure.in')
| -rw-r--r-- | source3/configure.in | 53 |
1 files changed, 3 insertions, 50 deletions
diff --git a/source3/configure.in b/source3/configure.in index 8d837eee6f..2ac44b36f0 100644 --- a/source3/configure.in +++ b/source3/configure.in @@ -95,10 +95,6 @@ AC_SUBST(WINBIND_LIBS) AC_SUBST(LIBSAMBAUTIL_SHARED) -AC_SUBST(INSTALL_LIBSMBCLIENT) -AC_SUBST(UNINSTALL_LIBSMBCLIENT) -AC_SUBST(LIBSMBCLIENT_SHARED) -AC_SUBST(LIBSMBCLIENT) AC_SUBST(INSTALL_LIBSMBSHAREMODES) AC_SUBST(UNINSTALL_LIBSMBSHAREMODES) AC_SUBST(LIBSMBSHAREMODES_SHARED) @@ -4684,9 +4680,12 @@ AC_ARG_WITH([static-libs], # LINK_LIBNETAPI=STATIC +LINK_LIBSMBCLIENT=STATIC + SMB_LIBRARY(talloc) SMB_LIBRARY(tdb) SMB_LIBRARY(netapi) +SMB_LIBRARY(smbclient) ################################################# @@ -4721,52 +4720,6 @@ AC_ARG_WITH(libaddns, [AC_MSG_RESULT(no)] ) -################################################# -# should we build libsmbclient? - -INSTALL_LIBSMBCLIENT= -UNINSTALL_LIBSMBCLIENT= -LIBSMBCLIENT_SHARED= -LIBSMBCLIENT= -AC_MSG_CHECKING(whether to build the libsmbclient shared library) -AC_ARG_WITH(libsmbclient, -[AS_HELP_STRING([--with-libsmbclient], [Build the libsmbclient shared library (default=yes if shared libs supported)])], -[ case "$withval" in - no) - AC_MSG_RESULT(no) - ;; - *) - if test $BLDSHARED = true; then - LIBSMBCLIENT_SHARED=bin/libsmbclient.$SHLIBEXT - LIBSMBCLIENT=libsmbclient - AC_MSG_RESULT(yes) - else - enable_static=yes - AC_MSG_RESULT(no shared library support -- will supply static library) - fi - if test $enable_static = yes; then - LIBSMBCLIENT=libsmbclient - fi - INSTALL_LIBSMBCLIENT=installclientlib - UNINSTALL_LIBSMBCLIENT=uninstallclientlib - ;; - esac ], -[ -# if unspecified, default is to build it if possible. - if test $BLDSHARED = true; then - LIBSMBCLIENT_SHARED=bin/libsmbclient.$SHLIBEXT - LIBSMBCLIENT=libsmbclient - AC_MSG_RESULT(yes) - else - enable_static=yes - AC_MSG_RESULT(no shared library support -- will supply static library) - fi - if test $enable_static = yes; then - LIBSMBCLIENT=libsmbclient - fi] - INSTALL_LIBSMBCLIENT=installclientlib - UNINSTALL_LIBSMBCLIENT=uninstallclientlib -) INSTALL_LIBSMBSHAREMODES= LIBSMBSHAREMODES_SHARED= |