diff options
| author | Andrew Bartlett <abartlet@samba.org> | 2002-08-07 09:51:59 +0000 |
|---|---|---|
| committer | Andrew Bartlett <abartlet@samba.org> | 2002-08-07 09:51:59 +0000 |
| commit | ab0ca0f0b2f58cd1e37a3ec12113bb83e211ef71 (patch) | |
| tree | f7ed98ff0aa0b6fd891061d9b828740b4279f4fb /source3/configure.in | |
| parent | 7a0af712b0752c2cc14da98843d03683c4d7e216 (diff) | |
| download | samba-ab0ca0f0b2f58cd1e37a3ec12113bb83e211ef71.tar.gz samba-ab0ca0f0b2f58cd1e37a3ec12113bb83e211ef71.tar.bz2 samba-ab0ca0f0b2f58cd1e37a3ec12113bb83e211ef71.zip | |
Patch from Steve Langasek <vorlon@netexpress.net> to split up our -l
dependencies. This benifits packagers (like debian) becouse then our client
code won't have references to 'server only' libraries.
(In particular, it removes the client dependency on CUPS, which was raised in
a debian bug report).
Andrew Bartlett
(This used to be commit d5f2e33b34fe0e67153894b6bf582b7eaca40e7f)
Diffstat (limited to 'source3/configure.in')
| -rw-r--r-- | source3/configure.in | 24 |
1 files changed, 16 insertions, 8 deletions
diff --git a/source3/configure.in b/source3/configure.in index db34c266c5..f9720fc28b 100644 --- a/source3/configure.in +++ b/source3/configure.in @@ -147,6 +147,8 @@ AC_SUBST(POBAD_CC) AC_SUBST(SHLIBEXT) AC_SUBST(LIBSMBCLIENT_SHARED) AC_SUBST(LIBSMBCLIENT) +AC_SUBST(SMBDLIBS) +AC_SUBST(PRINTLIBS) # compile with optimization and without debugging by default CFLAGS="-O ${CFLAGS}" @@ -496,7 +498,7 @@ if test x$enable_cups != xno; then AC_DEFINE(HAVE_CUPS) CFLAGS="$CFLAGS `$CUPS_CONFIG --cflags`" LDFLAGS="$LDFLAGS `$CUPS_CONFIG --ldflags`" - LIBS="$LIBS `$CUPS_CONFIG --libs`" + PRINTLIBS="$PRINTLIBS `$CUPS_CONFIG --libs`" fi fi @@ -504,7 +506,7 @@ fi # we need dlopen/dlclose/dlsym/dlerror for PAM, the password database plugins and the new VFS code AC_CHECK_FUNCS(dlopen) if test x"$ac_cv_func_dlopen" = x"no"; then - AC_CHECK_LIB(dl, dlopen, [LIBS="$LIBS -ldl"; + AC_CHECK_LIB(dl, dlopen, [SMBDLIBS="$SMBDLIBS -ldl"; AC_DEFINE(HAVE_DLOPEN)]) fi # dlopen/dlclose/dlsym/dlerror will be checked again later and defines will be set then @@ -611,7 +613,7 @@ AC_FUNC_MEMCMP # test for where we get crypt() from AC_CHECK_FUNCS(crypt) if test x"$ac_cv_func_crypt" = x"no"; then - AC_CHECK_LIB(crypt, crypt, [LIBS="$LIBS -lcrypt"; + AC_CHECK_LIB(crypt, crypt, [SMBDLIBS="$SMBDLIBS -lcrypt"; AC_DEFINE(HAVE_CRYPT)]) fi @@ -2107,7 +2109,7 @@ AC_ARG_WITH(pam_smbpass, if test $with_pam_for_crypt = no; then AC_CHECK_FUNCS(crypt) if test x"$ac_cv_func_crypt" = x"no"; then - AC_CHECK_LIB(crypt, crypt, [LIBS="$LIBS -lcrypt"; + AC_CHECK_LIB(crypt, crypt, [SMBDLIBS="$SMBDLIBS -lcrypt"; AC_DEFINE(HAVE_CRYPT)]) fi fi @@ -2600,23 +2602,29 @@ AC_ARG_WITH(acl-support, *osf*) AC_MSG_RESULT(Using Tru64 ACLs) AC_DEFINE(HAVE_TRU64_ACLS) - LIBS="$LIBS -lpacl" + SMBDLIBS="$SMBDLIBS -lpacl" ;; *) - AC_CHECK_LIB(acl,acl_get_file) + AC_CHECK_LIB(acl,acl_get_file, [SMBDLIBS="$SMBDLIBS -lacl"]) AC_CACHE_CHECK([for ACL support],samba_cv_HAVE_POSIX_ACLS,[ + acl_LIBS=$LIBS + LIBS="$LIBS -lacl" AC_TRY_LINK([#include <sys/types.h> #include <sys/acl.h>], [ acl_t acl; int entry_id; acl_entry_t *entry_p; return acl_get_entry( acl, entry_id, entry_p);], -samba_cv_HAVE_POSIX_ACLS=yes,samba_cv_HAVE_POSIX_ACLS=no)]) +samba_cv_HAVE_POSIX_ACLS=yes,samba_cv_HAVE_POSIX_ACLS=no) + LIBS=$acl_LIBS]) if test x"$samba_cv_HAVE_POSIX_ACLS" = x"yes"; then AC_MSG_RESULT(Using posix ACLs) AC_DEFINE(HAVE_POSIX_ACLS) AC_CACHE_CHECK([for acl_get_perm_np],samba_cv_HAVE_ACL_GET_PERM_NP,[ + acl_LIBS=$LIBS + LIBS="$LIBS -lacl" AC_TRY_LINK([#include <sys/types.h> #include <sys/acl.h>], [ acl_permset_t permset_d; acl_perm_t perm; return acl_get_perm_np( permset_d, perm);], -samba_cv_HAVE_ACL_GET_PERM_NP=yes,samba_cv_HAVE_ACL_GET_PERM_NP=no)]) +samba_cv_HAVE_ACL_GET_PERM_NP=yes,samba_cv_HAVE_ACL_GET_PERM_NP=no) + LIBS=$acl_LIBS]) if test x"$samba_cv_HAVE_ACL_GET_PERM_NP" = x"yes"; then AC_DEFINE(HAVE_ACL_GET_PERM_NP) fi |