[SCM] Samba Shared Repository - branch master updated - release-4-0-0alpha8-975-g88fd98b

[Jeremy Allison]

The branch, master has been updated
       via  88fd98b7c4ed41ab6c6ac5a226581e862ae900f3 (commit)
       via  28f7b0743679c042bc135c7ec5265d75e900aa87 (commit)
      from  d91edeaa94c54a190a0c90bbd63156fdf670c26a (commit)

http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master


- Log -----------------------------------------------------------------
commit 88fd98b7c4ed41ab6c6ac5a226581e862ae900f3
Author: Jeremy Allison <jra at samba.org>
Date:   Wed Aug 12 17:44:48 2009 -0700

    Fix EVERY SINGLE build on the buildfarm that doesn't have
    bindtextdomain or textdomain. C'mon, this is what configure.in
    is *FOR*.
    Jeremy.

commit 28f7b0743679c042bc135c7ec5265d75e900aa87
Author: Jeremy Allison <jra at samba.org>
Date:   Wed Aug 12 17:07:13 2009 -0700

    Move build over to storing DOS attributes in EA's.
    Turn off "map to" directives. I've now fixed the
    issues with the build tests running this way. I think
    this is how most people run these days - please raise this on
    the list (or revert) if you disagree.

-----------------------------------------------------------------------

Summary of changes:
 source3/configure.in             |    1 +
 source3/script/tests/selftest.sh |    6 ++++--
 source3/utils/net.c              |    4 ++++
 3 files changed, 9 insertions(+), 2 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source3/configure.in b/source3/configure.in
index 7cfd3fb..749bfc4 100644
--- a/source3/configure.in
+++ b/source3/configure.in
@@ -1018,6 +1018,7 @@ AC_CHECK_HEADERS(sys/mman.h)
 # setbuffer, shmget, shm_open are needed for smbtorture
 AC_CHECK_FUNCS(shmget shm_open)
 AC_CHECK_FUNCS(gettext dgettext)
+AC_CHECK_FUNCS(bindtextdomain textdomain)
 
 # Find a method of generating a stack trace
 AC_CHECK_HEADERS(execinfo.h libexc.h libunwind.h)
diff --git a/source3/script/tests/selftest.sh b/source3/script/tests/selftest.sh
index 3fcfa4d..ae856ca 100755
--- a/source3/script/tests/selftest.sh
+++ b/source3/script/tests/selftest.sh
@@ -240,8 +240,10 @@ cat >$SERVERCONFFILE<<EOF
 	read only = no
 	smbd:sharedelay = 100000
 	smbd:writetimeupdatedelay = 500000
-	map hidden = yes
-	map system = yes
+	map hidden = no
+	map system = no
+	map readonly = no
+	store dos attributes = yes
 	create mask = 755
 	store create time = yes
 	vfs objects = $BINDIR/xattr_tdb.so $BINDIR/streams_depot.so
diff --git a/source3/utils/net.c b/source3/utils/net.c
index 1e3923f..58c9623 100644
--- a/source3/utils/net.c
+++ b/source3/utils/net.c
@@ -678,8 +678,12 @@ static struct functable net_func[] = {
 	load_case_tables();
 
 	setlocale(LC_ALL, "");
+#if defined(HAVE_BINDTEXTDOMAIN)
 	bindtextdomain(MODULE_NAME, dyn_LOCALEDIR);
+#endif
+#if defined(HAVE_TEXTDOMAIN)
 	textdomain(MODULE_NAME);
+#endif
 
 	/* set default debug level to 0 regardless of what smb.conf sets */
 	DEBUGLEVEL_CLASS[DBGC_ALL] = 0;


-- 
Samba Shared Repository