diff options
| author | Andrew Bartlett <abartlet@samba.org> | 2012-05-30 08:23:38 +1000 |
|---|---|---|
| committer | Andrew Bartlett <abartlet@samba.org> | 2012-05-30 04:15:12 +0200 |
| commit | 1d3e5eda038deebe7e3d2d122c8d9963b548edfb (patch) | |
| tree | 42aba54ed8999f00f418ef787f205d006252f114 | |
| parent | dde4d6fce9e3daa6a2332b9cbc0165a18fca0ccd (diff) | |
| download | samba-1d3e5eda038deebe7e3d2d122c8d9963b548edfb.tar.gz samba-1d3e5eda038deebe7e3d2d122c8d9963b548edfb.tar.bz2 samba-1d3e5eda038deebe7e3d2d122c8d9963b548edfb.zip | |
s3-build: We do not have CHARSET modules any more
| -rw-r--r-- | source3/Makefile.in | 8 | ||||
| -rw-r--r-- | source3/configure.in | 2 |
2 files changed, 2 insertions, 8 deletions
diff --git a/source3/Makefile.in b/source3/Makefile.in index f4a8bec548..2405ec7748 100644 --- a/source3/Makefile.in +++ b/source3/Makefile.in @@ -153,7 +153,6 @@ PDBLIBDIR = $(MODULESDIR)/pdb RPCLIBDIR = $(MODULESDIR)/rpc IDMAPLIBDIR = $(MODULESDIR)/idmap NSSINFOLIBDIR = $(MODULESDIR)/nss_info -CHARSETLIBDIR = $(MODULESDIR)/charset AUTHLIBDIR = $(MODULESDIR)/auth CONFIGLIBDIR = $(MODULESDIR)/config GPEXTLIBDIR = $(MODULESDIR)/gpext @@ -242,12 +241,11 @@ VFS_MODULES = @VFS_MODULES@ PERFCOUNT_MODULES = @PERFCOUNT_MODULES@ PDB_MODULES = @PDB_MODULES@ IDMAP_MODULES = @IDMAP_MODULES@ -CHARSET_MODULES = @CHARSET_MODULES@ AUTH_MODULES = @AUTH_MODULES@ NSS_INFO_MODULES = @NSS_INFO_MODULES@ GPEXT_MODULES = @GPEXT_MODULES@ MODULES = $(VFS_MODULES) $(PDB_MODULES) $(IDMAP_MODULES) \ - $(CHARSET_MODULES) $(AUTH_MODULES) $(NSS_INFO_MODULES) \ + $(AUTH_MODULES) $(NSS_INFO_MODULES) \ $(GPEXT_MODULES) $(PERFCOUNT_MODULES) EXTRA_ALL_TARGETS = @EXTRA_ALL_TARGETS@ @@ -476,7 +474,7 @@ LIB_OBJ = $(LIBSAMBAUTIL_OBJ) $(UTIL_OBJ) $(CRYPTO_OBJ) $(LIBTSOCKET_OBJ) \ lib/server_contexts.o \ lib/server_prefork.o \ lib/server_prefork_util.o \ - lib/ldap_escape.o @CHARSET_STATIC@ \ + lib/ldap_escape.o \ ../libcli/security/secdesc.o ../libcli/security/access_check.o \ ../libcli/security/secace.o ../libcli/security/object_tree.o \ ../libcli/security/sddl.o ../libcli/security/session.o \ @@ -3065,7 +3063,6 @@ installmodules:: modules installdirs @$(SHELL) $(srcdir)/script/installmodules.sh $(INSTALLPERMS_BIN) $(DESTDIR) $(prefix) $(PDBLIBDIR) $(PDB_MODULES) @$(SHELL) $(srcdir)/script/installmodules.sh $(INSTALLPERMS_BIN) $(DESTDIR) $(prefix) $(IDMAPLIBDIR) $(IDMAP_MODULES) @$(SHELL) $(srcdir)/script/installmodules.sh $(INSTALLPERMS_BIN) $(DESTDIR) $(prefix) $(NSSINFOLIBDIR) $(NSS_INFO_MODULES) - @$(SHELL) $(srcdir)/script/installmodules.sh $(INSTALLPERMS_BIN) $(DESTDIR) $(prefix) $(CHARSETLIBDIR) $(CHARSET_MODULES) @$(SHELL) $(srcdir)/script/installmodules.sh $(INSTALLPERMS_BIN) $(DESTDIR) $(prefix) $(AUTHLIBDIR) $(AUTH_MODULES) @$(SHELL) $(srcdir)/script/installmodules.sh $(INSTALLPERMS_BIN) $(DESTDIR) $(prefix) $(GPEXTLIBDIR) $(GPEXT_MODULES) @$(SHELL) $(srcdir)/script/installmodules.sh $(INSTALLPERMS_BIN) $(DESTDIR) $(prefix) $(PERFCOUNTLIBDIR) $(PERFCOUNT_MODULES) @@ -3174,7 +3171,6 @@ 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) @$(SHELL) $(srcdir)/script/uninstallmodules.sh $(INSTALLPERMS_BIN) $(DESTDIR) $(prefix) $(IDMAPLIBDIR) $(IDMAP_MODULES) - @$(SHELL) $(srcdir)/script/uninstallmodules.sh $(INSTALLPERMS_BIN) $(DESTDIR) $(prefix) $(CHARSETLIBDIR) $(CHARSET_MODULES) @$(SHELL) $(srcdir)/script/uninstallmodules.sh $(INSTALLPERMS_BIN) $(DESTDIR) $(prefix) $(AUTHLIBDIR) $(AUTH_MODULES) @$(SHELL) $(srcdir)/script/uninstallmodules.sh $(INSTALLPERMS_BIN) $(DESTDIR) $(prefix) $(GPEXTLIBDIR) $(GPEXT_MODULES) @$(SHELL) $(srcdir)/script/uninstallmodules.sh $(INSTALLPERMS_BIN) $(DESTDIR) $(prefix) $(PERFCOUNTLIBDIR) $(PERFCOUNT_MODULES) diff --git a/source3/configure.in b/source3/configure.in index 324586c40d..989b617d57 100644 --- a/source3/configure.in +++ b/source3/configure.in @@ -6422,8 +6422,6 @@ SMB_SUBSYSTEM(IDMAP, winbindd/idmap.o) SMB_MODULE(nss_info_template, winbindd/nss_info_template.o, "bin/template.$SHLIBEXT", NSS_INFO) SMB_SUBSYSTEM(NSS_INFO, winbindd/nss_info.o) -SMB_SUBSYSTEM(CHARSET,lib/iconv.o) - SMB_MODULE(auth_sam, \$(AUTH_SAM_OBJ), "bin/sam.$SHLIBEXT", AUTH) SMB_MODULE(auth_unix, \$(AUTH_UNIX_OBJ), "bin/unix.$SHLIBEXT", AUTH) SMB_MODULE(auth_winbind, \$(AUTH_WINBIND_OBJ), "bin/winbind.$SHLIBEXT", AUTH) |