* configure.ac: Changed wording to make some defaults less confusing.

* m4/jit.m4: Likewise.
* m4/libjvm.m4: Likewise.
* m4/ltdl.m4: Likewise.
* m4/zlib.m4: Likewise.

diff --git a/configure.ac b/configure.ac
index e3d14074a25d8fc61de8d186c74c02f469f33041..352f6772642c834fddeb9cd0e9e49ed9618fd49b 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -500,7 +500,7 @@ fi
 dnl check for verifier
 AC_MSG_CHECKING(whether classfile verification should be enabled)
 AC_ARG_ENABLE([verifier],
-              [AS_HELP_STRING(--disable-verifier,disable classfile verification [[default=yes]])],
+              [AS_HELP_STRING(--disable-verifier,disable classfile verification [[default=enabled]])],
               [case "${enableval}" in
                    no) ENABLE_VERIFIER=no;;
                    *) ENABLE_VERIFIER=yes;;
@@ -571,7 +571,7 @@ AC_CHECK_ENABLE_THREADS
 dnl check if if-conversion should be supported
 AC_MSG_CHECKING(whether if-conversion should be supported)
 AC_ARG_ENABLE([ifconv],
-              [AS_HELP_STRING(--disable-ifconv,disable if-conversion [[default=yes]])],
+              [AS_HELP_STRING(--disable-ifconv,disable if-conversion [[default=enabled]])],
               [case "${enableval}" in
                    no) ENABLE_IFCONV=no;;
                    *) ENABLE_IFCONV=yes;;
@@ -656,7 +656,7 @@ fi
 dnl check if linear scan register allocator(lsra) with SSA should be used
 AC_MSG_CHECKING(whether lsra with ssa should be supported)
 AC_ARG_ENABLE([ssa],
-              [AS_HELP_STRING(--disable-ssa,disable ssa [[default=no]])],
+              [AS_HELP_STRING(--disable-ssa,disable ssa [[default=disabled]])],
               [case "${enableval}" in
                    no) ENABLE_SSA=no;;
                    *) ENABLE_SSA=yes;;

diff --git a/m4/jit.m4 b/m4/jit.m4
index 5f42f34cbd1ec52e32407761a8aec95198f13d46..3cd8dc0d06ca0acd724ee81710b9f658ba7a9295 100644 (file)
--- a/m4/jit.m4
+++ b/m4/jit.m4
@@ -28,7 +28,7 @@ dnl check for JIT compiler
 AC_DEFUN([AC_CHECK_ENABLE_JIT],[
 AC_MSG_CHECKING(whether JIT compiler should be compiled)
 AC_ARG_ENABLE([jit],
-              [AS_HELP_STRING(--disable-jit,disable JIT compiler [[default=yes]])],
+              [AS_HELP_STRING(--disable-jit,disable JIT compiler [[default=enabled]])],
               [case "${enableval}" in
                    no)
                        ENABLE_JIT=no

diff --git a/m4/libjvm.m4 b/m4/libjvm.m4
index e40144f5c4758576b9711a83fc3b9c72540ee6f0..77e87a778623aea06aab2fd6e8f20a2041d00776 100644 (file)
--- a/m4/libjvm.m4
+++ b/m4/libjvm.m4
@@ -28,7 +28,7 @@ dnl check if a libjvm.so should be built
 AC_DEFUN([AC_CHECK_ENABLE_LIBJVM],[
 AC_MSG_CHECKING(whether to build a libjvm.so)
 AC_ARG_ENABLE([libjvm],
-              [AS_HELP_STRING(--disable-libjvm,build a libjvm.so [[default=yes]])],
+              [AS_HELP_STRING(--disable-libjvm,build a libjvm.so [[default=enabled]])],
               [case "${enableval}" in
                   no)
                       ENABLE_LIBJVM=no

diff --git a/m4/ltdl.m4 b/m4/ltdl.m4
index 6e68960a97c86464a200ad0978d7364dbe30170a..6a7b174ca88aaca0af3e0546bb3f8b6ce72e28bf 100644 (file)
--- a/m4/ltdl.m4
+++ b/m4/ltdl.m4
@@ -28,7 +28,7 @@ dnl check if ltdl should be used
 AC_DEFUN([AC_CHECK_ENABLE_LTDL],[
 AC_MSG_CHECKING(whether ltdl should be used)
 AC_ARG_ENABLE([ltdl],
-              [AS_HELP_STRING(--disable-ltdl,disable ltdl support [[default=yes]])],
+              [AS_HELP_STRING(--disable-ltdl,disable ltdl support [[default=enabled]])],
               [case "${enableval}" in
                   no)
                       ENABLE_LTDL=no

diff --git a/m4/zlib.m4 b/m4/zlib.m4
index 42a83ac49313704c4ebc06daf6674f6486be406d..28c204442ee521b09554d72f3a6ec1028d128fda 100644 (file)
--- a/m4/zlib.m4
+++ b/m4/zlib.m4
@@ -28,7 +28,7 @@ dnl check if zlib should be used
 AC_DEFUN([AC_CHECK_ENABLE_ZLIB],[
 AC_MSG_CHECKING(whether ZIP/JAR archives should be supported)
 AC_ARG_ENABLE([zlib],
-              [AS_HELP_STRING(--disable-zlib,disable ZIP/JAR archive support (needs zlib) [[default=yes]])],
+              [AS_HELP_STRING(--disable-zlib,disable ZIP/JAR archive support (needs zlib) [[default=enabled]])],
               [case "${enableval}" in
                   no) ENABLE_ZLIB=no;;
                   *) ENABLE_ZLIB=yes;;