1.1 --- a/common/autoconf/configure.ac Thu Sep 06 17:27:20 2012 -0700
1.2 +++ b/common/autoconf/configure.ac Tue Sep 18 11:29:16 2012 -0700
1.3 @@ -53,9 +53,9 @@
1.4 m4_include([toolchain.m4])
1.5
1.6 # This line needs to be here, verbatim, after all includes.
1.7 -# It is replaced with closed functionality when building
1.8 -# closed sources.
1.9 -AC_DEFUN_ONCE([CLOSED_HOOK])
1.10 +# It is replaced with custom functionality when building
1.11 +# custom sources.
1.12 +AC_DEFUN_ONCE([CUSTOM_HOOK])
1.13
1.14 ###############################################################################
1.15 #
1.16 @@ -65,6 +65,12 @@
1.17
1.18 # Basic initialization that must happen first of all
1.19 BASIC_INIT
1.20 +
1.21 +# Now we can determine OpenJDK build and target platforms. This is required to
1.22 +# have early on.
1.23 +PLATFORM_SETUP_OPENJDK_BUILD_AND_TARGET
1.24 +
1.25 +# Continue setting up basic stuff.
1.26 BASIC_SETUP_PATHS
1.27 BASIC_SETUP_LOGGING
1.28
1.29 @@ -75,28 +81,18 @@
1.30 # Without these, we can't properly run the rest of the configure script.
1.31 BASIC_SETUP_TOOLS
1.32
1.33 +# Check if pkg-config is available.
1.34 +PKG_PROG_PKG_CONFIG
1.35 +
1.36 +# After basic tools have been setup, we can check build os specific details.
1.37 +PLATFORM_SETUP_OPENJDK_BUILD_OS_VERSION
1.38 +
1.39 # Setup builddeps, for automatic downloading of tools we need.
1.40 # This is needed before we can call BDEPS_CHECK_MODULE, which is done in
1.41 # boot-jdk setup, but we need to have basic tools setup first.
1.42 BDEPS_CONFIGURE_BUILDDEPS
1.43 BDEPS_SCAN_FOR_BUILDDEPS
1.44
1.45 -# Check if pkg-config is available.
1.46 -PKG_PROG_PKG_CONFIG
1.47 -
1.48 -###############################################################################
1.49 -#
1.50 -# Determine OpenJDK build and target platforms.
1.51 -#
1.52 -###############################################################################
1.53 -
1.54 -PLATFORM_SETUP_OPENJDK_BUILD_AND_TARGET
1.55 -PLATFORM_SETUP_OPENJDK_BUILD_OS_VERSION
1.56 -
1.57 -# With knowledge of the build platform, setup more basic things.
1.58 -BASIC_SETUP_PATH_SEP
1.59 -BASIC_SETUP_SEARCHPATH
1.60 -
1.61 ###############################################################################
1.62 #
1.63 # Determine OpenJDK variants, options and version numbers.
1.64 @@ -148,7 +144,7 @@
1.65 # FIXME: Currently we must test this after paths but before flags. Fix!
1.66
1.67 # And we can test some aspects on the target using configure macros.
1.68 -PLATFORM_TEST_OPENJDK_TARGET_BITS
1.69 +PLATFORM_SETUP_OPENJDK_TARGET_BITS
1.70 PLATFORM_SETUP_OPENJDK_TARGET_ENDIANNESS
1.71
1.72 # Configure flags for the tools
1.73 @@ -213,8 +209,8 @@
1.74 # Check for some common pitfalls
1.75 BASIC_TEST_USABILITY_ISSUES
1.76
1.77 -# At the end, call the closed hook. (Dummy macro if no closed sources available)
1.78 -CLOSED_HOOK
1.79 +# At the end, call the custom hook. (Dummy macro if no custom sources available)
1.80 +CUSTOM_HOOK
1.81
1.82 # We're messing a bit with internal autoconf variables to put the config.status
1.83 # in the output directory instead of the current directory.
1.84 @@ -222,5 +218,8 @@
1.85 # Create the actual output files. Now the main work of configure is done.
1.86 AC_OUTPUT
1.87
1.88 +# Make the compare script executable
1.89 +$CHMOD +x $OUTPUT_ROOT/compare.sh
1.90 +
1.91 # Finally output some useful information to the user
1.92 HELP_PRINT_SUMMARY_AND_WARNINGS
