Mercurial > hg > release > icedtea7-2.0
changeset 2415:32c0d08ab7b3
Ensure all macros have an IT_ prefix.
2011-05-20 Andrew John Hughes <ahughes@redhat.com>
Ensure all our macros have an IT_ prefix.
* acinclude.m4:
(IT_WITH_VERSION_SUFFIX): Renamed from WITH_VERSION_SUFFIX.
(IT_WITH_PROJECT): Renamed from WITH_PROJECT.
(IT_WITH_CORBA_SRC_ZIP): Renamed from WITH_CORBA_SRC_ZIP.
(IT_WITH_JAXP_SRC_ZIP): Renamed from WITH_JAXP_SRC_ZIP.
(IT_WITH_JAXWS_SRC_ZIP): Renamed from WITH_JAXWS_SRC_ZIP.
(IT_WITH_JDK_SRC_ZIP): Renamed from WITH_JDK_SRC_ZIP.
(IT_WITH_LANGTOOLS_SRC_ZIP): Renamed from WITH_LANGTOOLS_SRC_ZIP.
(IT_ENABLE_HG): Fix dependence of IT_WITH_PROJECT.
* configure.ac: Use renamed macros throughout.
2011-02-21 Andrew John Hughes <ahughes@redhat.com>
Ensure all our macros have an IT_ prefix.
* acinclude.m4:
(IT_SET_OS_DIRS): Renamed from SET_OS_DIRS.
(IT_FIND_JAVAC): Renamed from FIND_JAVAC.
(IT_FIND_JAVA): Renamed from FIND_JAVA.
(IT_WITH_OPENJDK_SRC_DIR): Renamed from WITH_OPENJDK_SRC_DIR.
(IT_FIND_ECJ_JAR): Renamed from FIND_ECJ_JAR.
(IT_CHECK_GCC_VERSION): Renamed from AC_CHECK_GCC_VERSION.
(IT_FIND_JAVAH): Renamed from FIND_JAVAH.
(IT_FIND_JAR): Renamed from FIND_JAR.
(IT_FIND_RMIC): Renamed from FIND_RMIC.
(IT_WITH_OPENJDK_SRC_ZIP): Renamed from WITH_OPENJDK_SRC_ZIP.
(IT_WITH_ALT_JAR_BINARY): Renamed from WITH_ALT_JAR_BINARY.
(IT_FIND_XALAN2_JAR): Renamed from FIND_XALAN2_JAR.
(IT_FIND_XALAN2_SERIALIZER_JAR): Renamed from FIND_XALAN2_SERIALIZER_JAR.
(IT_FIND_XERCES2_JAR): Renamed from FIND_XERCES2_JAR.
(IT_FIND_RHINO_JAR): Renamed from FIND_RHINO_JAR.
(IT_DISABLE_OPTIMIZATIONS): Renamed from DISABLE_OPTIMIZATIONS.
(IT_FIND_TOOL): Renamed from FIND_TOOL.
(IT_ENABLE_ZERO_BUILD): Renamed from ENABLE_ZERO_BUILD.
(IT_SET_SHARK_BUILD): Renamed from SET_SHARK_BUILD.
(IT_CHECK_ENABLE_CACAO): Renamed from AC_CHECK_ENABLE_CACAO.
(IT_CHECK_WITH_CACAO_HOME): Renamed from AC_CHECK_WITH_CACAO_HOME.
(IT_CHECK_WITH_CACAO_SRC_ZIP): Renamed from AC_CHECK_WITH_CACAO_SRC_ZIP.
(IT_CHECK_WITH_GCJ): Renamed from AC_CHECK_WITH_GCJ.
(IT_CHECK_WITH_HOTSPOT_BUILD): Renamed from AC_CHECK_WITH_HOTSPOT_BUILD.
(IT_WITH_HOTSPOT_SRC_ZIP): Renamed from WITH_HOTSPOT_SRC_ZIP.
(IT_WITH_JAXP_DROP_ZIP): Renamed from WITH_JAXP_DROP_ZIP.
(IT_WITH_JAF_DROP_ZIP): Renamed from WITH_JAF_DROP_ZIP.
(IT_WITH_JAXWS_DROP_ZIP): Renamed from WITH_JAXWS_DROP_ZIP.
(IT_ENABLE_HG): Renamed from ENABLE_HG.
(IT_CHECK_WITH_HG_REVISION): Renamed from AC_CHECK_WITH_HG_REVISION.
(IT_CHECK_WITH_TZDATA_DIR): Renamed from AC_CHECK_WITH_TZDATA_DIR.
(IT_FIND_NUMBER_OF_PROCESSORS): Fix use of FIND_TOOL.
(IT_OBTAIN_HG_REVISIONS): Fix dependence on WITH_OPENJDK_SRC_DIR.
* configure.ac: Use renamed macros throughout.
author | Andrew John Hughes <ahughes@redhat.com> |
---|---|
date | Fri, 20 May 2011 02:40:36 +0100 |
parents | c6037f7a2964 |
children | 12beb2f3e5fc |
files | ChangeLog acinclude.m4 configure.ac |
diffstat | 3 files changed, 145 insertions(+), 94 deletions(-) [+] |
line wrap: on
line diff
--- a/ChangeLog Fri May 20 02:02:00 2011 +0100 +++ b/ChangeLog Fri May 20 02:40:36 2011 +0100 @@ -1,3 +1,56 @@ +2011-05-20 Andrew John Hughes <ahughes@redhat.com> + + Ensure all our macros have an IT_ prefix. + * acinclude.m4: + (IT_WITH_VERSION_SUFFIX): Renamed from WITH_VERSION_SUFFIX. + (IT_WITH_PROJECT): Renamed from WITH_PROJECT. + (IT_WITH_CORBA_SRC_ZIP): Renamed from WITH_CORBA_SRC_ZIP. + (IT_WITH_JAXP_SRC_ZIP): Renamed from WITH_JAXP_SRC_ZIP. + (IT_WITH_JAXWS_SRC_ZIP): Renamed from WITH_JAXWS_SRC_ZIP. + (IT_WITH_JDK_SRC_ZIP): Renamed from WITH_JDK_SRC_ZIP. + (IT_WITH_LANGTOOLS_SRC_ZIP): Renamed from WITH_LANGTOOLS_SRC_ZIP. + (IT_ENABLE_HG): Fix dependence of IT_WITH_PROJECT. + * configure.ac: Use renamed macros throughout. + +2011-02-21 Andrew John Hughes <ahughes@redhat.com> + + Ensure all our macros have an IT_ prefix. + * acinclude.m4: + (IT_SET_OS_DIRS): Renamed from SET_OS_DIRS. + (IT_FIND_JAVAC): Renamed from FIND_JAVAC. + (IT_FIND_JAVA): Renamed from FIND_JAVA. + (IT_WITH_OPENJDK_SRC_DIR): Renamed from WITH_OPENJDK_SRC_DIR. + (IT_FIND_ECJ_JAR): Renamed from FIND_ECJ_JAR. + (IT_CHECK_GCC_VERSION): Renamed from AC_CHECK_GCC_VERSION. + (IT_FIND_JAVAH): Renamed from FIND_JAVAH. + (IT_FIND_JAR): Renamed from FIND_JAR. + (IT_FIND_RMIC): Renamed from FIND_RMIC. + (IT_WITH_OPENJDK_SRC_ZIP): Renamed from WITH_OPENJDK_SRC_ZIP. + (IT_WITH_ALT_JAR_BINARY): Renamed from WITH_ALT_JAR_BINARY. + (IT_FIND_XALAN2_JAR): Renamed from FIND_XALAN2_JAR. + (IT_FIND_XALAN2_SERIALIZER_JAR): Renamed from FIND_XALAN2_SERIALIZER_JAR. + (IT_FIND_XERCES2_JAR): Renamed from FIND_XERCES2_JAR. + (IT_FIND_RHINO_JAR): Renamed from FIND_RHINO_JAR. + (IT_DISABLE_OPTIMIZATIONS): Renamed from DISABLE_OPTIMIZATIONS. + (IT_FIND_TOOL): Renamed from FIND_TOOL. + (IT_ENABLE_ZERO_BUILD): Renamed from ENABLE_ZERO_BUILD. + (IT_SET_SHARK_BUILD): Renamed from SET_SHARK_BUILD. + (IT_CHECK_ENABLE_CACAO): Renamed from AC_CHECK_ENABLE_CACAO. + (IT_CHECK_WITH_CACAO_HOME): Renamed from AC_CHECK_WITH_CACAO_HOME. + (IT_CHECK_WITH_CACAO_SRC_ZIP): Renamed from AC_CHECK_WITH_CACAO_SRC_ZIP. + (IT_CHECK_WITH_GCJ): Renamed from AC_CHECK_WITH_GCJ. + (IT_CHECK_WITH_HOTSPOT_BUILD): Renamed from AC_CHECK_WITH_HOTSPOT_BUILD. + (IT_WITH_HOTSPOT_SRC_ZIP): Renamed from WITH_HOTSPOT_SRC_ZIP. + (IT_WITH_JAXP_DROP_ZIP): Renamed from WITH_JAXP_DROP_ZIP. + (IT_WITH_JAF_DROP_ZIP): Renamed from WITH_JAF_DROP_ZIP. + (IT_WITH_JAXWS_DROP_ZIP): Renamed from WITH_JAXWS_DROP_ZIP. + (IT_ENABLE_HG): Renamed from ENABLE_HG. + (IT_CHECK_WITH_HG_REVISION): Renamed from AC_CHECK_WITH_HG_REVISION. + (IT_CHECK_WITH_TZDATA_DIR): Renamed from AC_CHECK_WITH_TZDATA_DIR. + (IT_FIND_NUMBER_OF_PROCESSORS): Fix use of FIND_TOOL. + (IT_OBTAIN_HG_REVISIONS): Fix dependence on WITH_OPENJDK_SRC_DIR. + * configure.ac: Use renamed macros throughout. + 2011-05-18 Andrew John Hughes <ahughes@redhat.com> PR714: Forwardport replace-hotspot support.
--- a/acinclude.m4 Fri May 20 02:02:00 2011 +0100 +++ b/acinclude.m4 Fri May 20 02:40:36 2011 +0100 @@ -94,7 +94,7 @@ AC_SUBST(ARCHFLAG) ]) -AC_DEFUN([SET_OS_DIRS], +AC_DEFUN([IT_SET_OS_DIRS], [ case "${host_os}" in *linux*) @@ -117,7 +117,7 @@ AC_SUBST(OS_PATH) ]) -AC_DEFUN([FIND_JAVAC], +AC_DEFUN([IT_FIND_JAVAC], [ JAVAC=${SYSTEM_JDK_DIR}/bin/javac IT_FIND_JAVAC @@ -207,7 +207,7 @@ fi ]) -AC_DEFUN([FIND_JAVA], +AC_DEFUN([IT_FIND_JAVA], [ AC_MSG_CHECKING(for java) AC_ARG_WITH([java], @@ -248,7 +248,7 @@ AM_CONDITIONAL([CP_SUPPORTS_REFLINK], test x"${it_cv_reflink}" = "xyes") ]) -AC_DEFUN_ONCE([WITH_OPENJDK_SRC_DIR], +AC_DEFUN_ONCE([IT_WITH_OPENJDK_SRC_DIR], [ DEFAULT_SRC_DIR=${abs_top_builddir}/openjdk AC_MSG_CHECKING([for an OpenJDK source directory]) @@ -302,7 +302,7 @@ AM_CONDITIONAL([SRC_DIR_HARDLINKABLE], test x"${it_cv_hardlink_src}" = "xyes") ]) -AC_DEFUN([FIND_ECJ_JAR], +AC_DEFUN([IT_FIND_ECJ_JAR], [ AC_MSG_CHECKING([for an ecj JAR file]) AC_ARG_WITH([ecj-jar], @@ -337,7 +337,7 @@ AC_SUBST(ECJ_JAR) ]) -AC_DEFUN([AC_CHECK_GCC_VERSION], +AC_DEFUN([IT_CHECK_GCC_VERSION], [ AC_MSG_CHECKING([version of GCC]) gcc_ver=`${CC} -dumpversion` @@ -347,7 +347,7 @@ AC_MSG_RESULT([${gcc_ver} (major version ${gcc_major_ver}, minor version ${gcc_minor_ver})]) ]) -AC_DEFUN([FIND_JAVAH], +AC_DEFUN([IT_FIND_JAVAH], [ JAVAH_DEFAULT=${SYSTEM_JDK_DIR}/bin/javah AC_MSG_CHECKING([if a javah executable is specified]) @@ -380,7 +380,7 @@ AC_SUBST(JAVAH) ]) -AC_DEFUN([FIND_JAR], +AC_DEFUN([IT_FIND_JAR], [ JAR_DEFAULT=${SYSTEM_JDK_DIR}/bin/jar AC_MSG_CHECKING([if a jar executable is specified]) @@ -446,7 +446,7 @@ AC_SUBST(JAR_KNOWS_J_OPTIONS) ]) -AC_DEFUN([FIND_RMIC], +AC_DEFUN([IT_FIND_RMIC], [ RMIC_DEFAULT=${SYSTEM_JDK_DIR}/bin/rmic AC_MSG_CHECKING(if an rmic executable is specified) @@ -479,7 +479,7 @@ AC_SUBST(RMIC) ]) -AC_DEFUN([WITH_OPENJDK_SRC_ZIP], +AC_DEFUN([IT_WITH_OPENJDK_SRC_ZIP], [ AC_MSG_CHECKING([for an OpenJDK source zip]) AC_ARG_WITH([openjdk-src-zip], @@ -497,7 +497,7 @@ AC_SUBST(ALT_OPENJDK_SRC_ZIP) ]) -AC_DEFUN([WITH_ALT_JAR_BINARY], +AC_DEFUN([IT_WITH_ALT_JAR_BINARY], [ AC_MSG_CHECKING([for an alternate jar command]) AC_ARG_WITH([alt-jar], @@ -514,7 +514,7 @@ AC_SUBST(ALT_JAR_CMD) ]) -AC_DEFUN([FIND_XALAN2_JAR], +AC_DEFUN([IT_FIND_XALAN2_JAR], [ AC_MSG_CHECKING([for a xalan2 jar]) AC_ARG_WITH([xalan2-jar], @@ -545,7 +545,7 @@ AC_SUBST(XALAN2_JAR) ]) -AC_DEFUN([FIND_XALAN2_SERIALIZER_JAR], +AC_DEFUN([IT_FIND_XALAN2_SERIALIZER_JAR], [ AC_MSG_CHECKING([for a xalan2 serializer jar]) AC_ARG_WITH([xalan2-serializer-jar], @@ -576,7 +576,7 @@ AC_SUBST(XALAN2_SERIALIZER_JAR) ]) -AC_DEFUN([FIND_XERCES2_JAR], +AC_DEFUN([IT_FIND_XERCES2_JAR], [ AC_MSG_CHECKING([for a xerces2 jar]) AC_ARG_WITH([xerces2-jar], @@ -609,7 +609,7 @@ AC_SUBST(XERCES2_JAR) ]) -AC_DEFUN([FIND_RHINO_JAR], +AC_DEFUN([IT_FIND_RHINO_JAR], [ AC_MSG_CHECKING([whether to include Javascript support via Rhino]) AC_ARG_WITH([rhino], @@ -657,7 +657,7 @@ AC_SUBST(RHINO_JAR) ]) -AC_DEFUN([DISABLE_OPTIMIZATIONS], +AC_DEFUN([IT_DISABLE_OPTIMIZATIONS], [ AC_MSG_CHECKING([whether to disable optimizations and build with -O0 -g]) AC_ARG_ENABLE([optimizations], @@ -679,7 +679,7 @@ AM_CONDITIONAL([DISABLE_OPTIMIZATIONS], test x"${disable_optimizations}" = "xyes") ]) -AC_DEFUN([FIND_TOOL], +AC_DEFUN([IT_FIND_TOOL], [AC_PATH_TOOL([$1],[$2]) if test x"$$1" = x ; then AC_MSG_ERROR([$2 program not found in PATH]) @@ -687,7 +687,7 @@ AC_SUBST([$1]) ]) -AC_DEFUN([ENABLE_ZERO_BUILD], +AC_DEFUN([IT_ENABLE_ZERO_BUILD], [ AC_REQUIRE([IT_SET_ARCH_SETTINGS]) AC_MSG_CHECKING([whether to use the zero-assembler port]) @@ -763,7 +763,7 @@ AC_SUBST(ZERO_ARCHDEF) ]) -AC_DEFUN([SET_SHARK_BUILD], +AC_DEFUN([IT_SET_SHARK_BUILD], [ AC_MSG_CHECKING(whether to use the Shark JIT) shark_selected=no @@ -787,7 +787,7 @@ AM_CONDITIONAL(SHARK_BUILD, test "x${use_shark}" = xyes) ]) -AC_DEFUN([AC_CHECK_ENABLE_CACAO], +AC_DEFUN([IT_CHECK_ENABLE_CACAO], [ AC_MSG_CHECKING(whether to use CACAO as VM) AC_ARG_ENABLE([cacao], @@ -804,7 +804,7 @@ AC_SUBST(WITH_CACAO) ]) -AC_DEFUN([AC_CHECK_WITH_CACAO_HOME], +AC_DEFUN([IT_CHECK_WITH_CACAO_HOME], [ AC_MSG_CHECKING([for a CACAO home directory]) AC_ARG_WITH([cacao-home], @@ -829,7 +829,7 @@ AC_SUBST(CACAO_IMPORT_PATH) ]) -AC_DEFUN([AC_CHECK_WITH_CACAO_SRC_ZIP], +AC_DEFUN([IT_CHECK_WITH_CACAO_SRC_ZIP], [ AC_MSG_CHECKING([for a CACAO source zip]) AC_ARG_WITH([cacao-src-zip], @@ -846,9 +846,9 @@ AC_SUBST(ALT_CACAO_SRC_ZIP) ]) -AC_DEFUN([ENABLE_HG], +AC_DEFUN([IT_ENABLE_HG], [ - AC_REQUIRE([WITH_PROJECT]) + AC_REQUIRE([IT_WITH_PROJECT]) AC_MSG_CHECKING(whether to retrieve the source code from Mercurial) AC_ARG_ENABLE([hg], [AS_HELP_STRING(--enable-hg,download source code from Mercurial [[default=depends on project]])], @@ -876,7 +876,7 @@ AM_CONDITIONAL([USE_HG], test x"${enable_hg}" = "xyes") ]) -AC_DEFUN([WITH_VERSION_SUFFIX], +AC_DEFUN([IT_WITH_VERSION_SUFFIX], [ AC_MSG_CHECKING(if a version suffix has been specified) AC_ARG_WITH([version-suffix], @@ -904,7 +904,7 @@ AC_SUBST(VERSION_SUFFIX, $version_suffix) ]) -AC_DEFUN([WITH_PROJECT], +AC_DEFUN([IT_WITH_PROJECT], [ AC_MSG_CHECKING(which OpenJDK project is being used) AC_ARG_WITH([project], @@ -935,7 +935,7 @@ AM_CONDITIONAL([USE_JDK7], test x"${project}" = "xjdk7") ]) -AC_DEFUN([AC_CHECK_WITH_GCJ], +AC_DEFUN([IT_CHECK_WITH_GCJ], [ AC_MSG_CHECKING([whether to compile ecj natively]) AC_ARG_WITH([gcj], @@ -954,7 +954,7 @@ AC_SUBST([GCJ]) ]) -AC_DEFUN([AC_CHECK_WITH_HOTSPOT_BUILD], +AC_DEFUN([IT_CHECK_WITH_HOTSPOT_BUILD], [ DEFAULT_BUILD="default" AC_MSG_CHECKING([which HotSpot build to use]) @@ -976,7 +976,7 @@ AM_CONDITIONAL(WITH_ALT_HSBUILD, test "x${HSBUILD}" != "xdefault") ]) -AC_DEFUN([WITH_HOTSPOT_SRC_ZIP], +AC_DEFUN([IT_WITH_HOTSPOT_SRC_ZIP], [ AC_MSG_CHECKING(for a HotSpot source zip) AC_ARG_WITH([hotspot-src-zip], @@ -993,7 +993,7 @@ AC_SUBST(ALT_HOTSPOT_SRC_ZIP) ]) -AC_DEFUN([WITH_CORBA_SRC_ZIP], +AC_DEFUN([IT_WITH_CORBA_SRC_ZIP], [ AC_MSG_CHECKING(for a CORBA source zip) AC_ARG_WITH([corba-src-zip], @@ -1010,7 +1010,7 @@ AC_SUBST(ALT_CORBA_SRC_ZIP) ]) -AC_DEFUN([WITH_JAXP_SRC_ZIP], +AC_DEFUN([IT_WITH_JAXP_SRC_ZIP], [ AC_MSG_CHECKING(for a JAXP source zip) AC_ARG_WITH([jaxp-src-zip], @@ -1027,7 +1027,7 @@ AC_SUBST(ALT_JAXP_SRC_ZIP) ]) -AC_DEFUN([WITH_JAXWS_SRC_ZIP], +AC_DEFUN([IT_WITH_JAXWS_SRC_ZIP], [ AC_MSG_CHECKING(for a JAXWS source zip) AC_ARG_WITH([jaxws-src-zip], @@ -1044,7 +1044,7 @@ AC_SUBST(ALT_JAXWS_SRC_ZIP) ]) -AC_DEFUN([WITH_JDK_SRC_ZIP], +AC_DEFUN([IT_WITH_JDK_SRC_ZIP], [ AC_MSG_CHECKING(for a JDK source zip) AC_ARG_WITH([jdk-src-zip], @@ -1061,7 +1061,7 @@ AC_SUBST(ALT_JDK_SRC_ZIP) ]) -AC_DEFUN([WITH_LANGTOOLS_SRC_ZIP], +AC_DEFUN([IT_WITH_LANGTOOLS_SRC_ZIP], [ AC_MSG_CHECKING(for a langtools source zip) AC_ARG_WITH([langtools-src-zip], @@ -1078,7 +1078,7 @@ AC_SUBST(ALT_LANGTOOLS_SRC_ZIP) ]) -AC_DEFUN([WITH_JAXP_DROP_ZIP], +AC_DEFUN([IT_WITH_JAXP_DROP_ZIP], [ AC_MSG_CHECKING(for a JAXP drop zip) AC_ARG_WITH([jaxp-drop-zip], @@ -1095,7 +1095,7 @@ AC_SUBST(ALT_JAXP_DROP_ZIP) ]) -AC_DEFUN([WITH_JAF_DROP_ZIP], +AC_DEFUN([IT_WITH_JAF_DROP_ZIP], [ AC_MSG_CHECKING(for a JAF drop zip) AC_ARG_WITH([jaf-drop-zip], @@ -1112,7 +1112,7 @@ AC_SUBST(ALT_JAF_DROP_ZIP) ]) -AC_DEFUN([WITH_JAXWS_DROP_ZIP], +AC_DEFUN([IT_WITH_JAXWS_DROP_ZIP], [ AC_MSG_CHECKING(for a JAXWS drop zip) AC_ARG_WITH([jaxws-drop-zip], @@ -1129,7 +1129,7 @@ AC_SUBST(ALT_JAXWS_DROP_ZIP) ]) -AC_DEFUN([AC_CHECK_WITH_HG_REVISION], +AC_DEFUN([IT_CHECK_WITH_HG_REVISION], [ AC_MSG_CHECKING([which Mercurial revision to use]) AC_ARG_WITH([hg-revision], @@ -1428,7 +1428,7 @@ AC_SUBST(ENABLE_WARNINGS) ]) -AC_DEFUN([AC_CHECK_WITH_TZDATA_DIR], +AC_DEFUN([IT_CHECK_WITH_TZDATA_DIR], [ DEFAULT="/usr/share/javazi" AC_MSG_CHECKING([which Java timezone data directory to use]) @@ -1633,7 +1633,7 @@ AC_DEFUN_ONCE([IT_OBTAIN_HG_REVISIONS], [ AC_REQUIRE([IT_CHECK_FOR_MERCURIAL]) - AC_REQUIRE([WITH_OPENJDK_SRC_DIR]) + AC_REQUIRE([IT_WITH_OPENJDK_SRC_DIR]) ICEDTEA_REVISION="none"; JDK_REVISION="none"; HOTSPOT_REVISION="none"; @@ -1736,7 +1736,7 @@ # Finds number of available processors using sysconf AC_DEFUN_ONCE([IT_FIND_NUMBER_OF_PROCESSORS],[ - FIND_TOOL([GETCONF], [getconf]) + IT_FIND_TOOL([GETCONF], [getconf]) AC_CACHE_CHECK([the number of online processors], it_cv_proc, [ if number=$($GETCONF _NPROCESSORS_ONLN); then it_cv_proc=$number;
--- a/configure.ac Fri May 20 02:02:00 2011 +0100 +++ b/configure.ac Fri May 20 02:40:36 2011 +0100 @@ -18,19 +18,19 @@ AC_PROG_CC AC_PROG_CXX -FIND_TOOL([MAKE], [make]) -FIND_TOOL([GZIP], [gzip]) -FIND_TOOL([ANT], [ant]) -FIND_TOOL([FIND], [find]) -FIND_TOOL([PATCH], [patch]) -FIND_TOOL([TAR], [tar]) -FIND_TOOL([CHMOD], [chmod]) -FIND_TOOL([SHA256SUM], [sha256sum]) -FIND_TOOL([WGET], [wget]) -FIND_TOOL([ZIP], [zip]) -FIND_TOOL([UNZIP], [unzip]) -FIND_TOOL([CPIO], [cpio]) -FIND_TOOL([FILE], [file]) +IT_FIND_TOOL([MAKE], [make]) +IT_FIND_TOOL([GZIP], [gzip]) +IT_FIND_TOOL([ANT], [ant]) +IT_FIND_TOOL([FIND], [find]) +IT_FIND_TOOL([PATCH], [patch]) +IT_FIND_TOOL([TAR], [tar]) +IT_FIND_TOOL([CHMOD], [chmod]) +IT_FIND_TOOL([SHA256SUM], [sha256sum]) +IT_FIND_TOOL([WGET], [wget]) +IT_FIND_TOOL([ZIP], [zip]) +IT_FIND_TOOL([UNZIP], [unzip]) +IT_FIND_TOOL([CPIO], [cpio]) +IT_FIND_TOOL([FILE], [file]) AC_CHECK_TOOLS([FASTJAR], [fastjar jar]) if test "x$FASTJAR" = x; then AC_MSG_ERROR([Can't find fastjar or jar]) @@ -39,14 +39,14 @@ AC_CHECK_TOOL([LDD], [ldd]) dnl OpenJDK's README-builds.html lists gawk as a build dependency so we dnl check for it explicitly rather than using AC_PROG_AWK. -FIND_TOOL([GAWK], [gawk]) +IT_FIND_TOOL([GAWK], [gawk]) IT_CHECK_FOR_MERCURIAL IT_OBTAIN_HG_REVISIONS AC_PATH_TOOL([LSB_RELEASE],[lsb_release]) -AC_CHECK_WITH_GCJ -AC_CHECK_WITH_HOTSPOT_BUILD +IT_CHECK_WITH_GCJ +IT_CHECK_WITH_HOTSPOT_BUILD AC_PATH_TOOL([LINUX32],[linux32]) -AC_CHECK_GCC_VERSION +IT_CHECK_GCC_VERSION IT_FIND_NUMBER_OF_PROCESSORS IT_CP_SUPPORTS_REFLINK IT_CAN_HARDLINK_TO_SOURCE_TREE @@ -83,8 +83,6 @@ AM_CONDITIONAL([ENABLE_SYSTEMTAP], [test x$ENABLE_SYSTEMTAP = xyes]) AC_MSG_RESULT(${ENABLE_SYSTEMTAP}) -IT_LOCATE_NSS - AC_MSG_CHECKING([whether to include the NSS-based security provider]) AC_ARG_ENABLE([nss], [AS_HELP_STRING([--enable-nss], @@ -102,23 +100,23 @@ IT_GET_LSB_DATA IT_SET_ARCH_SETTINGS -SET_OS_DIRS +IT_SET_OS_DIRS OPENJDK_BUILD_DIR=openjdk.build AC_SUBST(OPENJDK_BUILD_DIR) IT_CHECK_NUMBER_OF_PARALLEL_JOBS IT_CHECK_IF_BOOTSTRAPPING IT_CHECK_FOR_JDK -FIND_JAVA -FIND_JAVAC -FIND_JAVAH -FIND_JAR -FIND_RMIC +IT_FIND_JAVA +IT_FIND_JAVAC +IT_FIND_JAVAH +IT_FIND_JAR +IT_FIND_RMIC if test "x$enable_bootstrap" = "xyes"; then - FIND_ECJ_JAR - FIND_XALAN2_JAR - FIND_XALAN2_SERIALIZER_JAR - FIND_XERCES2_JAR + IT_FIND_ECJ_JAR + IT_FIND_XALAN2_JAR + IT_FIND_XALAN2_SERIALIZER_JAR + IT_FIND_XERCES2_JAR fi AC_CONFIG_FILES([javac], [chmod +x javac]) AC_CONFIG_FILES([javap], [chmod +x javap]) @@ -133,34 +131,34 @@ IT_CHECK_ENABLE_WARNINGS IT_DIAMOND_CHECK -FIND_RHINO_JAR -WITH_OPENJDK_SRC_ZIP -WITH_HOTSPOT_SRC_ZIP -WITH_CORBA_SRC_ZIP -WITH_JAXP_SRC_ZIP -WITH_JAXWS_SRC_ZIP -WITH_JDK_SRC_ZIP -WITH_LANGTOOLS_SRC_ZIP -WITH_ALT_JAR_BINARY -WITH_JAXP_DROP_ZIP -WITH_JAF_DROP_ZIP -WITH_JAXWS_DROP_ZIP +IT_FIND_RHINO_JAR +IT_WITH_OPENJDK_SRC_ZIP +IT_WITH_HOTSPOT_SRC_ZIP +IT_WITH_CORBA_SRC_ZIP +IT_WITH_JAXP_SRC_ZIP +IT_WITH_JAXWS_SRC_ZIP +IT_WITH_JDK_SRC_ZIP +IT_WITH_LANGTOOLS_SRC_ZIP +IT_WITH_ALT_JAR_BINARY +IT_WITH_JAXP_DROP_ZIP +IT_WITH_JAF_DROP_ZIP +IT_WITH_JAXWS_DROP_ZIP -AC_CHECK_ENABLE_CACAO -AC_CHECK_WITH_CACAO_HOME -AC_CHECK_WITH_CACAO_SRC_ZIP +IT_CHECK_ENABLE_CACAO +IT_CHECK_WITH_CACAO_HOME +IT_CHECK_WITH_CACAO_SRC_ZIP IT_CHECK_ENABLE_JAMVM IT_CHECK_WITH_JAMVM_SRC_ZIP -DISABLE_OPTIMIZATIONS -SET_SHARK_BUILD -ENABLE_ZERO_BUILD +IT_DISABLE_OPTIMIZATIONS +IT_SET_SHARK_BUILD +IT_ENABLE_ZERO_BUILD IT_CHECK_ADDITIONAL_VMS -WITH_VERSION_SUFFIX -WITH_PROJECT -ENABLE_HG -AC_CHECK_WITH_TZDATA_DIR +IT_WITH_VERSION_SUFFIX +IT_WITH_PROJECT +IT_ENABLE_HG +IT_CHECK_WITH_TZDATA_DIR AC_PATH_TOOL([HG],[hg]) if test "x${enable_hg}" = "xyes"; then @@ -169,7 +167,7 @@ fi fi AC_SUBST([HG]) -AC_CHECK_WITH_HG_REVISION +IT_CHECK_WITH_HG_REVISION AC_PATH_TOOL([GCJ],[gcj]) AC_SUBST([GCJ]) @@ -402,7 +400,7 @@ if test "x${SHARK_BUILD_TRUE}" = x || test "x${ADD_SHARK_BUILD_TRUE}" = x; then if test "x${LLVM_CONFIG}" = x; then - FIND_TOOL([LLVM_CONFIG], [llvm-config]) + IT_FIND_TOOL([LLVM_CONFIG], [llvm-config]) fi llvm_components="jit engine nativecodegen" LLVM_VERSION="`$LLVM_CONFIG --version`"