diff options
author | Volker Lendecke <vl@samba.org> | 2008-01-07 18:27:10 +0100 |
---|---|---|
committer | Volker Lendecke <vl@samba.org> | 2008-01-10 22:15:19 +0100 |
commit | 0bfa8671598dd52cd7c97e8d05c940f92df1ffd1 (patch) | |
tree | 6583dd6a66855be9e061079d11269474f9ddd2ea /source3/configure.in | |
parent | b7d222c690a8b5e2b15b694c95015f735eff9cda (diff) | |
download | samba-0bfa8671598dd52cd7c97e8d05c940f92df1ffd1.tar.gz samba-0bfa8671598dd52cd7c97e8d05c940f92df1ffd1.tar.bz2 samba-0bfa8671598dd52cd7c97e8d05c940f92df1ffd1.zip |
--enable-libwbclient-shared
This patch adds the configure option --enable-libwbclient-shared that defaults
to yes. If you set --enable-developer=yes, then you can say
--enable-libwbclient-shared=no to avoid problems you might have with the wrong
shared libaries.
Jerry, is this acceptable to you? If yes, please push.
Thanks!
Volker
(This used to be commit 7a88cd61e09f6db9db38916704ae65e03b33139c)
Diffstat (limited to 'source3/configure.in')
-rw-r--r-- | source3/configure.in | 13 |
1 files changed, 12 insertions, 1 deletions
diff --git a/source3/configure.in b/source3/configure.in index d69928cf16..4222d93227 100644 --- a/source3/configure.in +++ b/source3/configure.in @@ -322,6 +322,7 @@ AC_SUBST(LIBADDNS) AC_SUBST(INSTALL_LIBWBCLIENT) AC_SUBST(UNINSTALL_LIBWBCLIENT) AC_SUBST(LIBWBCLIENT_SHARED) +AC_SUBST(LIBWBCLIENT_STATIC) AC_SUBST(LIBWBCLIENT) AC_SUBST(WINBIND_LIBS) @@ -6160,7 +6161,15 @@ if test x"$HAVE_WINBIND" = x"no"; then WINBIND_WINS_NSS="" fi -if test $BLDSHARED = true -a x"$HAVE_WINBIND" = x"yes"; then +BUILD_LIBWBCLIENT_SHARED=yes + +AC_ARG_ENABLE(libwbclient-shared, +[ --enable-libwbclient-shared Build libwbclient as shared object (default=yes, \"no\" only for --enable-developer)], + [if eval "test x$enable_developer = xyes -a x$enable_libwbclient_shared = xno" ; then + BUILD_LIBWBCLIENT_SHARED=no + fi]) + +if test $BLDSHARED = true -a x"$HAVE_WINBIND" = x"yes" -a x"$BUILD_LIBWBCLIENT_SHARED" = x"yes"; then NSS_MODULES="${WINBIND_NSS} ${WINBIND_WINS_NSS}" ## Only worry about libwbclient if we have shared library support ## and winbindd @@ -6170,6 +6179,8 @@ if test $BLDSHARED = true -a x"$HAVE_WINBIND" = x"yes"; then UNINSTALL_LIBWBCLIENT=uninstalllibwbclient WINBIND_LIBS="-lwbclient" LDFLAGS="$LDFLAGS -L./bin" +else + LIBWBCLIENT_STATIC=bin/libwbclient.a fi if test x"$HAVE_WINBIND" = x"yes"; then |