From 44b6ffae0b489cecf7c70adaf93a9bd77b386993 Mon Sep 17 00:00:00 2001 From: Michael Adam Date: Sat, 16 Aug 2008 00:23:47 +0200 Subject: configure: remove duplicate definition of --with-winbindd-socket-dir. I think this should have gone with fa361354433fb9a5c09c84997a7c51f3052c294e. Michael (This used to be commit 91fcaac68b215461a13c1b517f6cede29af5e55c) --- source4/build/m4/check_path.m4 | 16 ---------------- 1 file changed, 16 deletions(-) (limited to 'source4/build/m4') diff --git a/source4/build/m4/check_path.m4 b/source4/build/m4/check_path.m4 index a209a4b85a..dc1e849a43 100644 --- a/source4/build/m4/check_path.m4 +++ b/source4/build/m4/check_path.m4 @@ -86,22 +86,6 @@ AC_ARG_WITH(winbindd-privileged-socket-dir, ;; esac]) -################################################# -# set where the winbindd privilaged socket should be put -AC_ARG_WITH(winbindd-socket-dir, -[ --with-winbindd-socket-dir=DIR Where to put the winbindd socket ($ac_default_prefix/run/winbind_pipe)], -[ case "$withval" in - yes|no) - # - # Just in case anybody calls it without argument - # - AC_MSG_WARN([--with-winbind-socketdir called without argument - will use default]) - ;; - * ) - winbindd_socket_dir="$withval" - ;; - esac]) - ################################################# # set where the NTP signing deamon socket should be put AC_ARG_WITH(ntp-signd-socket-dir, -- cgit From df4e1ad130da96db641eed9ac5841cf8e6b57130 Mon Sep 17 00:00:00 2001 From: Michael Adam Date: Sat, 16 Aug 2008 00:07:54 +0200 Subject: configure: format help string for --with-fhs with AS_HELP_STRING(). Michael (This used to be commit 837d0b3eb213ce6d0ce5345308d1b42ae2b08d67) --- source4/build/m4/check_path.m4 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'source4/build/m4') diff --git a/source4/build/m4/check_path.m4 b/source4/build/m4/check_path.m4 index dc1e849a43..74b510fa31 100644 --- a/source4/build/m4/check_path.m4 +++ b/source4/build/m4/check_path.m4 @@ -24,7 +24,7 @@ winbindd_privileged_socket_dir="${localstatedir}/lib/winbindd_privileged" ntp_signd_socket_dir="${localstatedir}/run/ntp_signd" AC_ARG_WITH(fhs, -[ --with-fhs Use FHS-compliant paths (default=no)], +[AS_HELP_STRING([--with-fhs],[Use FHS-compliant paths (default=no)])], lockdir="${localstatedir}/lib/samba" piddir="${localstatedir}/run/samba" logfilebase="${localstatedir}/log/samba" -- cgit From 7b3bb570518a2c618556815e5fea15866d8917f5 Mon Sep 17 00:00:00 2001 From: Michael Adam Date: Sat, 16 Aug 2008 00:13:34 +0200 Subject: configure: use AS_HELP_STRING for --with-privatedir Michael (This used to be commit eafde5bee0a68fd4cf61ae64dfb24e4deb16b95a) --- source4/build/m4/check_path.m4 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'source4/build/m4') diff --git a/source4/build/m4/check_path.m4 b/source4/build/m4/check_path.m4 index 74b510fa31..959020116f 100644 --- a/source4/build/m4/check_path.m4 +++ b/source4/build/m4/check_path.m4 @@ -41,7 +41,7 @@ AC_ARG_WITH(fhs, ################################################# # set private directory location AC_ARG_WITH(privatedir, -[ --with-privatedir=DIR Where to put sam.ldb and other private files containing key material ($ac_default_prefix/private)], +[AS_HELP_STRING([--with-privatedir=DIR],[Where to put sam.ldb and other private files containing key material ($ac_default_prefix/private)])], [ case "$withval" in yes|no) # -- cgit From cc7d7ba95b870a5e94da718870aaedd88a567fa7 Mon Sep 17 00:00:00 2001 From: Michael Adam Date: Sat, 16 Aug 2008 00:25:09 +0200 Subject: configure: use AS_HELP_STRING for --with-winbindd-socket-dir . Michael (This used to be commit 1304eda283b29fff8960633b1329c0a1611e1ca3) --- source4/build/m4/check_path.m4 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'source4/build/m4') diff --git a/source4/build/m4/check_path.m4 b/source4/build/m4/check_path.m4 index 959020116f..6a4363f4b2 100644 --- a/source4/build/m4/check_path.m4 +++ b/source4/build/m4/check_path.m4 @@ -57,7 +57,7 @@ AC_ARG_WITH(privatedir, ################################################# # set where the winbindd socket should be put AC_ARG_WITH(winbindd-socket-dir, -[ --with-winbindd-socket-dir=DIR Where to put the winbindd socket ($winbindd_socket_dir)], +[AS_HELP_STRING([--with-winbindd-socket-dir=DIR],[Where to put the winbindd socket ($winbindd_socket_dir)])], [ case "$withval" in yes|no) # -- cgit From d143e5fcab521c5e236a158aa5388b3984877b06 Mon Sep 17 00:00:00 2001 From: Michael Adam Date: Sat, 16 Aug 2008 00:25:42 +0200 Subject: configure: use AS_HELP_STRING for --with-winbindd-privileged-socket-dir. Michael (This used to be commit 3bf8116531d4eb0cc25bc7bac70ae3c77642a5a3) --- source4/build/m4/check_path.m4 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'source4/build/m4') diff --git a/source4/build/m4/check_path.m4 b/source4/build/m4/check_path.m4 index 6a4363f4b2..4771225d95 100644 --- a/source4/build/m4/check_path.m4 +++ b/source4/build/m4/check_path.m4 @@ -73,7 +73,7 @@ AC_ARG_WITH(winbindd-socket-dir, ################################################# # set where the winbindd privilaged socket should be put AC_ARG_WITH(winbindd-privileged-socket-dir, -[ --with-winbindd-privileged-socket-dir=DIR Where to put the winbindd socket ($winbindd_privileged_socket_dir)], +[AS_HELP_STRING([--with-winbindd-privileged-socket-dir=DIR],[Where to put the winbindd socket ($winbindd_privileged_socket_dir)])], [ case "$withval" in yes|no) # -- cgit From 76c96ad6d7c48bf7250963f0c304860392c3d1bb Mon Sep 17 00:00:00 2001 From: Michael Adam Date: Sat, 16 Aug 2008 00:27:15 +0200 Subject: configure: use AS_HELP_STRING for --ntp-signd-socket-dir. Michael (This used to be commit dd07dcbc916236d80d9a7087860a6f504bbb09e8) --- source4/build/m4/check_path.m4 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'source4/build/m4') diff --git a/source4/build/m4/check_path.m4 b/source4/build/m4/check_path.m4 index 4771225d95..3f7c9bd9f0 100644 --- a/source4/build/m4/check_path.m4 +++ b/source4/build/m4/check_path.m4 @@ -89,7 +89,7 @@ AC_ARG_WITH(winbindd-privileged-socket-dir, ################################################# # set where the NTP signing deamon socket should be put AC_ARG_WITH(ntp-signd-socket-dir, -[ --with-ntp-signd-socket-dir=DIR Where to put the NTP signing deamon socket ($ac_default_prefix/run/ntp_signd)], +[AS_HELP_STRING([--with-ntp-signd-socket-dir=DIR],[Where to put the NTP signing deamon socket ($ac_default_prefix/run/ntp_signd)])], [ case "$withval" in yes|no) # -- cgit From 3ebf7f0427ba4daa2c12c18f6cfbb977d46fad35 Mon Sep 17 00:00:00 2001 From: Michael Adam Date: Sat, 16 Aug 2008 00:28:36 +0200 Subject: configure: use AS_HELP_STRING for --with-lockdir. Michael (This used to be commit ed4a6e780a3f57854338520e4608cfc8dce4ef3e) --- source4/build/m4/check_path.m4 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'source4/build/m4') diff --git a/source4/build/m4/check_path.m4 b/source4/build/m4/check_path.m4 index 3f7c9bd9f0..0bd7a9f18d 100644 --- a/source4/build/m4/check_path.m4 +++ b/source4/build/m4/check_path.m4 @@ -105,7 +105,7 @@ AC_ARG_WITH(ntp-signd-socket-dir, ################################################# # set lock directory location AC_ARG_WITH(lockdir, -[ --with-lockdir=DIR Where to put lock files ($ac_default_prefix/var/locks)], +[AS_HELP_STRING([--with-lockdir=DIR],[Where to put lock files ($ac_default_prefix/var/locks)])], [ case "$withval" in yes|no) # -- cgit From 42104c3d1193f6f4b358c89a47c776d5a3c9b49e Mon Sep 17 00:00:00 2001 From: Michael Adam Date: Sat, 16 Aug 2008 00:30:02 +0200 Subject: configure: use AS_HELP_STRING for --with-piddir Michael (This used to be commit f05a9fe46ff428e48be9a5af4a6769cd78712c11) --- source4/build/m4/check_path.m4 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'source4/build/m4') diff --git a/source4/build/m4/check_path.m4 b/source4/build/m4/check_path.m4 index 0bd7a9f18d..efac873bd3 100644 --- a/source4/build/m4/check_path.m4 +++ b/source4/build/m4/check_path.m4 @@ -121,7 +121,7 @@ AC_ARG_WITH(lockdir, ################################################# # set pid directory location AC_ARG_WITH(piddir, -[ --with-piddir=DIR Where to put pid files ($ac_default_prefix/var/locks)], +[AS_HELP_STRING([--with-piddir=DIR],[Where to put pid files ($ac_default_prefix/var/locks)])], [ case "$withval" in yes|no) # -- cgit From 56bf6489a63050fc8d3eda8a92487896471026eb Mon Sep 17 00:00:00 2001 From: Michael Adam Date: Sat, 16 Aug 2008 00:31:23 +0200 Subject: configure: use AS_HELP_STRING for --with-logfilebase. Michael (This used to be commit f9c15b817a24bed26a339479c53fc2f5cc5b36df) --- source4/build/m4/check_path.m4 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'source4/build/m4') diff --git a/source4/build/m4/check_path.m4 b/source4/build/m4/check_path.m4 index efac873bd3..52f88f184f 100644 --- a/source4/build/m4/check_path.m4 +++ b/source4/build/m4/check_path.m4 @@ -137,7 +137,7 @@ AC_ARG_WITH(piddir, ################################################# # set log directory location AC_ARG_WITH(logfilebase, -[ --with-logfilebase=DIR Where to put log files (\$(VARDIR))], +[AS_HELP_STRING([--with-logfilebase=DIR],[Where to put log files (\$(VARDIR))])], [ case "$withval" in yes|no) # -- cgit From 37b6e7886b47578bf55c894dc88b7929ef1f5b96 Mon Sep 17 00:00:00 2001 From: Michael Adam Date: Sat, 16 Aug 2008 00:33:04 +0200 Subject: configure: use AS_HELP_STRING for --with-selftest-prefix. Michael (This used to be commit eea4f597acf743fa783be3e5809e24aebc79f238) --- source4/build/m4/check_path.m4 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'source4/build/m4') diff --git a/source4/build/m4/check_path.m4 b/source4/build/m4/check_path.m4 index 52f88f184f..e03f13391c 100644 --- a/source4/build/m4/check_path.m4 +++ b/source4/build/m4/check_path.m4 @@ -170,7 +170,7 @@ AC_SUBST(modulesdir) selftest_prefix="./st" AC_SUBST(selftest_prefix) AC_ARG_WITH(selftest-prefix, -[ --with-selftest-prefix=DIR The prefix where make test will be run ($selftest_prefix)], +[AS_HELP_STRING([--with-selftest-prefix=DIR],[The prefix where make test will be run ($selftest_prefix)])], [ case "$withval" in yes|no) AC_MSG_WARN([--with-selftest-prefix called without argument - will use default]) -- cgit From 982aa673e24fc54727370de59d82644f2b3f1e59 Mon Sep 17 00:00:00 2001 From: Michael Adam Date: Sat, 16 Aug 2008 00:34:43 +0200 Subject: configure: use AS_HELP_STRING for --enable-debug. Michael (This used to be commit 1f4bf8fbd5bfc9c58bb5668fe25586766605b268) --- source4/build/m4/check_path.m4 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'source4/build/m4') diff --git a/source4/build/m4/check_path.m4 b/source4/build/m4/check_path.m4 index e03f13391c..f0f9581371 100644 --- a/source4/build/m4/check_path.m4 +++ b/source4/build/m4/check_path.m4 @@ -182,7 +182,7 @@ AC_ARG_WITH(selftest-prefix, debug=no AC_ARG_ENABLE(debug, -[ --enable-debug Turn on compiler debugging information (default=no)], +[AS_HELP_STRING([--enable-debug],[Turn on compiler debugging information (default=no)])], [if test x$enable_debug = xyes; then debug=yes fi]) -- cgit From a903c39d2b5c89b243462fc02cb5b1ca077c6b38 Mon Sep 17 00:00:00 2001 From: Michael Adam Date: Sat, 16 Aug 2008 00:35:52 +0200 Subject: configure: use AS_HELP_STRING for --enable-developer Michael (This used to be commit b10d4723891c39693100bfaaf1ac29adce9f7a86) --- source4/build/m4/check_path.m4 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'source4/build/m4') diff --git a/source4/build/m4/check_path.m4 b/source4/build/m4/check_path.m4 index f0f9581371..dd12e210d1 100644 --- a/source4/build/m4/check_path.m4 +++ b/source4/build/m4/check_path.m4 @@ -190,7 +190,7 @@ AC_ARG_ENABLE(debug, developer=no AC_SUBST(developer) AC_ARG_ENABLE(developer, -[ --enable-developer Turn on developer warnings and debugging (default=no)], +[AS_HELP_STRING([--enable-developer],[Turn on developer warnings and debugging (default=no)])], [if test x$enable_developer = xyes; then debug=yes developer=yes -- cgit From 613b8d398ed73be958e90a1d4c2b728d2139b3fb Mon Sep 17 00:00:00 2001 From: Michael Adam Date: Sat, 16 Aug 2008 00:37:26 +0200 Subject: configure: use AS_HELP_STRING for --with-disable-ext-lib Michael (This used to be commit 88cf5d8b708d6247772b33128f0e212a4c2e9ba8) --- source4/build/m4/check_path.m4 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'source4/build/m4') diff --git a/source4/build/m4/check_path.m4 b/source4/build/m4/check_path.m4 index dd12e210d1..c45a803633 100644 --- a/source4/build/m4/check_path.m4 +++ b/source4/build/m4/check_path.m4 @@ -198,7 +198,7 @@ AC_ARG_ENABLE(developer, dnl disable these external libs AC_ARG_WITH(disable-ext-lib, -[ --with-disable-ext-lib=LIB Comma-seperated list of external libraries], +[AS_HELP_STRING([--with-disable-ext-lib=LIB],[Comma-seperated list of external libraries])], [ if test $withval; then for i in `echo $withval | sed -e's/,/ /g'` do -- cgit