[SCM] Samba Shared Repository - branch master updated - tevent-0-9-8-630-g1544c2b

[Michael Adam]

The branch, master has been updated
       via  1544c2b66c84f5bc7a773aa1a4aa4589d766a6d5 (commit)
       via  bb77a2a8ae031d8113e779ab0ac00bdf68f24d51 (commit)
       via  8b795534bd849bc0d1d442bf1b291059d5266d5c (commit)
      from  68f33428c7736966caa98cd85b2ef15e71d5fad8 (commit)

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


- Log -----------------------------------------------------------------
commit 1544c2b66c84f5bc7a773aa1a4aa4589d766a6d5
Author: Michael Adam <obnox at samba.org>
Date:   Wed Sep 23 00:52:03 2009 +0200

    build: use AS_HELP_STRING() for --with-localedir
    
    Michael

commit bb77a2a8ae031d8113e779ab0ac00bdf68f24d51
Author: Michael Adam <obnox at samba.org>
Date:   Wed Sep 23 00:48:44 2009 +0200

    build: add switch "--with-codepagedir=DIR" to configure.
    
    This is to address bug #6444.
    
    Michael

commit 8b795534bd849bc0d1d442bf1b291059d5266d5c
Author: Michael Adam <obnox at samba.org>
Date:   Tue Sep 22 23:23:02 2009 +0200

    build: add datadir to "make showlayout"
    
    Michael

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

Summary of changes:
 source3/Makefile.in      |    1 +
 source3/m4/check_path.m4 |   18 +++++++++++++++++-
 2 files changed, 18 insertions(+), 1 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source3/Makefile.in b/source3/Makefile.in
index 1b93631..abd005a 100644
--- a/source3/Makefile.in
+++ b/source3/Makefile.in
@@ -3095,6 +3095,7 @@ showlayout::
 	@echo "  cachedir:    $(CACHEDIR)"
 	@echo "  piddir:      $(PIDDIR)"
 	@echo "  swatdir:     $(SWATDIR)"
+	@echo "  datadir:     ${DATADIR}"
 	@echo "  codepagedir: $(CODEPAGEDIR)"
 
 
diff --git a/source3/m4/check_path.m4 b/source3/m4/check_path.m4
index 0a61733..b2cc53a 100644
--- a/source3/m4/check_path.m4
+++ b/source3/m4/check_path.m4
@@ -265,7 +265,7 @@ AC_ARG_WITH(mandir,
 ################################################
 # set locale directory location
 AC_ARG_WITH(localedir,
-[  --with-localedir=DIR    Where to put po files ($ac_default_prefix/share/locale)],
+[AS_HELP_STRING([--with-localedir=DIR],[Where to put po files ($ac_default_prefix/share/locale)])],
 [ case "$withval" in
   yes|no)
     #
@@ -278,6 +278,22 @@ AC_ARG_WITH(localedir,
   ;;
   esac])
 
+#################################################
+# set codepage directory location
+AC_ARG_WITH(codepagedir,
+[AS_HELP_STRING([--with-codepagedir=DIR], [Where to put codepages ($ac_default_prefix/lib/samba)])],
+[ case "$withval" in
+  yes|no)
+  #
+  # Just in case anybody calls it without argument
+  #
+    AC_MSG_WARN([--with-codepagedir called without argument - will use default])
+  ;;
+  * )
+    codepagedir="$withval"
+    ;;
+  esac])
+
 
 AC_SUBST(configdir)
 AC_SUBST(lockdir)


-- 
Samba Shared Repository