[SCM] Samba Shared Repository - branch master updated - da656c2e87708daf2276ad4f091452c9ec411053

[Jelmer Vernooij]

The branch, master has been updated
       via  da656c2e87708daf2276ad4f091452c9ec411053 (commit)
       via  0cbce777a3406804780e9fa1c983f22e53b3cfeb (commit)
      from  2d85e23e06182c42a054477a62917a2176aaab16 (commit)

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


- Log -----------------------------------------------------------------
commit da656c2e87708daf2276ad4f091452c9ec411053
Author: Jelmer Vernooij <jelmer at samba.org>
Date:   Thu Jan 15 21:22:34 2009 +0100

    Use AS_HELP_STRING() in a couple more places.

commit 0cbce777a3406804780e9fa1c983f22e53b3cfeb
Author: Jelmer Vernooij <jelmer at samba.org>
Date:   Wed Nov 26 19:06:10 2008 +0100

    Fix indentation for some configure options.

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

Summary of changes:
 lib/nss_wrapper/config.m4           |    2 +-
 lib/socket_wrapper/config.m4        |    2 +-
 source4/lib/smbreadline/readline.m4 |    2 +-
 source4/lib/tls/config.m4           |    2 +-
 source4/smbd/process_model.m4       |    4 ++--
 5 files changed, 6 insertions(+), 6 deletions(-)


Changeset truncated at 500 lines:

diff --git a/lib/nss_wrapper/config.m4 b/lib/nss_wrapper/config.m4
index 4542378..ad1a168 100644
--- a/lib/nss_wrapper/config.m4
+++ b/lib/nss_wrapper/config.m4
@@ -1,5 +1,5 @@
 AC_ARG_ENABLE(nss-wrapper,
-[  --enable-nss-wrapper         Turn on nss wrapper library (default=no)])
+AS_HELP_STRING([--enable-nss-wrapper], [Turn on nss wrapper library (default=no)]))
 
 HAVE_NSS_WRAPPER=no
 
diff --git a/lib/socket_wrapper/config.m4 b/lib/socket_wrapper/config.m4
index 68e392b..e20333e 100644
--- a/lib/socket_wrapper/config.m4
+++ b/lib/socket_wrapper/config.m4
@@ -1,5 +1,5 @@
 AC_ARG_ENABLE(socket-wrapper, 
-[  --enable-socket-wrapper         Turn on socket wrapper library (default=no)])
+AS_HELP_STRING([--enable-socket-wrapper], [Turn on socket wrapper library (default=no)]))
 
 DEFAULT_TEST_OPTIONS=
 HAVE_SOCKET_WRAPPER=no
diff --git a/source4/lib/smbreadline/readline.m4 b/source4/lib/smbreadline/readline.m4
index ad6bc66..86e2fb1 100644
--- a/source4/lib/smbreadline/readline.m4
+++ b/source4/lib/smbreadline/readline.m4
@@ -6,7 +6,7 @@ EXTERNAL_READLINE=no
 # test for where we get readline() from
 AC_MSG_CHECKING(whether to use readline)
 AC_ARG_WITH(readline,
-[  --with-readline[=DIR]   Look for readline include/libs in DIR (default=auto) ],
+[AS_HELP_STRING([--with-readline[=DIR]], [Look for readline include/libs in DIR (default=auto)])],
 [  case "$with_readline" in
   yes)
     AC_MSG_RESULT(yes)
diff --git a/source4/lib/tls/config.m4 b/source4/lib/tls/config.m4
index 4f42efb..74c6bd1 100644
--- a/source4/lib/tls/config.m4
+++ b/source4/lib/tls/config.m4
@@ -4,7 +4,7 @@
 
 use_gnutls=auto
 AC_ARG_ENABLE(gnutls,
-[  --enable-gnutls          Turn on gnutls support (default=yes)],
+AS_HELP_STRING([--enable-gnutls],[Turn on gnutls support (default=yes)]),
     [if test x$enable_gnutls = xno; then
         use_gnutls=no
     fi])
diff --git a/source4/smbd/process_model.m4 b/source4/smbd/process_model.m4
index 6ee8dbf..b2265bd 100644
--- a/source4/smbd/process_model.m4
+++ b/source4/smbd/process_model.m4
@@ -6,7 +6,7 @@ SMB_ENABLE(process_model_thread,NO)
 # check for pthread support
 AC_MSG_CHECKING(whether to use pthreads)
 AC_ARG_WITH(pthreads,
-[  --with-pthreads              Include pthreads (default=no) ],
+[AS_HELP_STRING([--with-pthreads],[Include pthreads (default=no)])],
 [ case "$withval" in
 	yes)
 		AC_MSG_RESULT(yes)
@@ -27,7 +27,7 @@ SMB_EXT_LIB(PTHREAD,[-lpthread])
 
 AC_MSG_CHECKING(whether to search for setproctitle support)
 AC_ARG_WITH(setproctitle,
-[  --with-setproctitle          Search for setproctitle support (default=no)],
+[AS_HELP_STRING([--with-setproctitle], [Search for setproctitle support (default=no)])],
 [ case "$withval" in
 	yes)
 		AC_MSG_RESULT(yes)


-- 
Samba Shared Repository