diff options
| -rw-r--r-- | source3/Makefile.in | 54 | ||||
| -rw-r--r-- | source3/configure.in | 124 | ||||
| -rw-r--r-- | source4/client/config.m4 | 13 | ||||
| -rw-r--r-- | source4/client/config.mk | 16 | ||||
| -rw-r--r-- | source4/configure.ac | 1 |
5 files changed, 5 insertions, 203 deletions
diff --git a/source3/Makefile.in b/source3/Makefile.in index de70c2747e..739eeda3cc 100644 --- a/source3/Makefile.in +++ b/source3/Makefile.in @@ -208,8 +208,6 @@ PATH_FLAGS = -DSMB_PASSWD_FILE=\"$(SMB_PASSWD_FILE)\" \ SBIN_PROGS = bin/smbd@EXEEXT@ bin/nmbd@EXEEXT@ @SWAT_SBIN_TARGETS@ @EXTRA_SBIN_PROGS@ -ROOT_SBIN_PROGS = @CIFSMOUNT_PROGS@ @CIFSUMOUNT_PROGS@ - BIN_PROGS1 = bin/smbclient@EXEEXT@ bin/net@EXEEXT@ bin/smbspool@EXEEXT@ \ bin/testparm@EXEEXT@ bin/smbstatus@EXEEXT@ bin/smbget@EXEEXT@ BIN_PROGS2 = bin/smbcontrol@EXEEXT@ bin/smbtree@EXEEXT@ $(TDBBACKUP) \ @@ -1039,12 +1037,6 @@ CUPS_OBJ = client/smbspool.o $(PARAM_OBJ) $(LIBSMB_OBJ) $(LDB_OBJ) \ $(LIB_NONSMBD_OBJ) $(KRBCLIENT_OBJ) $(POPT_LIB_OBJ) \ $(LIBNDR_GEN_OBJ0) -CIFS_MOUNT_OBJ = ../client/mount.cifs.o ../client/mtab.o - -CIFS_UMOUNT_OBJ = ../client/umount.cifs.o ../client/mtab.o - -CIFS_UPCALL_OBJ = ../client/cifs.upcall.o - NMBLOOKUP_OBJ = utils/nmblookup.o $(PARAM_OBJ) $(LIBNMB_OBJ) \ $(LIB_NONSMBD_OBJ) $(POPT_LIB_OBJ) $(LIBSMB_ERR_OBJ) @@ -1358,8 +1350,8 @@ SPLIT_TOKENS_OBJ = utils/split_tokens.o \ ###################################################################### # now the rules... ###################################################################### -all:: SHOWFLAGS basics libs $(SBIN_PROGS) $(BIN_PROGS) $(ROOT_SBIN_PROGS) \ - $(MODULES) $(NSS_MODULES) $(PAM_MODULES) @CIFSUPCALL_PROGS@ \ +all:: SHOWFLAGS basics libs $(SBIN_PROGS) $(BIN_PROGS) \ + $(MODULES) $(NSS_MODULES) $(PAM_MODULES) \ $(EXTRA_ALL_TARGETS) basics:: @@ -1620,21 +1612,6 @@ bin/smbspool@EXEEXT@: $(BINARY_PREREQS) $(CUPS_OBJ) @BUILD_POPT@ $(LIBTALLOC) $( @LIBWBCLIENT_STATIC@ $(LIBWBCLIENT_LIBS) \ $(KRB5LIBS) $(LDAP_LIBS) $(POPT_LIBS) $(LIBTALLOC_LIBS) $(LIBTDB_LIBS) $(ZLIB_LIBS) -bin/mount.cifs@EXEEXT@: $(BINARY_PREREQS) $(CIFS_MOUNT_OBJ) - @echo Linking $@ - @$(CC) -o $@ $(CIFS_MOUNT_OBJ) $(DYNEXP) $(LDFLAGS) - -bin/umount.cifs@EXEEXT@: $(BINARY_PREREQS) $(CIFS_UMOUNT_OBJ) - @echo Linking $@ - @$(CC) -o $@ $(CIFS_UMOUNT_OBJ) $(DYNEXP) $(LDFLAGS) - -bin/cifs.upcall@EXEEXT@: $(BINARY_PREREQS) $(CIFS_UPCALL_OBJ) $(LIBSMBCLIENT_OBJ1) $(LIBTALLOC) $(LIBTDB) $(LIBWBCLIENT) - @echo Linking $@ - @$(CC) -o $@ $(CIFS_UPCALL_OBJ) $(DYNEXP) $(LDFLAGS) \ - $(LIBSMBCLIENT_OBJ1) $(LIBS) -lkeyutils $(KRB5LIBS) \ - $(LDAP_LIBS) $(LIBTALLOC_LIBS) $(LIBWBCLIENT_LIBS) \ - $(LIBTDB_LIBS) $(NSCD_LIBS) $(ZLIB_LIBS) - bin/testparm@EXEEXT@: $(BINARY_PREREQS) $(TESTPARM_OBJ) @BUILD_POPT@ $(LIBTALLOC) $(LIBTDB) @echo Linking $@ @$(CC) -o $@ $(TESTPARM_OBJ) $(LDFLAGS) $(DYNEXP) $(LIBS) \ @@ -2973,7 +2950,7 @@ bin/split_tokens@EXEEXT@: $(BINARY_PREREQS) $(SPLIT_TOKENS_OBJ) @BUILD_POPT@ $(L $(LDAP_LIBS) \ $(LIBTALLOC_LIBS) $(LIBTDB_LIBS) -install:: installservers installbin @INSTALL_CIFSMOUNT@ @INSTALL_CIFSUMOUNT@ @INSTALL_CIFSUPCALL@ installman \ +install:: installservers installbin installman \ installscripts installdat installmodules @SWAT_INSTALL_TARGETS@ \ @INSTALL_PAM_MODULES@ installlibs installmo @@ -2999,18 +2976,6 @@ installservers:: all installdirs installbin:: all installdirs @$(SHELL) script/installbin.sh $(INSTALLPERMS_BIN) $(DESTDIR) $(prefix) $(BINDIR) $(BIN_PROGS) -installcifsmount:: @CIFSMOUNT_PROGS@ - @$(SHELL) $(srcdir)/script/installdirs.sh $(INSTALLPERMS_BIN) $(DESTDIR) $(ROOTSBINDIR) - @$(SHELL) script/installbin.sh $(INSTALLPERMS_BIN) $(DESTDIR) $(prefix) $(ROOTSBINDIR) @CIFSMOUNT_PROGS@ - -installcifsumount:: @CIFSUMOUNT_PROGS@ - @$(SHELL) $(srcdir)/script/installdirs.sh $(INSTALLPERMS_BIN) $(DESTDIR) $(ROOTSBINDIR) - @$(SHELL) script/installbin.sh $(INSTALLPERMS_BIN) $(DESTDIR) $(prefix) $(ROOTSBINDIR) @CIFSUMOUNT_PROGS@ - -installcifsupcall:: @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.. installmodules:: modules installdirs @@ -3087,7 +3052,7 @@ showlayout:: @echo " codepagedir: $(CODEPAGEDIR)" -uninstall:: uninstallmo uninstallman uninstallservers uninstallbin @UNINSTALL_CIFSMOUNT@ @UNINSTALL_CIFSUMOUNT@ @UNINSTALL_CIFSUPCALL@ uninstallscripts uninstalldat uninstallswat uninstallmodules uninstalllibs @UNINSTALL_PAM_MODULES@ +uninstall:: uninstallmo uninstallman uninstallservers uninstallbin uninstallscripts uninstalldat uninstallswat uninstallmodules uninstalllibs @UNINSTALL_PAM_MODULES@ uninstallmo:: @$(SHELL) $(srcdir)/script/uninstallmo.sh $(DESTDIR) $(LOCALEDIR) $(srcdir) @@ -3101,15 +3066,6 @@ uninstallservers:: uninstallbin:: @$(SHELL) script/uninstallbin.sh $(INSTALLPERMS_BIN) $(DESTDIR) $(prefix) $(BINDIR) $(BIN_PROGS) -uninstallcifsmount:: - @$(SHELL) script/uninstallbin.sh $(INSTALLPERMS_BIN) $(DESTDIR) $(prefix) $(ROOTSBINDIR) @CIFSMOUNT_PROGS@ - -uninstallcifsumount:: - @$(SHELL) script/uninstallbin.sh $(INSTALLPERMS_BIN) $(DESTDIR) $(prefix) $(ROOTSBINDIR) @CIFSUMOUNT_PROGS@ - -uninstallcifsupcall:: - @$(SHELL) script/uninstallbin.sh $(INSTALLPERMS_BIN) $(DESTDIR) $(prefix) $(ROOTSBINDIR) @CIFSUPCALL_PROGS@ - uninstallmodules:: @$(SHELL) $(srcdir)/script/uninstallmodules.sh $(INSTALLPERMS_BIN) $(DESTDIR) $(prefix) $(VFSLIBDIR) $(VFS_MODULES) @$(SHELL) $(srcdir)/script/uninstallmodules.sh $(INSTALLPERMS_BIN) $(DESTDIR) $(prefix) $(PDBLIBDIR) $(PDB_MODULES) @@ -3159,7 +3115,7 @@ clean:: cleanlibs ../nsswitch/*.o ../nsswitch/*/*.o ../nsswitch/*/*/*.o ../nsswitch/*.@SHLIBEXT@ \ ../client/*.o \ */*.@SHLIBEXT@ */*/*.@SHLIBEXT@ */*/*/*.@SHLIBEXT@ \ - $(TOPFILES) $(BIN_PROGS) $(SBIN_PROGS) $(ROOT_SBIN_PROGS) \ + $(TOPFILES) $(BIN_PROGS) $(SBIN_PROGS) \ $(MODULES) $(TORTURE_PROGS) \ $(EVERYTHING_PROGS) \ bin/timelimit \ diff --git a/source3/configure.in b/source3/configure.in index 7ba72bf26c..a1a4d44af0 100644 --- a/source3/configure.in +++ b/source3/configure.in @@ -4332,130 +4332,6 @@ AC_ARG_WITH(automount, ) ################################################# -# check for mount- and umount.cifs support -CIFSMOUNT_PROGS="" -INSTALL_CIFSMOUNT="" -UNINSTALL_CIFSMOUNT="" -AC_MSG_CHECKING(whether to build mount.cifs) -AC_ARG_WITH(cifsmount, -[AS_HELP_STRING([--with-cifsmount], [Include mount.cifs (Linux only) support (default=yes)])], -[ case "$withval" in - no) - AC_MSG_RESULT(no) - ;; - *) - case "$host_os" in - *linux*) - AC_MSG_RESULT(yes) - AC_DEFINE(WITH_CIFSMOUNT,1,[Whether to build mount.cifs]) - CIFSMOUNT_PROGS="bin/mount.cifs" - INSTALL_CIFSMOUNT="installcifsmount" - UNINSTALL_CIFSMOUNT="uninstallcifsmount" - ;; - *) - AC_MSG_ERROR(not on a linux system!) - ;; - esac - ;; - esac ], -[ case "$host_os" in - *linux*) - AC_MSG_RESULT(yes) - AC_DEFINE(WITH_CIFSMOUNT,1,[Whether to build mount.cifs]) - CIFSMOUNT_PROGS="bin/mount.cifs" - INSTALL_CIFSMOUNT="installcifsmount" - UNINSTALL_CIFSMOUNT="uninstallcifsmount" - ;; - *) - AC_MSG_RESULT(no) - ;; - esac ] -) - -CIFSUMOUNT_PROGS="" -INSTALL_CIFSUMOUNT="" -UNINSTALL_CIFSUMOUNT="" -AC_MSG_CHECKING(whether to build umount.cifs) -AC_ARG_WITH(cifsumount, -[AS_HELP_STRING([--with-cifsumount], [Include umount.cifs (Linux only) support (default=no)])], -[ case "$withval" in - yes) - case "$host_os" in - *linux*) - AC_MSG_RESULT(yes) - AC_DEFINE(WITH_CIFSUMOUNT,1,[Whether to build umount.cifs]) - CIFSUMOUNT_PROGS="bin/umount.cifs" - INSTALL_CIFSUMOUNT="installcifsumount" - UNINSTALL_CIFSUMOUNT="uninstallcifsumount" - ;; - *) - AC_MSG_ERROR(not on a linux system!) - ;; - esac - ;; - *) - AC_MSG_RESULT(no) - ;; - esac ], - AC_MSG_RESULT(no) -) - -################################################# -# check for cifs.upcall support -AC_CHECK_HEADERS([keyutils.h], [HAVE_KEYUTILS_H=1], [HAVE_KEYUTILS_H=0]) -CIFSUPCALL_PROGS="" -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=yes)])], -[ case "$withval" in - no) - AC_MSG_RESULT(no) - ;; - *) - case "$host_os" in - *linux*) - if test x"$use_ads" != x"yes"; then - AC_MSG_ERROR(ADS support should be enabled for building cifs.upcall) - elif test x"$HAVE_KEYUTILS_H" != "x1"; then - AC_MSG_ERROR(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_ERROR(not on a linux system!) - ;; - esac - ;; - esac ], -[ 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 ] -) - - -################################################# # Check for a PAM clear-text auth, accounts, password # and session support. Most PAM implementations keep their # headers in /usr/include/security. Darwin keeps its in diff --git a/source4/client/config.m4 b/source4/client/config.m4 deleted file mode 100644 index 800320d7d5..0000000000 --- a/source4/client/config.m4 +++ /dev/null @@ -1,13 +0,0 @@ -case "$host_os" in - *linux*) - SMB_ENABLE(mount.cifs, YES) - SMB_ENABLE(umount.cifs, YES) - SMB_ENABLE(cifs.upcall, NO) # Disabled for now - ;; - *) - SMB_ENABLE(mount.cifs, NO) - SMB_ENABLE(umount.cifs, NO) - SMB_ENABLE(cifs.upcall, NO) - ;; -esac - diff --git a/source4/client/config.mk b/source4/client/config.mk index dee42d016a..877544a09a 100644 --- a/source4/client/config.mk +++ b/source4/client/config.mk @@ -20,22 +20,6 @@ PRIVATE_DEPENDENCIES = \ smbclient_OBJ_FILES = $(clientsrcdir)/client.o -[BINARY::mount.cifs] -INSTALLDIR = BINDIR - -mount.cifs_OBJ_FILES = ../client/mount.cifs.o \ - ../client/mtab.o - -[BINARY::umount.cifs] -INSTALLDIR = BINDIR - -umount.cifs_OBJ_FILES = ../client/umount.cifs.o \ - ../client/mtab.o - -#[BINARY::cifs.upcall] -#INSTALLDIR = BINDIR -#cifs.upcall_OBJ_FILES = ../client/cifs.upcall.o - ################################# # Start BINARY cifsdd [BINARY::cifsdd] diff --git a/source4/configure.ac b/source4/configure.ac index eab1be6087..ac4a0da189 100644 --- a/source4/configure.ac +++ b/source4/configure.ac @@ -32,7 +32,6 @@ SMB_INCLUDE_MK(lib/zlib.mk) ]) m4_include(../nsswitch/nsstest.m4) m4_include(../pidl/config.m4) -m4_include(client/config.m4) AC_CONFIG_FILES(lib/registry/registry.pc) AC_CONFIG_FILES(librpc/dcerpc.pc) |