summaryrefslogtreecommitdiff
path: root/source3
diff options
context:
space:
mode:
authorJelmer Vernooij <jelmer@samba.org>2003-04-26 11:38:42 +0000
committerJelmer Vernooij <jelmer@samba.org>2003-04-26 11:38:42 +0000
commit17c29f0faf96f522fb5179bda1ea1904b18df7d5 (patch)
tree782975073c3f8c1bc075fe4a2fb3fed49d017a8d /source3
parent54c285888509dcd4520f2608d618012f5877d073 (diff)
downloadsamba-17c29f0faf96f522fb5179bda1ea1904b18df7d5.tar.gz
samba-17c29f0faf96f522fb5179bda1ea1904b18df7d5.tar.bz2
samba-17c29f0faf96f522fb5179bda1ea1904b18df7d5.zip
Fix the 'weird' charset module. Also, built it by default for
./configure --enable-developer (This used to be commit 1c0ae103010766cb3dd5adb36ea7af9324bd0672)
Diffstat (limited to 'source3')
-rw-r--r--source3/Makefile.in4
-rw-r--r--source3/configure.in9
2 files changed, 7 insertions, 6 deletions
diff --git a/source3/Makefile.in b/source3/Makefile.in
index 3e9a6665ac..7291b4b3c5 100644
--- a/source3/Makefile.in
+++ b/source3/Makefile.in
@@ -1044,7 +1044,7 @@ bin/nisplussam.@SHLIBEXT@: passdb/pdb_nisplus.o
@$(SHLD) $(LDSHFLAGS) -o $@ passdb/pdb_nisplus.o \
@SONAMEFLAG@`basename $@`
-bin/developer.@SHLIBEXT@: $(DEVEL_HELP_OBJ)
+bin/weird.@SHLIBEXT@: $(DEVEL_HELP_OBJ)
@echo "Building plugin $@"
@$(SHLD) $(LDSHFLAGS) -o $@ $(DEVEL_HELP_OBJ) \
@SONAMEFLAG@`basename $@`
@@ -1138,7 +1138,7 @@ installbin: all installdirs
@$(SHELL) $(srcdir)/script/installbin.sh $(INSTALLPERMS) $(DESTDIR)$(BASEDIR) $(DESTDIR)$(BINDIR) $(DESTDIR)$(LIBDIR) $(DESTDIR)$(VARDIR) $(BIN_PROGS)
-installmodules: all modules installdirs
+installmodules: modules installdirs
@$(SHELL) $(srcdir)/script/installmodules.sh $(INSTALLPERMS) $(DESTDIR)$(BASEDIR) $(DESTDIR)$(VFSLIBDIR) $(VFS_MODULES)
@$(SHELL) $(srcdir)/script/installmodules.sh $(INSTALLPERMS) $(DESTDIR)$(BASEDIR) $(DESTDIR)$(PDBLIBDIR) $(PDB_MODULES)
@$(SHELL) $(srcdir)/script/installmodules.sh $(INSTALLPERMS) $(DESTDIR)$(BASEDIR) $(DESTDIR)$(RPCLIBDIR) $(RPC_MODULES)
diff --git a/source3/configure.in b/source3/configure.in
index e9f7016a8a..cd3b2cedcc 100644
--- a/source3/configure.in
+++ b/source3/configure.in
@@ -247,13 +247,14 @@ dnl Add modules that have to be built by default here
dnl These have to be built static:
default_static_modules="pdb_smbpasswd pdb_tdbsam pdb_unix rpc_lsa rpc_samr rpc_reg rpc_wks rpc_net rpc_dfs rpc_srv rpc_spoolss auth_rhosts auth_sam auth_unix auth_winbind auth_server auth_domain auth_builtin idmap_winbind"
+dnl These are preferably build shared, and static if dlopen() is not available
+default_shared_modules="vfs_recycle vfs_audit vfs_extd_audit vfs_fake_perms vfs_netatalk"
+
if test "x$enable_developer" = xyes; then
default_static_modules="$default_static_modules rpc_echo"
+ default_shared_modules="$default_shared_modules charset_weird"
fi
-dnl These are preferably build shared, and static if dlopen() is not available
-default_shared_modules="vfs_recycle vfs_audit vfs_extd_audit vfs_fake_perms vfs_netatalk"
-
#
# Config CPPFLAG settings for strange OS's that must be set
# before other tests.
@@ -3449,7 +3450,7 @@ SMB_MODULE(rpc_samr, \$(RPC_SAMR_OBJ), "bin/librpc_samr.$SHLIBEXT", RPC)
SMB_MODULE(rpc_echo, \$(RPC_ECHO_OBJ), "bin/librpc_echo.$SHLIBEXT", RPC)
SMB_SUBSYSTEM(RPC)
-SMB_MODULE(charset_weird, modules/developer.o, "bin/developer.$SHLIBEXT", CHARSET)
+SMB_MODULE(charset_weird, modules/developer.o, "bin/weird.$SHLIBEXT", CHARSET)
SMB_SUBSYSTEM(CHARSET)
SMB_MODULE(auth_rhosts, \$(AUTH_RHOSTS_OBJ), "bin/rhosts.$SHLIBEXT", AUTH)