--- a/ChangeLog	Wed Feb 23 20:32:30 2011 +0000
+++ b/ChangeLog	Wed Feb 23 20:39:53 2011 +0000
@@ -1,3 +1,17 @@
+2011-02-23  Andrew John Hughes  <ahughes@redhat.com>
+
+	* acinclude.m4:
+	(IT_ENABLE_JAMVM): Renamed from IT_CHECK_ENABLE_JAMVM.
+	(IT_WITH_JAMVM_SRC_ZIP): Renamed form IT_CHECK_WITH_JAMVM_SRC_ZIP.
+	(IT_ENABLE_CACAO): Renamed from IT_CHECK_ENABLE_CACAO.
+	(IT_WITH_CACAO_HOME): Renamed form IT_CHECK_WITH_CACAO_HOME.
+	(IT_WITH_CACAO_SRC_ZIP): Renamed form IT_CHECK_WITH_CACAO_SRC_ZIP.
+	(IT_WITH_CACAO_SRC_DIR): Renamed form IT_CHECK_WITH_CACAO_SRC_DIR.
+	(IT_WITH_GCJ): Renamed from IT_CHECK_WITH_GCJ.
+	(IT_WITH_HOTSPOT_BUILD): Renamed from IT_CHECK_WITH_HOTSPOT_BUILD.
+	(IT_WITH_HG_REVISION): Renamed from IT_CHECK_WITH_HG_REVISION.
+	(IT_WITH_TZDATA_DIR): Renamed from IT_CHECK_WITH_TZDATA_DIR.
+
 2011-02-23  Andrew John Hughes  <ahughes@redhat.com>
 
 	* acinclude.m4:

--- a/acinclude.m4	Wed Feb 23 20:32:30 2011 +0000
+++ b/acinclude.m4	Wed Feb 23 20:39:53 2011 +0000
@@ -905,7 +905,7 @@
   AM_CONDITIONAL(SHARK_BUILD, test "x${use_shark}" = xyes)
 ])
 
