The branch, v3-3-test has been updated
via 5a13b7c442f1b70f36dd336bfa8b3dac897bfa4c (commit)
via 9b0478984ed3d6ffa84e7eb6f7ef1e5fa3a0f1e3 (commit)
from 1cad62d347eca9d3af847fb297d0dc822de7560c (commit)
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-3-test
- Log -----------------------------------------------------------------
commit 5a13b7c442f1b70f36dd336bfa8b3dac897bfa4c
Author: Jeff Layton <[EMAIL PROTECTED]>
Date: Mon Aug 18 13:49:59 2008 -0400
cifs.upcall: enable building by default on linux
When building on linux, default to building cifs.upcall. Throw a
warning if ADS support is disabled or keyutils isn't installed.
Signed-off-by: Jeff Layton <[EMAIL PROTECTED]>
commit 9b0478984ed3d6ffa84e7eb6f7ef1e5fa3a0f1e3
Author: Jeff Layton <[EMAIL PROTECTED]>
Date: Mon Aug 18 13:49:59 2008 -0400
cifs.upcall: move default install location to EPREFIX/sbin
cifs.upcall links to libraries that live under /usr, so installing it
in /sbin doesn't seem appropriate. Move it to EPREFIX/sbin instead
(i.e. /usr/sbin).
Signed-off-by: Jeff Layton <[EMAIL PROTECTED]>
-----------------------------------------------------------------------
Summary of changes:
source/Makefile.in | 8 ++++----
source/configure.in | 23 +++++++++++++++++++----
2 files changed, 23 insertions(+), 8 deletions(-)
Changeset truncated at 500 lines:
diff --git a/source/Makefile.in b/source/Makefile.in
index 938d711..a1dac20 100644
--- a/source/Makefile.in
+++ b/source/Makefile.in
@@ -176,9 +176,9 @@ PATH_FLAGS = -DSMB_PASSWD_FILE=\"$(SMB_PASSWD_FILE)\" \
# Note that all executable programs now provide for an optional executable
suffix.
-SBIN_PROGS = bin/[EMAIL PROTECTED]@ bin/[EMAIL PROTECTED]@ @SWAT_SBIN_TARGETS@
@EXTRA_SBIN_PROGS@
+SBIN_PROGS = bin/[EMAIL PROTECTED]@ bin/[EMAIL PROTECTED]@ @SWAT_SBIN_TARGETS@
@EXTRA_SBIN_PROGS@ @CIFSUPCALL_PROGS@
-ROOT_SBIN_PROGS = @CIFSMOUNT_PROGS@ @CIFSUPCALL_PROGS@
+ROOT_SBIN_PROGS = @CIFSMOUNT_PROGS@
BIN_PROGS1 = bin/[EMAIL PROTECTED]@ bin/[EMAIL PROTECTED]@ bin/[EMAIL
PROTECTED]@ \
bin/[EMAIL PROTECTED]@ bin/[EMAIL PROTECTED]@ bin/[EMAIL PROTECTED]@
@@ -2482,8 +2482,8 @@ installcifsmount:: @CIFSMOUNT_PROGS@
@$(SHELL) script/installbin.sh $(INSTALLPERMS_BIN) $(DESTDIR) $(prefix)
$(ROOTSBINDIR) @CIFSMOUNT_PROGS@
installcifsupcall:: @CIFSUPCALL_PROGS@
- @$(SHELL) $(srcdir)/script/installdirs.sh $(INSTALLPERMS_BIN)
$(DESTDIR) $(ROOTSBINDIR)
- @$(SHELL) script/installbin.sh $(INSTALLPERMS_BIN) $(DESTDIR) $(prefix)
$(ROOTSBINDIR) @CIFSUPCALL_PROGS@
+ @$(SHELL) $(srcdir)/script/installdirs.sh $(INSTALLPERMS_BIN)
$(DESTDIR) $(SBINDIR)
+ @$(SHELL) script/installbin.sh $(INSTALLPERMS_BIN) $(DESTDIR) $(prefix)
$(SBINDIR) @CIFSUPCALL_PROGS@
# Some symlinks are required for the 'probing' of modules.
# This mechanism should go at some point..
diff --git a/source/configure.in b/source/configure.in
index c769859..38819df 100644
--- a/source/configure.in
+++ b/source/configure.in
@@ -4048,7 +4048,7 @@ INSTALL_CIFSUPCALL=""
UNINSTALL_CIFSUPCALL=""
AC_MSG_CHECKING(whether to build cifs.upcall)
AC_ARG_WITH(cifsupcall,
-[AS_HELP_STRING([--with-cifsupcall], [Include cifs.upcall (Linux only) support
(default=no)])],
+[AS_HELP_STRING([--with-cifsupcall], [Include cifs.upcall (Linux only) support
(default=yes)])],
[ case "$withval" in
no)
AC_MSG_RESULT(no)
@@ -4074,9 +4074,24 @@ AC_ARG_WITH(cifsupcall,
esac
;;
esac ],
-[
- AC_MSG_RESULT(no)
- ]
+[ case "$host_os" in
+ *linux*)
+ if test x"$use_ads" != x"yes"; then
+ AC_MSG_WARN(ADS support should be enabled for building
cifs.upcall)
+ elif test x"$HAVE_KEYUTILS_H" != "x1"; then
+ AC_MSG_WARN(keyutils package is required for cifs.upcall)
+ else
+ AC_MSG_RESULT(yes)
+ AC_DEFINE(WITH_CIFSUPCALL,1,[whether to build cifs.upcall])
+ CIFSUPCALL_PROGS="bin/cifs.upcall"
+ INSTALL_CIFSUPCALL="installcifsupcall"
+ UNINSTALL_CIFSUPCALL="uninstallcifsupcall"
+ fi
+ ;;
+ *)
+ AC_MSG_RESULT(no)
+ ;;
+ esac ]
)
--
Samba Shared Repository
