summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDamien Lespiau <damien.lespiau@gmail.com>2009-02-24 11:03:27 +0000
committerDamien Lespiau <damien.lespiau@gmail.com>2009-02-24 11:03:27 +0000
commit4334d4a9a19a21550e2db1c45572a9f99885184c (patch)
treedd89769dcb3c24e656a38ad5331bf57b18216460
parentb5105072748ae32f460742732914f35a29715520 (diff)
Fix naming of default_mode
It feels more natural to give enable/disable to SHAVE_INIT than quiet/verbose (the opposite semantics) Signed-off-by: Damien Lespiau <damien.lespiau@gmail.com>
-rw-r--r--shave/shave.m48
-rw-r--r--test-cxx/configure.ac2
-rw-r--r--test/configure.ac2
3 files changed, 6 insertions, 6 deletions
diff --git a/shave/shave.m4 b/shave/shave.m4
index 668c098..4e434bc 100644
--- a/shave/shave.m4
+++ b/shave/shave.m4
@@ -4,9 +4,9 @@ dnl SHAVE_INIT([shavedir],[default_mode])
dnl
dnl shavedir: the directory where the shave scripts are, it defaults to
dnl $(top_builddir)
-dnl default_mode: (quiet|verbose) default shave mode. This parameter controls
-dnl the behaviour of shave when no option has been given to
-dnl configure. It defaults to verbose (ie shave disabled)
+dnl default_mode: (enable|disable) default shave mode. This parameter
+dnl controls shave's behaviour when no option has been
+dnl given to configure. It defaults to disable.
dnl
dnl * SHAVE_INIT should be called late in your configure.(ac|in) file (just
dnl before AC_CONFIG_FILE/AC_OUTPUT is perfect. This macro rewrites CC and
@@ -27,7 +27,7 @@ AC_DEFUN([_SHAVE_ARG_ENABLE],
AC_DEFUN([SHAVE_INIT],
[
dnl you can tweak the default value of enable_shave
- m4_if([$2], [quiet], [_SHAVE_ARG_ENABLE(yes)], [_SHAVE_ARG_ENABLE(no)])
+ m4_if([$2], [enable], [_SHAVE_ARG_ENABLE(yes)], [_SHAVE_ARG_ENABLE(no)])
if test x"$enable_shave" = xyes; then
dnl where can we find the shave scripts?
diff --git a/test-cxx/configure.ac b/test-cxx/configure.ac
index 0f69064..804c049 100644
--- a/test-cxx/configure.ac
+++ b/test-cxx/configure.ac
@@ -5,7 +5,7 @@ AC_CONFIG_HEADERS([config.h])
AC_PROG_LIBTOOL
AC_PROG_CC
AC_PROG_CXX
-SHAVE_INIT([../shave], [verbose])
+SHAVE_INIT([../shave], [disable])
AC_CONFIG_FILES([
../shave/shave
../shave/shave-libtool
diff --git a/test/configure.ac b/test/configure.ac
index c9b8143..4f3b50f 100644
--- a/test/configure.ac
+++ b/test/configure.ac
@@ -4,7 +4,7 @@ AC_CONFIG_MACRO_DIR([../shave])
AC_CONFIG_HEADERS([config.h])
AC_PROG_LIBTOOL
AC_PROG_CC
-SHAVE_INIT([../shave], [quiet])
+SHAVE_INIT([../shave], [enable])
AC_CONFIG_FILES([
../shave/shave
../shave/shave-libtool