-AC_DEFUN([IT_CHECK_ENABLE_JAMVM],
+AC_DEFUN([IT_ENABLE_JAMVM],
 [
   AC_MSG_CHECKING(whether to use JamVM as VM)
   AC_ARG_ENABLE([jamvm],
@@ -922,7 +922,7 @@
   AC_SUBST(ENABLE_JAMVM)
 ])
 
-AC_DEFUN([IT_CHECK_WITH_JAMVM_SRC_ZIP],
+AC_DEFUN([IT_WITH_JAMVM_SRC_ZIP],
 [
   AC_MSG_CHECKING([for a JamVM source zip])
   AC_ARG_WITH([jamvm-src-zip],
@@ -943,7 +943,7 @@
   AC_SUBST(ALT_JAMVM_SRC_ZIP)
 ])
 
-AC_DEFUN([IT_CHECK_ENABLE_CACAO],
+AC_DEFUN([IT_ENABLE_CACAO],
 [
   AC_MSG_CHECKING(whether to use CACAO as VM)
   AC_ARG_ENABLE([cacao],
@@ -960,7 +960,7 @@
   AC_SUBST(ENABLE_CACAO)
 ])
 
-AC_DEFUN([IT_CHECK_WITH_CACAO_HOME],
+AC_DEFUN([IT_WITH_CACAO_HOME],
 [
   AC_MSG_CHECKING([for a CACAO home directory])
   AC_ARG_WITH([cacao-home],
@@ -985,7 +985,7 @@
   AC_SUBST(CACAO_IMPORT_PATH)
 ])
 
-AC_DEFUN([IT_CHECK_WITH_CACAO_SRC_ZIP],
+AC_DEFUN([IT_WITH_CACAO_SRC_ZIP],
 [
   AC_MSG_CHECKING([for a CACAO source zip])
   AC_ARG_WITH([cacao-src-zip],
@@ -1006,7 +1006,7 @@
   AC_SUBST(ALT_CACAO_SRC_ZIP)
 ])
 
-AC_DEFUN([IT_CHECK_WITH_CACAO_SRC_DIR],
+AC_DEFUN([IT_WITH_CACAO_SRC_DIR],
 [
   AC_MSG_CHECKING([for a CACAO source directory])
   AC_ARG_WITH([cacao-src-dir],
@@ -1023,7 +1023,7 @@
   AC_SUBST(ALT_CACAO_SRC_DIR)
 ])
 
-AC_DEFUN([IT_CHECK_WITH_GCJ],
+AC_DEFUN([IT_WITH_GCJ],
 [
   AC_MSG_CHECKING([whether to compile ecj natively])
   AC_ARG_WITH([gcj],
@@ -1041,7 +1041,7 @@
   AC_SUBST([GCJ])
 ])
 
-AC_DEFUN([IT_CHECK_WITH_HOTSPOT_BUILD],
+AC_DEFUN([IT_WITH_HOTSPOT_BUILD],
 [
   ORIGINAL_BUILD="original"
   ALTERNATE_BUILD="hs20"
@@ -1171,7 +1171,7 @@
   AM_CONDITIONAL([USE_HG], test x"${enable_hg}" = "xyes")
 ])
 
-AC_DEFUN([IT_CHECK_WITH_HG_REVISION],
+AC_DEFUN([IT_WITH_HG_REVISION],
 [
   AC_MSG_CHECKING([which Mercurial revision to use])
   AC_ARG_WITH([hg-revision],
@@ -1251,7 +1251,7 @@
   AC_SUBST(SYSTEM_JDK_DIR)
 ])
 
-AC_DEFUN([IT_CHECK_WITH_TZDATA_DIR],
+AC_DEFUN([IT_WITH_TZDATA_DIR],
 [
   DEFAULT="/usr/share/javazi"
   AC_MSG_CHECKING([which Java timezone data directory to use])

--- a/configure.ac	Wed Feb 23 20:32:30 2011 +0000
+++ b/configure.ac	Wed Feb 23 20:39:53 2011 +0000
@@ -44,8 +44,8 @@
 IT_CHECK_FOR_MERCURIAL
 IT_OBTAIN_HG_REVISIONS
 AC_PATH_TOOL([LSB_RELEASE],[lsb_release])
-IT_CHECK_WITH_GCJ
-IT_CHECK_WITH_HOTSPOT_BUILD
+IT_WITH_GCJ
+IT_WITH_HOTSPOT_BUILD
 AC_PATH_TOOL([LINUX32],[linux32])
 IT_CHECK_GCC_VERSION
 IT_CHECK_NUMBER_OF_PARALLEL_JOBS
@@ -171,21 +171,21 @@
 IT_WITH_JAF_DROP_ZIP
 IT_WITH_JAXWS_DROP_ZIP
 
-IT_CHECK_ENABLE_CACAO
-IT_CHECK_WITH_CACAO_HOME
-IT_CHECK_WITH_CACAO_SRC_ZIP
-IT_CHECK_WITH_CACAO_SRC_DIR
+IT_ENABLE_CACAO
+IT_WITH_CACAO_HOME
+IT_WITH_CACAO_SRC_ZIP
+IT_WITH_CACAO_SRC_DIR
 
-IT_CHECK_ENABLE_JAMVM
-IT_CHECK_WITH_JAMVM_SRC_ZIP
+IT_ENABLE_JAMVM
+IT_WITH_JAMVM_SRC_ZIP
 
 IT_DISABLE_OPTIMIZATIONS
 IT_SET_SHARK_BUILD
 IT_ENABLE_ZERO_BUILD
 IT_CHECK_ADDITIONAL_VMS
 IT_ENABLE_HG
-IT_CHECK_WITH_HG_REVISION
-IT_CHECK_WITH_TZDATA_DIR
+IT_WITH_HG_REVISION
+IT_WITH_TZDATA_DIR
 IT_GETDTDTYPE_CHECK
 IT_JAVAH