equal
deleted
inserted
replaced
3723 # definitions. It is replaced with custom functionality when building |
3723 # definitions. It is replaced with custom functionality when building |
3724 # custom sources. |
3724 # custom sources. |
3725 #CUSTOM_AUTOCONF_INCLUDE |
3725 #CUSTOM_AUTOCONF_INCLUDE |
3726 |
3726 |
3727 # Do not change or remove the following line, it is needed for consistency checks: |
3727 # Do not change or remove the following line, it is needed for consistency checks: |
3728 DATE_WHEN_GENERATED=1361899489 |
3728 DATE_WHEN_GENERATED=1362517596 |
3729 |
3729 |
3730 ############################################################################### |
3730 ############################################################################### |
3731 # |
3731 # |
3732 # Initialization / Boot-strapping |
3732 # Initialization / Boot-strapping |
3733 # |
3733 # |
18095 fi |
18095 fi |
18096 |
18096 |
18097 |
18097 |
18098 ### Locate C compiler (CC) |
18098 ### Locate C compiler (CC) |
18099 |
18099 |
18100 # gcc is almost always present, but on Windows we |
18100 # On windows, only cl.exe is supported. |
18101 # prefer cl.exe and on Solaris we prefer CC. |
18101 # On Solaris, cc is preferred to gcc. |
18102 # Thus test for them in this order. |
18102 # Elsewhere, gcc is preferred to cc. |
18103 if test "x$OPENJDK_TARGET_OS" = xmacosx; then |
18103 |
18104 # Do not probe for cc on MacOSX. |
18104 if test "x$CC" != x; then |
18105 COMPILER_CHECK_LIST="cl gcc" |
18105 COMPILER_CHECK_LIST="$CC" |
18106 else |
18106 elif test "x$OPENJDK_TARGET_OS" = "xwindows"; then |
18107 COMPILER_CHECK_LIST="cl cc gcc" |
18107 COMPILER_CHECK_LIST="cl" |
|
18108 elif test "x$OPENJDK_TARGET_OS" = "xsolaris"; then |
|
18109 COMPILER_CHECK_LIST="cc gcc" |
|
18110 else |
|
18111 COMPILER_CHECK_LIST="gcc cc" |
18108 fi |
18112 fi |
18109 |
18113 |
18110 |
18114 |
18111 COMPILER_NAME=C |
18115 COMPILER_NAME=C |
18112 |
18116 |
19066 |
19070 |
19067 { $as_echo "$as_me:${as_lineno-$LINENO}: Using $COMPILER_VENDOR $COMPILER_NAME compiler version $COMPILER_VERSION (located at $COMPILER)" >&5 |
19071 { $as_echo "$as_me:${as_lineno-$LINENO}: Using $COMPILER_VENDOR $COMPILER_NAME compiler version $COMPILER_VERSION (located at $COMPILER)" >&5 |
19068 $as_echo "$as_me: Using $COMPILER_VENDOR $COMPILER_NAME compiler version $COMPILER_VERSION (located at $COMPILER)" >&6;} |
19072 $as_echo "$as_me: Using $COMPILER_VENDOR $COMPILER_NAME compiler version $COMPILER_VERSION (located at $COMPILER)" >&6;} |
19069 |
19073 |
19070 |
19074 |
19071 # Now that we have resolved CC ourself, let autoconf have it's go at it |
19075 # Now that we have resolved CC ourself, let autoconf have its go at it |
19072 ac_ext=c |
19076 ac_ext=c |
19073 ac_cpp='$CPP $CPPFLAGS' |
19077 ac_cpp='$CPP $CPPFLAGS' |
19074 ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' |
19078 ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' |
19075 ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' |
19079 ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' |
19076 ac_compiler_gnu=$ac_cv_c_compiler_gnu |
19080 ac_compiler_gnu=$ac_cv_c_compiler_gnu |
19668 ac_compiler_gnu=$ac_cv_cxx_compiler_gnu |
19672 ac_compiler_gnu=$ac_cv_cxx_compiler_gnu |
19669 |
19673 |
19670 |
19674 |
19671 ### Locate C++ compiler (CXX) |
19675 ### Locate C++ compiler (CXX) |
19672 |
19676 |
19673 if test "x$OPENJDK_TARGET_OS" = xmacosx; then |
19677 if test "x$CXX" != x; then |
19674 # Do not probe for CC on MacOSX. |
19678 COMPILER_CHECK_LIST="$CXX" |
19675 COMPILER_CHECK_LIST="cl g++" |
19679 elif test "x$OPENJDK_TARGET_OS" = "xwindows"; then |
19676 else |
19680 COMPILER_CHECK_LIST="cl" |
19677 COMPILER_CHECK_LIST="cl CC g++" |
19681 elif test "x$OPENJDK_TARGET_OS" = "xsolaris"; then |
19678 fi |
19682 COMPILER_CHECK_LIST="CC g++" |
|
19683 else |
|
19684 COMPILER_CHECK_LIST="g++ CC" |
|
19685 fi |
|
19686 |
19679 |
19687 |
19680 COMPILER_NAME=C++ |
19688 COMPILER_NAME=C++ |
19681 |
19689 |
19682 CXX= |
19690 CXX= |
19683 # If TOOLS_DIR is set, check for all compiler names in there first |
19691 # If TOOLS_DIR is set, check for all compiler names in there first |
20635 |
20643 |
20636 { $as_echo "$as_me:${as_lineno-$LINENO}: Using $COMPILER_VENDOR $COMPILER_NAME compiler version $COMPILER_VERSION (located at $COMPILER)" >&5 |
20644 { $as_echo "$as_me:${as_lineno-$LINENO}: Using $COMPILER_VENDOR $COMPILER_NAME compiler version $COMPILER_VERSION (located at $COMPILER)" >&5 |
20637 $as_echo "$as_me: Using $COMPILER_VENDOR $COMPILER_NAME compiler version $COMPILER_VERSION (located at $COMPILER)" >&6;} |
20645 $as_echo "$as_me: Using $COMPILER_VENDOR $COMPILER_NAME compiler version $COMPILER_VERSION (located at $COMPILER)" >&6;} |
20638 |
20646 |
20639 |
20647 |
20640 # Now that we have resolved CXX ourself, let autoconf have it's go at it |
20648 # Now that we have resolved CXX ourself, let autoconf have its go at it |
20641 ac_ext=cpp |
20649 ac_ext=cpp |
20642 ac_cpp='$CXXCPP $CPPFLAGS' |
20650 ac_cpp='$CXXCPP $CPPFLAGS' |
20643 ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5' |
20651 ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5' |
20644 ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' |
20652 ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' |
20645 ac_compiler_gnu=$ac_cv_cxx_compiler_gnu |
20653 ac_compiler_gnu=$ac_cv_cxx_compiler_gnu |