From 4267fcccdab729a54de68d15f6d2fc36584e7e92 Mon Sep 17 00:00:00 2001
From: Andrew Bartlett <abartlet@samba.org>
Date: Thu, 8 Aug 2002 06:44:03 +0000
Subject: Samba dependency hell claim's another victim...

Back out last night's patch to to reduce -l dependencies until we can ensure
that *all* configurations/platforms work...

Andrew Bartlett
(This used to be commit 35eefe7a19b2b684d3ca05a665e9c13e9d17acc3)
---
 source3/configure.in | 24 ++++++++----------------
 1 file changed, 8 insertions(+), 16 deletions(-)

(limited to 'source3/configure.in')

diff --git a/source3/configure.in b/source3/configure.in
index f9720fc28b..db34c266c5 100644
--- a/source3/configure.in
+++ b/source3/configure.in
@@ -147,8 +147,6 @@ 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}"
@@ -498,7 +496,7 @@ if test x$enable_cups != xno; then
                         AC_DEFINE(HAVE_CUPS)
 		CFLAGS="$CFLAGS `$CUPS_CONFIG --cflags`"
 		LDFLAGS="$LDFLAGS `$CUPS_CONFIG --ldflags`"
-		PRINTLIBS="$PRINTLIBS `$CUPS_CONFIG --libs`"
+		LIBS="$LIBS `$CUPS_CONFIG --libs`"
         fi
 fi
 
@@ -506,7 +504,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, [SMBDLIBS="$SMBDLIBS -ldl";
+    AC_CHECK_LIB(dl, dlopen, [LIBS="$LIBS -ldl";
 	AC_DEFINE(HAVE_DLOPEN)])
 fi
 # dlopen/dlclose/dlsym/dlerror will be checked again later and defines will be set then
@@ -613,7 +611,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, [SMBDLIBS="$SMBDLIBS -lcrypt";
+    AC_CHECK_LIB(crypt, crypt, [LIBS="$LIBS -lcrypt";
 	AC_DEFINE(HAVE_CRYPT)])
 fi
 
@@ -2109,7 +2107,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, [SMBDLIBS="$SMBDLIBS -lcrypt";
+    AC_CHECK_LIB(crypt, crypt, [LIBS="$LIBS -lcrypt";
 	AC_DEFINE(HAVE_CRYPT)])
 fi
 fi
@@ -2602,29 +2600,23 @@ AC_ARG_WITH(acl-support,
 	*osf*)
 		AC_MSG_RESULT(Using Tru64 ACLs)
 		AC_DEFINE(HAVE_TRU64_ACLS)
-		SMBDLIBS="$SMBDLIBS -lpacl"
+		LIBS="$LIBS -lpacl"
 		;;
         *)
-		AC_CHECK_LIB(acl,acl_get_file, [SMBDLIBS="$SMBDLIBS -lacl"])
+		AC_CHECK_LIB(acl,acl_get_file)
 		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)
-		LIBS=$acl_LIBS])
+samba_cv_HAVE_POSIX_ACLS=yes,samba_cv_HAVE_POSIX_ACLS=no)])
 			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)
-				LIBS=$acl_LIBS])
+samba_cv_HAVE_ACL_GET_PERM_NP=yes,samba_cv_HAVE_ACL_GET_PERM_NP=no)])
 				if test x"$samba_cv_HAVE_ACL_GET_PERM_NP" = x"yes"; then
 					AC_DEFINE(HAVE_ACL_GET_PERM_NP)
 				fi
-- 
cgit