common/autoconf/configure.ac
author erikj
Thu, 07 Jun 2012 20:25:06 -0700
changeset 12801 948f8ad66ee7
parent 12475 0881e7d017ef
child 13132 bd88bb8dd3af
permissions -rw-r--r--
7170079: Adjustments to build-infra makefiles Reviewed-by: ohair, ohrstrom, ihse, jonas Contributed-by: jonas <jonas.oreland@oracle.com>, erikj <erik.joelsson@oracle.com>, ihse <magnus.ihse.bursie@oracle.com>, tgranat <torbjorn.granat@oracle.com>, ykantser <yekaterina.kantserova@oracle.com>
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
12258
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
     1
#
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
     2
# Copyright (c) 2011, 2012, Oracle and/or its affiliates. All rights reserved.
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
     3
# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
     4
#
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
     5
# This code is free software; you can redistribute it and/or modify it
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
     6
# under the terms of the GNU General Public License version 2 only, as
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
     7
# published by the Free Software Foundation.  Oracle designates this
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
     8
# particular file as subject to the "Classpath" exception as provided
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
     9
# by Oracle in the LICENSE file that accompanied this code.
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
    10
#
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
    11
# This code is distributed in the hope that it will be useful, but WITHOUT
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
    12
# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
    13
# FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
    14
# version 2 for more details (a copy is included in the LICENSE file that
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
    15
# accompanied this code).
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
    16
#
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
    17
# You should have received a copy of the GNU General Public License version
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
    18
# 2 along with this work; if not, write to the Free Software Foundation,
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
    19
# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
    20
#
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
    21
# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
    22
# or visit www.oracle.com if you need additional information or have any
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
    23
# questions.
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
    24
#
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
    25
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
    26
AC_PREREQ([2.61])
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
    27
AC_INIT(openjdk, version-0.1, build-infra-dev@openjdk.java.net)
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
    28
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
    29
AC_CONFIG_AUX_DIR([build-aux])
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
    30
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
    31
m4_include([build-aux/pkg.m4])
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
    32
m4_include([builddeps.m4])
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
    33
m4_include([platform.m4])
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
    34
m4_include([cores.m4])
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
    35
m4_include([help.m4])
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
    36
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
    37
# Save the command line. Do this very early, before it is lost by calling autoconf macros.
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
    38
CONFIGURE_COMMAND_LINE="$@"
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
    39
AC_SUBST(CONFIGURE_COMMAND_LINE)
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
    40
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
    41
# Locate the directory of this script.
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
    42
SCRIPT="[$]0"
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
    43
REMOVE_SYMBOLIC_LINKS(SCRIPT)        
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
    44
AUTOCONF_DIR=`dirname [$]0`
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
    45
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
    46
# Start with tools that do not need have cross compilation support
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
    47
# and can be expected to be found in the default PATH. These tools are
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
    48
# used by configure. Nor are these tools expected to be found in the
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
    49
# devkit from the builddeps server either, since they are
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
    50
# needed to download the devkit. 
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
    51
AC_PROG_AWK
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
    52
CHECK_NONEMPTY(AWK)
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
    53
AC_PATH_PROG(CAT, cat)
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
    54
CHECK_NONEMPTY(CAT)
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
    55
AC_PATH_PROG(CHMOD, chmod)
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
    56
CHECK_NONEMPTY(CHMOD)
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
    57
AC_PATH_PROG(CP, cp)
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
    58
CHECK_NONEMPTY(CP)
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
    59
AC_PATH_PROG(CPIO, cpio)
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
    60
CHECK_NONEMPTY(CPIO)
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
    61
AC_PATH_PROG(CUT, cut)
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
    62
CHECK_NONEMPTY(CUT)
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
    63
AC_PATH_PROG(DATE, date)
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
    64
CHECK_NONEMPTY(DATE)
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
    65
AC_PATH_PROG(DF, df)
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
    66
CHECK_NONEMPTY(DF)
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
    67
AC_PATH_PROG(DIFF, diff)
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
    68
CHECK_NONEMPTY(DIFF)
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
    69
# Warning echo is really, really unportable!!!!! Different
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
    70
# behaviour in bash and dash and in a lot of other shells!
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
    71
# Use printf for serious work! 
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
    72
AC_PATH_PROG(ECHO, echo)
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
    73
CHECK_NONEMPTY(ECHO)
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
    74
AC_PROG_EGREP
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
    75
CHECK_NONEMPTY(EGREP)
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
    76
AC_PROG_FGREP
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
    77
CHECK_NONEMPTY(FGREP)
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
    78
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
    79
AC_PATH_PROG(FIND, find)
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
    80
CHECK_NONEMPTY(FIND)
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
    81
CHECK_FIND_DELETE
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
    82
AC_SUBST(FIND_DELETE)
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
    83
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
    84
AC_PROG_GREP
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
    85
CHECK_NONEMPTY(GREP)
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
    86
AC_PATH_PROG(HEAD, head)
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
    87
CHECK_NONEMPTY(HEAD)
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
    88
AC_PATH_PROG(LN, ln)
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
    89
CHECK_NONEMPTY(LN)
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
    90
AC_PATH_PROG(LS, ls)
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
    91
CHECK_NONEMPTY(LS)
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
    92
AC_PATH_PROGS(MAKE, [gmake make])
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
    93
CHECK_NONEMPTY(MAKE)
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
    94
MAKE_VERSION=`$MAKE --version | head -n 1 | grep '3.8[[12346789]]'`
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
    95
if test "x$MAKE_VERSION" = x; then
12801
948f8ad66ee7 7170079: Adjustments to build-infra makefiles
erikj
parents: 12475
diff changeset
    96
    AC_MSG_ERROR([You must use GNU make 3.81 or newer! Please put it in the path.])
12258
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
    97
fi
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
    98
AC_PATH_PROG(MKDIR, mkdir)
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
    99
CHECK_NONEMPTY(MKDIR)
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   100
AC_PATH_PROG(MV, mv)
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   101
CHECK_NONEMPTY(MV)
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   102
AC_PATH_PROGS(NAWK, [nawk gawk awk])
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   103
CHECK_NONEMPTY(NAWK)
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   104
AC_PATH_PROG(PRINTF, printf)
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   105
CHECK_NONEMPTY(PRINTF)
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   106
AC_PATH_PROG(THEPWDCMD, pwd)
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   107
AC_PATH_PROG(RM, rm)
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   108
CHECK_NONEMPTY(RM)
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   109
RM="$RM -f"
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   110
AC_PROG_SED
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   111
CHECK_NONEMPTY(SED)
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   112
AC_PATH_PROG(SH, sh)
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   113
CHECK_NONEMPTY(SH)
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   114
AC_PATH_PROG(SORT, sort)
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   115
CHECK_NONEMPTY(SORT)
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   116
AC_PATH_PROG(TAR, tar)
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   117
CHECK_NONEMPTY(TAR)
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   118
AC_PATH_PROG(TAIL, tail)
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   119
CHECK_NONEMPTY(TAIL)
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   120
AC_PATH_PROG(TEE, tee)
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   121
CHECK_NONEMPTY(TEE)
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   122
AC_PATH_PROG(TR, tr)
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   123
CHECK_NONEMPTY(TR)
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   124
AC_PATH_PROG(TOUCH, touch)
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   125
CHECK_NONEMPTY(TOUCH)
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   126
AC_PATH_PROG(WC, wc)
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   127
CHECK_NONEMPTY(WC)
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   128
AC_PATH_PROG(XARGS, xargs)
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   129
CHECK_NONEMPTY(XARGS)
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   130
AC_PATH_PROG(ZIP, zip)
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   131
CHECK_NONEMPTY(ZIP)
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   132
AC_PATH_PROG(UNZIP, unzip)
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   133
CHECK_NONEMPTY(UNZIP)
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   134
AC_PATH_PROG(LDD, ldd)
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   135
if test "x$LDD" = "x"; then
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   136
    # List shared lib dependencies is used for
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   137
    # debug output and checking for forbidden dependencies.
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   138
    # We can build without it.
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   139
    LDD="true"
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   140
fi
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   141
AC_PATH_PROG(OTOOL, otool)
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   142
if test "x$OTOOL" = "x"; then
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   143
   OTOOL="true"
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   144
fi
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   145
AC_PATH_PROG(READELF, readelf)
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   146
AC_PATH_PROG(EXPR, expr)
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   147
CHECK_NONEMPTY(EXPR)
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   148
AC_PATH_PROG(FILE, file)
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   149
CHECK_NONEMPTY(FILE)
12801
948f8ad66ee7 7170079: Adjustments to build-infra makefiles
erikj
parents: 12475
diff changeset
   150
AC_PATH_PROG(HG, hg)
948f8ad66ee7 7170079: Adjustments to build-infra makefiles
erikj
parents: 12475
diff changeset
   151
12258
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   152
# Figure out the build and host system.
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   153
AC_CANONICAL_BUILD
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   154
AC_CANONICAL_HOST
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   155
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   156
AC_ARG_WITH(data-model, [AS_HELP_STRING([--with-data-model],
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   157
   [build 32-bit or 64-bit binaries (for platforms that support it), e.g. --with-data-model=32 @<:@guessed@:>@])])
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   158
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   159
if test "x$with_data_model" != x && \
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   160
   test "x$with_data_model" != x32 && \
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   161
   test "x$with_data_model" != x64 ; then
12801
948f8ad66ee7 7170079: Adjustments to build-infra makefiles
erikj
parents: 12475
diff changeset
   162
    AC_MSG_ERROR([The data model can only be 32 or 64!])
12258
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   163
fi
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   164
# Translate the standard cpu-vendor-kernel-os quadruplets into
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   165
# the new HOST_.... and BUILD_... and the legacy names used by
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   166
# the openjdk build.
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   167
# It uses $host_os $host_cpu $build_os $build_cpu and $with_data_model
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   168
EXTRACT_HOST_AND_BUILD_AND_LEGACY_VARS
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   169
# Now the following vars are defined.
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   170
# HOST_OS=aix,bsd,hpux,linux,macosx,solaris,windows
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   171
# HOST_OS_FAMILY=bsd,gnu,sysv,win32,wince
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   172
# HOST_OS_API=posix,winapi
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   173
#
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   174
# HOST_CPU=ia32,x64,sparc,sparcv9,arm,arm64,ppc,ppc64
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   175
# HOST_CPU_ARCH=x86,sparc,pcc,arm
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   176
# HOST_CPU_BITS=32,64
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   177
# HOST_CPU_ENDIAN=big,little
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   178
#
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   179
# There is also a:
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   180
# LEGACY_HOST_CPU1=i586,amd64,....  # used to set the old var ARCH
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   181
# LEGACY_HOST_CPU2=i386,amd64,.... # used to set the old var LIBARCH
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   182
# LEGACY_HOST_CPU3=only sparcv9,amd64 # used to set the ISA_DIR on Solaris
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   183
# There was also a BUILDARCH that had i486,amd64,... but we do not use that
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   184
# in the new build.
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   185
# LEGACY_HOST_OS_API=solaris,windows # used to select source roots
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   186
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   187
DATE_WHEN_CONFIGURED=`LANG=C date`
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   188
AC_SUBST(DATE_WHEN_CONFIGURED)
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   189
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   190
# How many cores do we have on this build system?
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   191
AC_ARG_WITH(num-cores, [AS_HELP_STRING([--with-num-cores],
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   192
    [number of cores in the build system, e.g. --with-num-cores=8 @<:@probed@:>@])])
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   193
if test "x$with_num_cores" = x; then
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   194
    # The number of cores were not specified, try to probe them.
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   195
    CHECK_CORES
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   196
else
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   197
    NUM_CORES=$with_num_cores
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   198
    CONCURRENT_BUILD_JOBS=`expr $NUM_CORES \* 2`
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   199
fi
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   200
AC_SUBST(NUM_CORES)
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   201
AC_SUBST(CONCURRENT_BUILD_JOBS)
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   202
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   203
# How many cores do we have on this build system?
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   204
AC_ARG_WITH(memory-size, [AS_HELP_STRING([--with-memory-size],
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   205
    [memory (in MB) available in the build system, e.g. --with-memory-size=1024 @<:@probed@:>@])])
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   206
if test "x$with_memory_size" = x; then
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   207
    # The memory size was not specified, try to probe it.
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   208
    CHECK_MEMORY_SIZE
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   209
else
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   210
    MEMORY_SIZE=$with_memory_size
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   211
fi
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   212
AC_SUBST(MEMORY_SIZE)
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   213
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   214
# Where is the source? It is located two levels above the configure script.
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   215
CURDIR="$PWD"
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   216
cd "$AUTOCONF_DIR/../.."
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   217
SRC_ROOT="`pwd`"
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   218
AC_SUBST(SRC_ROOT)
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   219
cd "$CURDIR"
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   220
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   221
# For cygwin we need cygpath first, since it is used everywhere.
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   222
AC_PATH_PROG(CYGPATH, cygpath)
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   223
PATH_SEP=":"
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   224
if test "x$BUILD_OS" = "xwindows"; then
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   225
    if test "x$CYGPATH" = x; then
12801
948f8ad66ee7 7170079: Adjustments to build-infra makefiles
erikj
parents: 12475
diff changeset
   226
        AC_MSG_ERROR([Something is wrong with your cygwin installation since I cannot find cygpath.exe in your path])
12258
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   227
    fi
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   228
    PATH_SEP=";"
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   229
fi
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   230
AC_SUBST(PATH_SEP)
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   231
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   232
SPACESAFE(SRC_ROOT,[the path to the source root])
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   233
SPACESAFE(CURDIR,[the path to the current directory])
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   234
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   235
if test "x$BUILD_OS" = "xsolaris"; then
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   236
    # Also search in /usr/ccs/bin for utilities like ar and as.
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   237
    PATH="/usr/ccs/bin:$PATH"
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   238
fi
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   239
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   240
###############################################################################
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   241
#
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   242
# OpenJDK or closed
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   243
#
12801
948f8ad66ee7 7170079: Adjustments to build-infra makefiles
erikj
parents: 12475
diff changeset
   244
AC_ARG_ENABLE([openjdk-only], [AS_HELP_STRING([--enable-openjdk-only],
12258
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   245
    [build OpenJDK regardless of the presence of closed repositories @<:@disabled@:>@])],,)
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   246
12801
948f8ad66ee7 7170079: Adjustments to build-infra makefiles
erikj
parents: 12475
diff changeset
   247
if test "x$enable_openjdk_only" = "xyes"; then
12258
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   248
    OPENJDK=true
12801
948f8ad66ee7 7170079: Adjustments to build-infra makefiles
erikj
parents: 12475
diff changeset
   249
elif test "x$enable_openjdk_only" = "xno"; then
12258
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   250
    OPENJDK=false
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   251
elif test -d "$SRC_ROOT/jdk/src/closed"; then
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   252
    OPENJDK=false
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   253
else
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   254
    OPENJDK=true
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   255
fi
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   256
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   257
if test "x$OPENJDK" = "xtrue"; then
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   258
    SET_OPENJDK=OPENJDK=true
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   259
fi
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   260
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   261
AC_SUBST(SET_OPENJDK)
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   262
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   263
###############################################################################
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   264
#
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   265
# JIGSAW or not.  The JIGSAW variable is used during the intermediate
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   266
# stage when we are building both the old style JDK and the new style modularized JDK.
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   267
# When the modularized JDK is finalized, this option will go away.
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   268
#
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   269
AC_ARG_ENABLE([jigsaw], [AS_HELP_STRING([--enable-jigsaw],
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   270
    [build Jigsaw images (not yet available) @<:@disabled@:>@])],,)
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   271
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   272
if test "x$enable_jigsaw" = "xyes"; then
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   273
    JIGSAW=true
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   274
else
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   275
    JIGSAW=false
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   276
fi
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   277
AC_SUBST(JIGSAW)
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   278
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   279
###############################################################################
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   280
#
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   281
# Check which variant of the JDK that we want to build.
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   282
# Currently we have:
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   283
#    normal:   standard edition   
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   284
#    embedded: cut down to a smaller footprint
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   285
#
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   286
# Effectively the JDK variant gives a name to a specific set of
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   287
# modules to compile into the JDK. In the future, these modules
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   288
# might even be Jigsaw modules.
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   289
#
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   290
AC_MSG_CHECKING([which variant of the JDK to build])
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   291
AC_ARG_WITH([jdk-variant], [AS_HELP_STRING([--with-jdk-variant],
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   292
	[JDK variant to build (normal, embedded) @<:@normal@:>@])])
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   293
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   294
if test "x$with_jdk_variant" = xnormal || test "x$with_jdk_variant" = x; then
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   295
    JAVASE_EMBEDDED=""
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   296
    MINIMIZE_RAM_USAGE=""
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   297
    JDK_VARIANT="normal"
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   298
elif test "x$with_jdk_variant" = xembedded; then
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   299
    JAVASE_EMBEDDED="JAVASE_EMBEDDED:=true"
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   300
    MINIMIZE_RAM_USAGE="MINIMIZE_RAM_USAGE:=true"
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   301
    JDK_VARIANT="embedded"
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   302
else
12801
948f8ad66ee7 7170079: Adjustments to build-infra makefiles
erikj
parents: 12475
diff changeset
   303
    AC_MSG_ERROR([The available JDK variants are: normal, embedded])
12258
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   304
fi
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   305
                              
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   306
AC_SUBST(JAVASE_EMBEDDED)
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   307
AC_SUBST(MINIMIZE_RAM_USAGE)
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   308
AC_SUBST(JDK_VARIANT)
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   309
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   310
AC_MSG_RESULT([$JDK_VARIANT])
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   311
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   312
###############################################################################
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   313
#
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   314
# Should we build a JDK/JVM with head support (ie a graphical ui)?
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   315
# We always build headless support.
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   316
#
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   317
AC_MSG_CHECKING([headful support])
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   318
AC_ARG_ENABLE([headful], [AS_HELP_STRING([--disable-headful],
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   319
	[build headful support (graphical UI support) @<:@enabled@:>@])],
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   320
    [SUPPORT_HEADFUL=${enable_headful}], [SUPPORT_HEADFUL=yes])
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   321
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   322
SUPPORT_HEADLESS=yes
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   323
BUILD_HEADLESS="BUILD_HEADLESS:=true"
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   324
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   325
if test "x$SUPPORT_HEADFUL" = xyes; then
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   326
    # We are building both headful and headless.
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   327
    BUILD_HEADLESS_ONLY=""
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   328
    headful_msg="inlude support for both headful and headless"
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   329
fi
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   330
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   331
if test "x$SUPPORT_HEADFUL" = xno; then
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   332
    # Thus we are building headless only.
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   333
    BUILD_HEADLESS="BUILD_HEADLESS:=true"
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   334
    BUILD_HEADLESS_ONLY="BUILD_HEADLESS_ONLY:=true"
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   335
    headful_msg="headless only"
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   336
fi
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   337
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   338
AC_MSG_RESULT([$headful_msg])
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   339
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   340
AC_SUBST(SUPPORT_HEADLESS)
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   341
AC_SUBST(SUPPORT_HEADFUL)
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   342
AC_SUBST(BUILD_HEADLESS)
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   343
AC_SUBST(BUILD_HEADLESS_ONLY)
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   344
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   345
###############################################################################
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   346
#
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   347
# Check which variants of the JVM that we want to build.
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   348
# Currently we have:
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   349
#    server: normal interpreter and a tiered C1/C2 compiler
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   350
#    client: normal interpreter and C1 (no C2 compiler) (only 32-bit platforms)
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   351
#    kernel: kernel footprint JVM that passes the TCK without major performance problems,
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   352
#             ie normal interpreter and C1, only the serial GC, kernel jvmti etc
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   353
#    zero: no machine code interpreter, no compiler
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   354
#    zeroshark: zero interpreter and shark/llvm compiler backend
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   355
AC_MSG_CHECKING([which variants of the JVM that should be built])
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   356
AC_ARG_WITH([jvm-variants], [AS_HELP_STRING([--with-jvm-variants],
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   357
	[JVM variants (separated by commas) to build (server, client, kernel, zero, zeroshark) @<:@server@:>@])])
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   358
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   359
if test "x$with_jvm_variants" = x; then
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   360
    if test "x$JDK_VARIANT" = xembedded; then
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   361
        with_jvm_variants="kernel"
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   362
    elif test "x$HOST_CPU_BITS" = x64; then
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   363
        with_jvm_variants="server"
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   364
    else
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   365
        # Yes, on 32-bit machines, the same source (almost) is compiled twice
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   366
        # to generate two libjvm.so files. Fun, fun.
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   367
        with_jvm_variants="client,server"
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   368
    fi
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   369
fi
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   370
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   371
JVM_VARIANTS=",$with_jvm_variants,"
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   372
TEST_VARIANTS=`$ECHO "$JVM_VARIANTS" | $SED -e 's/server,//' -e 's/client,//' -e 's/kernel,//' -e 's/zero,//' -e 's/zeroshark,//'`
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   373
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   374
if test "x$TEST_VARIANTS" != "x,"; then
12801
948f8ad66ee7 7170079: Adjustments to build-infra makefiles
erikj
parents: 12475
diff changeset
   375
   AC_MSG_ERROR([The available JVM variants are: server, client, kernel, zero, zeroshark])
12258
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   376
fi   
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   377
AC_MSG_RESULT([$with_jvm_variants])
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   378
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   379
JVM_VARIANT_SERVER=`$ECHO "$JVM_VARIANTS" | $SED -e '/,server,/!s/.*/false/g' -e '/,server,/s/.*/true/g'`
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   380
JVM_VARIANT_CLIENT=`$ECHO "$JVM_VARIANTS" | $SED -e '/,client,/!s/.*/false/g' -e '/,client,/s/.*/true/g'` 
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   381
JVM_VARIANT_KERNEL=`$ECHO "$JVM_VARIANTS" | $SED -e '/,kernel,/!s/.*/false/g' -e '/,kernel,/s/.*/true/g'`
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   382
JVM_VARIANT_ZERO=`$ECHO "$JVM_VARIANTS" | $SED -e '/,zero,/!s/.*/false/g' -e '/,zero,/s/.*/true/g'`
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   383
JVM_VARIANT_ZEROSHARK=`$ECHO "$JVM_VARIANTS" | $SED -e '/,zeroshark,/!s/.*/false/g' -e '/,zeroshark,/s/.*/true/g'`
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   384
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   385
if test "x$JVM_VARIANT_CLIENT" = xtrue; then
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   386
    if test "x$HOST_CPU_BITS" = x64; then
12801
948f8ad66ee7 7170079: Adjustments to build-infra makefiles
erikj
parents: 12475
diff changeset
   387
        AC_MSG_ERROR([You cannot build a client JVM for a 64-bit machine.])
12258
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   388
    fi
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   389
fi
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   390
if test "x$JVM_VARIANT_KERNEL" = xtrue; then
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   391
    if test "x$HOST_CPU_BITS" = x64; then
12801
948f8ad66ee7 7170079: Adjustments to build-infra makefiles
erikj
parents: 12475
diff changeset
   392
        AC_MSG_ERROR([You cannot build a kernel JVM for a 64-bit machine.])
12258
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   393
    fi
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   394
fi
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   395
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   396
COUNT_VARIANTS=`$ECHO "$JVM_VARIANTS" | $SED -e 's/server,/1/' -e 's/client,/1/' -e 's/kernel,/1/' -e 's/zero,/1/' -e 's/zeroshark,/1/'`
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   397
# Replace the commas with AND for use in the build directory name.
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   398
ANDED_JVM_VARIANTS=`$ECHO "$JVM_VARIANTS" | $SED -e 's/^,//' -e 's/,$//' -e 's/,/AND/'`
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   399
if test "x$COUNT_VARIANTS" != "x,1"; then
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   400
    AC_MSG_NOTICE([NOTE! Longer build time since we are building more than one version of the libjvm! $with_jvm_variants])
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   401
fi
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   402
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   403
AC_SUBST(JVM_VARIANTS)
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   404
AC_SUBST(JVM_VARIANT_SERVER)
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   405
AC_SUBST(JVM_VARIANT_CLIENT)
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   406
AC_SUBST(JVM_VARIANT_KERNEL)
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   407
AC_SUBST(JVM_VARIANT_ZERO)
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   408
AC_SUBST(JVM_VARIANT_ZEROSHARK)
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   409
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   410
###############################################################################
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   411
#
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   412
# Set the debug level
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   413
#    release: no debug information, all optimizations, no asserts.
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   414
#    fastdebug: debug information (-g), all optimizations, all asserts
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   415
#    slowdebug: debug information (-g), no optimizations, all asserts
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   416
#
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   417
DEBUG_LEVEL="release"              
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   418
AC_MSG_CHECKING([which debug level to use])
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   419
AC_ARG_ENABLE([debug], [AS_HELP_STRING([--enable-debug],
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   420
	[set the debug level to fastdebug (shorthand for --with-debug-level=fastdebug) @<:@disabled@:>@])],
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   421
	[
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   422
        ENABLE_DEBUG="${enableval}"
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   423
        DEBUG_LEVEL="fastdebug"
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   424
    ], [ENABLE_DEBUG="no"])
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   425
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   426
AC_ARG_WITH([debug-level], [AS_HELP_STRING([--with-debug-level],
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   427
	[set the debug level (release, fastdebug, slowdebug) @<:@release@:>@])],
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   428
	[
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   429
        DEBUG_LEVEL="${withval}"
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   430
        if test "x$ENABLE_DEBUG" = xyes; then
12801
948f8ad66ee7 7170079: Adjustments to build-infra makefiles
erikj
parents: 12475
diff changeset
   431
			AC_MSG_ERROR([You cannot use both --enable-debug and --with-debug-level at the same time.])
12258
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   432
        fi
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   433
    ])
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   434
AC_MSG_RESULT([$DEBUG_LEVEL])
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   435
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   436
if test "x$DEBUG_LEVEL" != xrelease && \
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   437
   test "x$DEBUG_LEVEL" != xfastdebug && \
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   438
   test "x$DEBUG_LEVEL" != xslowdebug; then
12801
948f8ad66ee7 7170079: Adjustments to build-infra makefiles
erikj
parents: 12475
diff changeset
   439
   AC_MSG_ERROR([Allowed debug levels are: release, fastdebug and slowdebug])
12258
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   440
fi
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   441
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   442
case $DEBUG_LEVEL in
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   443
      release )
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   444
          VARIANT="OPT"
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   445
          FASTDEBUG="false"
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   446
          DEBUG_CLASSFILES="false"            
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   447
          BUILD_VARIANT_RELEASE=""             
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   448
           ;;
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   449
      fastdebug )
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   450
          VARIANT="DBG"
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   451
          FASTDEBUG="true"
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   452
          DEBUG_CLASSFILES="true"            
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   453
          BUILD_VARIANT_RELEASE="-fastdebug"
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   454
           ;;
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   455
      slowdebug )
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   456
          VARIANT="DBG"
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   457
          FASTDEBUG="false"
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   458
          DEBUG_CLASSFILES="true"            
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   459
          BUILD_VARIANT_RELEASE="-debug"             
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   460
           ;;
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   461
esac
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   462
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   463
AC_SUBST(DEBUG_LEVEL)
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   464
AC_SUBST(VARIANT)
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   465
AC_SUBST(FASTDEBUG)
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   466
AC_SUBST(DEBUG_CLASSFILES)
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   467
AC_SUBST(BUILD_VARIANT_RELEASE)
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   468
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   469
# Source the version numbers
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   470
. $AUTOCONF_DIR/version.numbers
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   471
if test "x$OPENJDK" = "xfalse"; then
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   472
    . $AUTOCONF_DIR/closed.version.numbers
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   473
fi
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   474
# Now set the JDK version, milestone, build number etc.
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   475
AC_SUBST(JDK_MAJOR_VERSION)
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   476
AC_SUBST(JDK_MINOR_VERSION)
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   477
AC_SUBST(JDK_MICRO_VERSION)
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   478
AC_SUBST(JDK_UPDATE_VERSION)
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   479
AC_SUBST(JDK_BUILD_NUMBER)
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   480
AC_SUBST(MILESTONE)
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   481
AC_SUBST(LAUNCHER_NAME)
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   482
AC_SUBST(PRODUCT_NAME)
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   483
AC_SUBST(PRODUCT_SUFFIX)
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   484
AC_SUBST(JDK_RC_PLATFORM_NAME)
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   485
AC_SUBST(COMPANY_NAME)
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   486
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   487
COPYRIGHT_YEAR=`date +'%Y'`
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   488
AC_SUBST(COPYRIGHT_YEAR)
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   489
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   490
RUNTIME_NAME="$PRODUCT_NAME $PRODUCT_SUFFIX"
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   491
AC_SUBST(RUNTIME_NAME)
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   492
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   493
if test "x$JDK_UPDATE_VERSION" != x; then
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   494
    JDK_VERSION="${JDK_MAJOR_VERSION}.${JDK_MINOR_VERSION}.${JDK_MICRO_VERSION}_${JDK_UPDATE_VERSION}"
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   495
else
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   496
    JDK_VERSION="${JDK_MAJOR_VERSION}.${JDK_MINOR_VERSION}.${JDK_MICRO_VERSION}"
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   497
fi
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   498
AC_SUBST(JDK_VERSION)
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   499
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   500
if test "x$MILESTONE" != x; then
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   501
    RELEASE="${JDK_VERSION}-${MILESTONE}${BUILD_VARIANT_RELEASE}"
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   502
else
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   503
    RELEASE="${JDK_VERSION}${BUILD_VARIANT_RELEASE}"
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   504
fi
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   505
AC_SUBST(RELEASE)
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   506
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   507
if test "x$JDK_BUILD_NUMBER" != x; then
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   508
    FULL_VERSION="${RELEASE}-${JDK_BUILD_NUMBER}"
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   509
else
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   510
    JDK_BUILD_NUMBER=b00
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   511
    BUILD_DATE=`date '+%Y_%m_%d_%H_%M'`
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   512
    # Avoid [:alnum:] since it depends on the locale.
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   513
    CLEAN_USERNAME=`echo "$USER" | $TR -d -c 'abcdefghijklmnopqrstuvqxyz0123456789'`
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   514
    USER_RELEASE_SUFFIX=`echo "${CLEAN_USERNAME}_${BUILD_DATE}" | $TR 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvqxyz'`
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   515
    FULL_VERSION="${RELEASE}-${USER_RELEASE_SUFFIX}-${JDK_BUILD_NUMBER}"
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   516
fi
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   517
AC_SUBST(FULL_VERSION)
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   518
COOKED_BUILD_NUMBER=`$ECHO $JDK_BUILD_NUMBER | $SED -e 's/^b//' -e 's/^0//'`
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   519
AC_SUBST(COOKED_BUILD_NUMBER)
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   520
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   521
# Test from where we are running configure, in or outside of src root.
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   522
if test "x$CURDIR" = "x$SRC_ROOT" || test "x$CURDIR" = "x$SRC_ROOT/common" || test "x$CURDIR" = "x$SRC_ROOT/common/autoconf" || test "x$CURDIR" = "x$SRC_ROOT/common/makefiles" ; then
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   523
    # We are running configure from the src root.
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   524
    # Create a default ./build/host-variant-debuglevel output root.
12801
948f8ad66ee7 7170079: Adjustments to build-infra makefiles
erikj
parents: 12475
diff changeset
   525
    CONF_NAME="${HOST_OS}-${HOST_CPU}-${JDK_VARIANT}-${ANDED_JVM_VARIANTS}-${DEBUG_LEVEL}"
948f8ad66ee7 7170079: Adjustments to build-infra makefiles
erikj
parents: 12475
diff changeset
   526
    OUTPUT_ROOT="$SRC_ROOT/build/${CONF_NAME}"
12258
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   527
    mkdir -p "$OUTPUT_ROOT"
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   528
    if test ! -d "$OUTPUT_ROOT"; then
12801
948f8ad66ee7 7170079: Adjustments to build-infra makefiles
erikj
parents: 12475
diff changeset
   529
        AC_MSG_ERROR([Could not create build directory $OUTPUT_ROOT])
12258
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   530
    fi
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   531
else
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   532
    # We are running configure from outside of the src dir.
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   533
    # Then use the current directory as output dir!
12801
948f8ad66ee7 7170079: Adjustments to build-infra makefiles
erikj
parents: 12475
diff changeset
   534
    # If configuration is situated in normal build directory, just use the build
948f8ad66ee7 7170079: Adjustments to build-infra makefiles
erikj
parents: 12475
diff changeset
   535
    # directory name as configuration name, otherwise use the complete path.
948f8ad66ee7 7170079: Adjustments to build-infra makefiles
erikj
parents: 12475
diff changeset
   536
    CONF_NAME=`$ECHO $CURDIR | $SED -e "s!^${SRC_ROOT}/build/!!"`
12258
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   537
    OUTPUT_ROOT="$CURDIR"
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   538
fi
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   539
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   540
SPACESAFE(OUTPUT_ROOT,[the path to the output root])
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   541
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   542
# Save the arguments given to us
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   543
echo "$CONFIGURE_COMMAND_LINE" > $OUTPUT_ROOT/configure-arguments
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   544
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   545
# Check if the VS env variables were setup prior to running configure.
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   546
# If not, then find vcvarsall.bat and run it automatically, and integrate
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   547
# the set env variables into the spec file.
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   548
SETUPDEVENV="# No special vars"
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   549
if test "x$BUILD_OS" = "xwindows"; then
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   550
    # If vcvarsall.bat has been run, then VCINSTALLDIR is set.
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   551
    if test "x$VCINSTALLDIR" != x; then
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   552
        # No further setup is needed. The build will happen from this kind
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   553
        # of shell.
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   554
        SETUPDEVENV="# This spec file expects that you are running bash from within a VS command prompt."
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   555
        # Make sure to remind you, if you forget to run make from a cygwin bash shell
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   556
        # that is spawned "bash -l" from a VS command prompt.
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   557
        CHECK_FOR_VCINSTALLDIR=yes
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   558
        AC_MSG_CHECKING([if you are running from within a VS command prompt])
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   559
        AC_MSG_RESULT([yes])
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   560
    else
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   561
        # Ah, we have not yet run vcvarsall.bat/vsvars32.bat/vsvars64.bat. Lets do that. First find it.
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   562
        if test "x$VS100COMNTOOLS" != x; then
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   563
            VARSBAT=`find "$VS100COMNTOOLS/../.." -name vcvarsall.bat`
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   564
	    SEARCH_ROOT="$VS100COMNTOOLS"
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   565
        else
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   566
            VARSBAT=`find "$PROGRAMFILES" -name vcvarsall.bat`
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   567
	    SEARCH_ROOT="$PROGRAMFILES"
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   568
        fi
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   569
        VCPATH=`dirname "$VARSBAT"`
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   570
        VCPATH=`cygpath -w "$VCPATH"`
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   571
	if test "x$VARSBAT" = x || test ! -d "$VCPATH"; then
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   572
            AC_MSG_CHECKING([if we can find the VS installation])
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   573
            AC_MSG_RESULT([no])
12801
948f8ad66ee7 7170079: Adjustments to build-infra makefiles
erikj
parents: 12475
diff changeset
   574
            AC_MSG_ERROR([Tried to find a VS installation using both $SEARCH_ROOT but failed. Please run "c:\\cygwin\\bin\\bash.exe -l" from a VS command prompt and then run configure/make from there.])
12258
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   575
        fi
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   576
        case "$LEGACY_HOST_CPU1" in
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   577
          i?86)
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   578
            VARSBAT_ARCH=x86
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   579
            ;;
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   580
          *)
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   581
            VARSBAT_ARCH=$LEGACY_HOST_CPU1
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   582
            ;;
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   583
        esac
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   584
        # Lets extract the variables that are set by vcvarsall.bat/vsvars32.bat/vsvars64.bat
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   585
        cd $OUTPUT_ROOT
12801
948f8ad66ee7 7170079: Adjustments to build-infra makefiles
erikj
parents: 12475
diff changeset
   586
        bash $SRC_ROOT/common/bin/extractvcvars.sh "$VARSBAT" "$VARSBAT_ARCH"
12258
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   587
	cd $CURDIR
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   588
	if test ! -s $OUTPUT_ROOT/localdevenv.sh || test ! -s $OUTPUT_ROOT/localdevenv.gmk; then
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   589
            AC_MSG_CHECKING([if we can extract the needed env variables])
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   590
            AC_MSG_RESULT([no])
12801
948f8ad66ee7 7170079: Adjustments to build-infra makefiles
erikj
parents: 12475
diff changeset
   591
            AC_MSG_ERROR([Could not succesfully extract the env variables needed for the VS setup. Please run "c:\\cygwin\\bin\\bash.exe -l" from a VS command prompt and then run configure/make from there.])
12258
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   592
        fi 
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   593
        # Now set all paths and other env variables. This will allow the rest of 
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   594
        # the configure script to find and run the compiler in the proper way.
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   595
        . $OUTPUT_ROOT/localdevenv.sh
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   596
        AC_MSG_CHECKING([if we can find the VS installation])
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   597
	if test "x$VCINSTALLDIR" != x; then 
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   598
            AC_MSG_RESULT([$VCINSTALLDIR])
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   599
        else 
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   600
            AC_MSG_RESULT([no])
12801
948f8ad66ee7 7170079: Adjustments to build-infra makefiles
erikj
parents: 12475
diff changeset
   601
            AC_MSG_ERROR([Could not find VS installation. Please install. If you are sure you have installed VS, then please run "c:\\cygwin\\bin\\bash.exe -l" from a VS command prompt and then run configure/make from there.])
12258
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   602
        fi
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   603
        CHECK_FOR_VCINSTALLDIR=no
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   604
	SETUPDEVENV="include $OUTPUT_ROOT/localdevenv.gmk"
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   605
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   606
	AC_MSG_CHECKING([for msvcr100.dll])
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   607
        AC_ARG_WITH(msvcr100dll, [AS_HELP_STRING([--with-msvcr100dll],
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   608
            [copy this msvcr100.dll into the built JDK])])
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   609
        if test "x$with_msvcr100dll" != x; then
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   610
            MSVCR100DLL="$with_msvcr100dll"
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   611
        else
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   612
            if test "x$HOST_CPU_BITS" = x64; then
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   613
                MSVCR100DLL=`find "$VCINSTALLDIR/.." -name msvcr100.dll | grep x64 | head --lines 1`
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   614
            else
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   615
                MSVCR100DLL=`find "$VCINSTALLDIR/.." -name msvcr100.dll | grep x86 | grep -v ia64 | grep -v x64 | head --lines 1`
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   616
                if test "x$MSVCR100DLL" = x; then
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   617
                    MSVCR100DLL=`find "$VCINSTALLDIR/.." -name msvcr100.dll | head --lines 1`
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   618
                fi
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   619
            fi
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   620
        fi
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   621
	if test "x$MSVCR100DLL" = x; then
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   622
           AC_MSG_RESULT([no])
12801
948f8ad66ee7 7170079: Adjustments to build-infra makefiles
erikj
parents: 12475
diff changeset
   623
	   AC_MSG_ERROR([Could not find msvcr100.dll !])
12258
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   624
        fi
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   625
        AC_MSG_RESULT([$MSVCR100DLL])
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   626
	SPACESAFE(MSVCR100DLL,[the path to msvcr100.dll])
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   627
    fi
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   628
fi
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   629
AC_SUBST(SETUPDEVENV)
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   630
AC_SUBST(CHECK_FOR_VCINSTALLDIR)
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   631
AC_SUBST(MSVCR100DLL)
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   632
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   633
# Most of the probed defines are put into config.h
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   634
AC_CONFIG_HEADERS([$OUTPUT_ROOT/config.h:$AUTOCONF_DIR/config.h.in])
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   635
# The spec.gmk file contains all variables for the make system.
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   636
AC_CONFIG_FILES([$OUTPUT_ROOT/spec.gmk:$AUTOCONF_DIR/spec.gmk.in])
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   637
# The generated Makefile knows where the spec.gmk is and where the source is.
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   638
# You can run make from the OUTPUT_ROOT. If you have only
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   639
# one configured host, then you can also run make from the SRC_ROOT,
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   640
# since it will go look for a single spec.gmk file. Or perhaps it
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   641
# should instead make all configured hosts it can find?
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   642
AC_CONFIG_FILES([$OUTPUT_ROOT/Makefile:$AUTOCONF_DIR/Makefile.in])
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   643
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   644
AC_SUBST(SPEC, $OUTPUT_ROOT/spec.gmk)
12801
948f8ad66ee7 7170079: Adjustments to build-infra makefiles
erikj
parents: 12475
diff changeset
   645
AC_SUBST(CONF_NAME, $CONF_NAME)
12258
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   646
AC_SUBST(OUTPUT_ROOT, $OUTPUT_ROOT)
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   647
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   648
# Where are the sources. Any of these can be overridden
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   649
# using --with-override-corba and the likes.
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   650
LANGTOOLS_TOPDIR="$SRC_ROOT/langtools"
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   651
CORBA_TOPDIR="$SRC_ROOT/corba"
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   652
JAXP_TOPDIR="$SRC_ROOT/jaxp"
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   653
JAXWS_TOPDIR="$SRC_ROOT/jaxws"
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   654
HOTSPOT_TOPDIR="$SRC_ROOT/hotspot"
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   655
JDK_TOPDIR="$SRC_ROOT/jdk"
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   656
AC_SUBST(LANGTOOLS_TOPDIR)
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   657
AC_SUBST(CORBA_TOPDIR)
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   658
AC_SUBST(JAXP_TOPDIR)
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   659
AC_SUBST(JAXWS_TOPDIR)
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   660
AC_SUBST(HOTSPOT_TOPDIR)
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   661
AC_SUBST(JDK_TOPDIR)
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   662
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   663
# Check if pkg-config is available.
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   664
PKG_PROG_PKG_CONFIG
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   665
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   666
AC_ARG_WITH(builddeps-conf, [AS_HELP_STRING([--with-builddeps-conf],
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   667
    [use this configuration file for the builddeps])])
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   668
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   669
AC_ARG_WITH(builddeps-server, [AS_HELP_STRING([--with-builddeps-server],
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   670
    [download and use build dependencies from this server url, e.g. --with-builddeps-server=ftp://example.com/dir])])
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   671
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   672
AC_ARG_WITH(builddeps-dir, [AS_HELP_STRING([--with-builddeps-dir],
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   673
    [store downloaded build dependencies here @<:@d/localhome/builddeps@:>@])],
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   674
    [],
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   675
    [with_builddeps_dir=/localhome/builddeps])
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   676
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   677
AC_ARG_WITH(builddeps-group, [AS_HELP_STRING([--with-builddeps-group],
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   678
    [chgrp the downloaded build dependencies to this group])])
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   679
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   680
AC_ARG_ENABLE([list-builddeps], [AS_HELP_STRING([--enable-list-builddeps],
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   681
	[list all build dependencies known to the configure script])],
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   682
	[LIST_BUILDDEPS="${enableval}"], [LIST_BUILDDEPS='no'])
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   683
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   684
if test "x$LIST_BUILDDEPS" = xyes; then
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   685
    echo
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   686
    echo List of build dependencies known to the configure script,
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   687
    echo that can be used in builddeps.conf files:
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   688
    cat $SRC_ROOT/configure.ac | grep BDEPS_CHECK_MODUL | grep -v configure.ac | cut -f 2 -d ',' | tr -d ' ' | sort
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   689
    echo
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   690
    exit 1
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   691
fi
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   692
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   693
# If builddeps server or conf file is given. Setup buildeps usage.
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   694
BDEPS_SCAN_FOR_BUILDDEPS
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   695
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   696
###############################################################################
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   697
#
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   698
# Configure the development tool paths and potential sysroot.
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   699
#
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   700
AC_LANG(C++)
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   701
DEVKIT=
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   702
SYS_ROOT=/
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   703
AC_SUBST(SYS_ROOT)
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   704
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   705
# The option used to specify the target .o,.a or .so file.
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   706
# When compiling, how to specify the to be created object file.
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   707
CC_OUT_OPTION='-o$(SPACE)'
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   708
# When linking, how to specify the to be created executable.
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   709
EXE_OUT_OPTION='-o$(SPACE)'
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   710
# When linking, how to specify the to be created dynamically linkable library.
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   711
LD_OUT_OPTION='-o$(SPACE)'
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   712
# When archiving, how to specify the to be create static archive for object files.
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   713
AR_OUT_OPTION='rcs$(SPACE)'
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   714
AC_SUBST(CC_OUT_OPTION)
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   715
AC_SUBST(EXE_OUT_OPTION)
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   716
AC_SUBST(LD_OUT_OPTION)
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   717
AC_SUBST(AR_OUT_OPTION)
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   718
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   719
# If --build AND --host is set, then the configure script will find any
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   720
# cross compilation tools in the PATH. Cross compilation tools
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   721
# follows the cross compilation standard where they are prefixed with ${host}.
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   722
# For example the binary i686-sun-solaris2.10-gcc
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   723
# will cross compile for i686-sun-solaris2.10
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   724
# If neither of build and host is not set, then build=host and the
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   725
# default compiler found in the path will be used.
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   726
# Setting only --host, does not seem to be really supported.
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   727
# Please set both --build and --host if you want to cross compile.
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   728
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   729
DEFINE_CROSS_COMPILE_ARCH=""
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   730
HOSTCC=""
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   731
HOSTCXX=""
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   732
AC_SUBST(DEFINE_CROSS_COMPILE_ARCH)
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   733
AC_SUBST(HOST_CC)
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   734
AC_SUBST(HOST_CXX)
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   735
AC_MSG_CHECKING([if this is a cross compile])
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   736
if test "x$build_var" != "x$host_var"; then
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   737
    AC_MSG_RESULT([yes, from $build_var to $host_var])   
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   738
    # We have detected a cross compile!
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   739
    DEFINE_CROSS_COMPILE_ARCH="CROSS_COMPILE_ARCH:=$LEGACY_HOST_CPU1"
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   740
    # Now we to find a C/C++ compiler that can build executables for the build
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   741
    # platform. We can't use the AC_PROG_CC macro, since it can only be used
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   742
    # once.
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   743
    AC_PATH_PROGS(HOSTCC, [cl cc gcc])
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   744
    WHICHCMD(HOSTCC)
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   745
    AC_PATH_PROGS(HOSTCXX, [cl CC g++])
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   746
    WHICHCMD(HOSTCXX)
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   747
    # Building for the build platform should be easy. Therefore
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   748
    # we do not need any linkers or assemblers etc.    
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   749
else
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   750
    AC_MSG_RESULT([no])
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   751
fi
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   752
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   753
# You can force the sys-root if the sys-root encoded into the cross compiler tools
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   754
# is not correct.
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   755
AC_ARG_WITH(sys-root, [AS_HELP_STRING([--with-sys-root],
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   756
    [pass this sys-root to the compilers and linker (useful if the sys-root encoded in
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   757
     the cross compiler tools is incorrect)])])
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   758
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   759
if test "x$with_sys_root" != x; then
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   760
    SYS_ROOT=$with_sys_root
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   761
fi
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   762
                     
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   763
# If a devkit is found on the builddeps server, then prepend its path to the
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   764
# PATH variable. If there are cross compilers available in the devkit, these
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   765
# will be found by AC_PROG_CC et al.
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   766
BDEPS_CHECK_MODULE(DEVKIT, devkit, xxx,
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   767
                    [# Found devkit
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   768
                     PATH="$DEVKIT/bin:$PATH"
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   769
                     SYS_ROOT="$DEVKIT/${rewritten_host}/sys-root"
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   770
                     if test "x$x_includes" = "xNONE"; then
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   771
                         x_includes="$SYS_ROOT/usr/include/X11"
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   772
                     fi
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   773
                     if test "x$x_libraries" = "xNONE"; then
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   774
                         x_libraries="$SYS_ROOT/usr/lib"
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   775
                     fi
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   776
                    ],
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   777
                    [])
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   778
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   779
if test "x$SYS_ROOT" != "x/" ; then                    
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   780
    CFLAGS="--sysroot=$SYS_ROOT $CFLAGS"
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   781
    CXXFLAGS="--sysroot=$SYS_ROOT $CXXFLAGS"
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   782
    OBJCFLAGS="--sysroot=$SYS_ROOT $OBJCFLAGS" 
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   783
    OBJCXXFLAGS="--sysroot=$SYS_ROOT $OBJCFLAGS" 
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   784
    CPPFLAGS="--sysroot=$SYS_ROOT $CPPFLAGS"
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   785
    LDFLAGS="--sysroot=$SYS_ROOT $LDFLAGS"
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   786
fi
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   787
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   788
# Store the CFLAGS etal passed to the configure script.
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   789
ORG_CFLAGS="$CFLAGS"
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   790
ORG_CXXFLAGS="$CXXFLAGS"
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   791
ORG_OBJCFLAGS="$OBJCFLAGS"
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   792
12801
948f8ad66ee7 7170079: Adjustments to build-infra makefiles
erikj
parents: 12475
diff changeset
   793
prepare_help_system
948f8ad66ee7 7170079: Adjustments to build-infra makefiles
erikj
parents: 12475
diff changeset
   794
12258
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   795
# gcc is almost always present, but on Windows we
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   796
# prefer cl.exe and on Solaris we prefer CC.
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   797
# Thus test for them in this order.
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   798
AC_PROG_CC([cl cc gcc])
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   799
if test "x$CC" = x; then
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   800
    help_on_build_dependency devkit
12801
948f8ad66ee7 7170079: Adjustments to build-infra makefiles
erikj
parents: 12475
diff changeset
   801
    AC_MSG_ERROR([Could not find a compiler. $HELP_MSG])
12258
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   802
fi
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   803
if test "x$CC" = xcc && test "x$BUILD_OS" = xmacosx; then
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   804
    # Do not use cc on MacOSX use gcc instead.
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   805
    CC="gcc"
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   806
fi
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   807
WHICHCMD(CC)
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   808
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   809
AC_PROG_CXX([cl CC g++])
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   810
if test "x$CXX" = xCC && test "x$BUILD_OS" = xmacosx; then
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   811
    # The found CC, even though it seems to be a g++ derivate, cannot compile
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   812
    # c++ code. Override.
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   813
    CXX="g++"
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   814
fi
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   815
WHICHCMD(CXX)
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   816
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   817
if test "x$CXX" = x || test "x$CC" = x; then
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   818
    help_on_build_dependency devkit
12801
948f8ad66ee7 7170079: Adjustments to build-infra makefiles
erikj
parents: 12475
diff changeset
   819
    AC_MSG_ERROR([Could not find the needed compilers! $HELP_MSG ])
12258
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   820
fi
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   821
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   822
if test "x$BUILD_OS" != xwindows; then
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   823
    AC_PROG_OBJC
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   824
    WHICHCMD(OBJC)
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   825
else
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   826
    OBJC=
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   827
fi
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   828
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   829
# Restore the flags to the user specified values.
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   830
# This is necessary since AC_PROG_CC defaults CFLAGS to "-g -O2"
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   831
CFLAGS="$ORG_CFLAGS"
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   832
CXXFLAGS="$ORG_CXXFLAGS"
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   833
OBJCFLAGS="$ORG_OBJCFLAGS"
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   834
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   835
# If we are not cross compiling, use the same compilers for
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   836
# building the build platform executables.
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   837
if test "x$DEFINE_CROSS_COMPILE_ARCH" = x; then
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   838
    HOSTCC="$CC"
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   839
    HOSTCXX="$CXX"
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   840
fi
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   841
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   842
AC_CHECK_TOOL(LD, ld)
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   843
WHICHCMD(LD)
12801
948f8ad66ee7 7170079: Adjustments to build-infra makefiles
erikj
parents: 12475
diff changeset
   844
LD="$CC"
948f8ad66ee7 7170079: Adjustments to build-infra makefiles
erikj
parents: 12475
diff changeset
   845
LDEXE="$CC"
948f8ad66ee7 7170079: Adjustments to build-infra makefiles
erikj
parents: 12475
diff changeset
   846
LDCXX="$CXX"
948f8ad66ee7 7170079: Adjustments to build-infra makefiles
erikj
parents: 12475
diff changeset
   847
LDEXECXX="$CXX"
12258
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   848
# LDEXE is the linker to use, when creating executables.
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   849
AC_SUBST(LDEXE)
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   850
# Linking C++ libraries.
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   851
AC_SUBST(LDCXX)
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   852
# Linking C++ executables.
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   853
AC_SUBST(LDEXECXX)
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   854
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   855
AC_CHECK_TOOL(AR, ar)
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   856
WHICHCMD(AR)
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   857
if test "x$BUILD_OS" = xmacosx; then
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   858
    ARFLAGS="-r"
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   859
else
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   860
    ARFLAGS=""
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   861
fi
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   862
AC_SUBST(ARFLAGS)
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   863
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   864
COMPILER_NAME=gcc
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   865
COMPILER_TYPE=CC
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   866
AS_IF([test "x$BUILD_OS" = xwindows], [
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   867
    # For now, assume that we are always compiling using cl.exe. 
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   868
    CC_OUT_OPTION=-Fo
12801
948f8ad66ee7 7170079: Adjustments to build-infra makefiles
erikj
parents: 12475
diff changeset
   869
    EXE_OUT_OPTION=-out:
12258
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   870
    LD_OUT_OPTION=-out:
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   871
    AR_OUT_OPTION=-out:
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   872
    # On Windows, reject /usr/bin/link, which is a cygwin
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   873
    # program for something completely different.
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   874
    AC_CHECK_PROG([WINLD], [link],[link],,, [/usr/bin/link])
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   875
    # Since we must ignore the first found link, WINLD will contain
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   876
    # the full path to the link.exe program.
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   877
    WHICHCMD_SPACESAFE([WINLD])
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   878
    LD="$WINLD"
12801
948f8ad66ee7 7170079: Adjustments to build-infra makefiles
erikj
parents: 12475
diff changeset
   879
    LDEXE="$WINLD"
12258
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   880
    LDCXX="$WINLD"
12801
948f8ad66ee7 7170079: Adjustments to build-infra makefiles
erikj
parents: 12475
diff changeset
   881
    LDEXECXX="$WINLD"
12258
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   882
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   883
    AC_CHECK_PROG([MT], [mt], [mt],,, [/usr/bin/mt])
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   884
    WHICHCMD_SPACESAFE([MT])
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   885
    # The resource compiler
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   886
    AC_CHECK_PROG([RC], [rc], [rc],,, [/usr/bin/rc])
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   887
    WHICHCMD_SPACESAFE([RC])
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   888
12801
948f8ad66ee7 7170079: Adjustments to build-infra makefiles
erikj
parents: 12475
diff changeset
   889
    RC_FLAGS="-nologo /l 0x409 /r"
12258
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   890
    AS_IF([test "x$VARIANT" = xOPT], [
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   891
        RC_FLAGS="$RC_FLAGS -d NDEBUG"
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   892
    ])
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   893
    JDK_UPDATE_VERSION_NOTNULL=$JDK_UPDATE_VERSION
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   894
    AS_IF([test "x$JDK_UPDATE_VERSION" = x], [
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   895
        JDK_UPDATE_VERSION_NOTNULL=0
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   896
    ])
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   897
    RC_FLAGS="$RC_FLAGS -d \"JDK_BUILD_ID=$FULL_VERSION\""
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   898
    RC_FLAGS="$RC_FLAGS -d \"JDK_COMPANY=$COMPANY_NAME\""
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   899
    RC_FLAGS="$RC_FLAGS -d \"JDK_COMPONENT=$PRODUCT_NAME $JDK_RC_PLATFORM_NAME binary\""
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   900
    RC_FLAGS="$RC_FLAGS -d \"JDK_VER=$JDK_MINOR_VERSION.$JDK_MICRO_VERSION.$JDK_UPDATE_VERSION_NOTNULL.$COOKED_BUILD_NUMBER\""
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   901
    RC_FLAGS="$RC_FLAGS -d \"JDK_COPYRIGHT=Copyright \xA9 $COPYRIGHT_YEAR\""
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   902
    RC_FLAGS="$RC_FLAGS -d \"JDK_NAME=$PRODUCT_NAME $JDK_RC_PLATFORM_NAME $JDK_MINOR_VERSION $JDK_UPDATE_META_TAG\""
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   903
    RC_FLAGS="$RC_FLAGS -d \"JDK_FVER=$JDK_MINOR_VERSION,$JDK_MICRO_VERSION,$JDK_UPDATE_VERSION_NOTNULL,$COOKED_BUILD_NUMBER\""
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   904
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   905
    # lib.exe is used to create static libraries.
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   906
    AC_CHECK_PROG([WINAR], [lib],[lib],,,)
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   907
    WHICHCMD_SPACESAFE([WINAR])
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   908
    AR="$WINAR"
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   909
    ARFLAGS="-nologo -NODEFAULTLIB:MSVCRT"
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   910
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   911
    AC_CHECK_PROG([DUMPBIN], [dumpbin], [dumpbin],,,)
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   912
    WHICHCMD_SPACESAFE([DUMPBIN])
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   913
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   914
    COMPILER_TYPE=CL
12801
948f8ad66ee7 7170079: Adjustments to build-infra makefiles
erikj
parents: 12475
diff changeset
   915
    CCXXFLAGS="$CCXXFLAGS -nologo"
948f8ad66ee7 7170079: Adjustments to build-infra makefiles
erikj
parents: 12475
diff changeset
   916
    LDFLAGS="$LDFLAGS -nologo -opt:ref -incremental:no"
12258
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   917
    if test "x$LEGACY_HOST_CPU1" = xi586; then 
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   918
        LDFLAGS="$LDFLAGS -safeseh"
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   919
    fi
12801
948f8ad66ee7 7170079: Adjustments to build-infra makefiles
erikj
parents: 12475
diff changeset
   920
    # TODO: make -debug optional "--disable-full-debug-symbols"
948f8ad66ee7 7170079: Adjustments to build-infra makefiles
erikj
parents: 12475
diff changeset
   921
    LDFLAGS="$LDFLAGS -debug"
12258
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   922
])
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   923
AC_SUBST(RC_FLAGS)
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   924
AC_SUBST(COMPILER_TYPE)
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   925
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   926
AC_PROG_CPP
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   927
WHICHCMD(CPP)
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   928
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   929
AC_PROG_CXXCPP
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   930
WHICHCMD(CXXCPP)
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   931
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   932
# Find the right assembler.
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   933
if test "x$BUILD_OS" = xsolaris; then
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   934
    AC_PATH_PROG(AS, as)
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   935
    WHICHCMD(AS)
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   936
    ASFLAGS=" "
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   937
else
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   938
    AS="$CC -c"
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   939
    ASFLAGS=" "
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   940
fi
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   941
AC_SUBST(AS)
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   942
AC_SUBST(ASFLAGS)
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   943
12801
948f8ad66ee7 7170079: Adjustments to build-infra makefiles
erikj
parents: 12475
diff changeset
   944
if test "x$HOST_CPU_BITS" = x32 && test "x$HOST_OS" = xmacosx; then
12258
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   945
    # On 32-bit MacOSX the OS requires C-entry points to be 16 byte aligned.
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   946
    # While waiting for a better solution, the current workaround is to use -mstackrealign.
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   947
    CFLAGS="$CFLAGS -mstackrealign"
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   948
    AC_MSG_CHECKING([if 32-bit compiler supports -mstackrealign])
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   949
    AC_LINK_IFELSE([AC_LANG_SOURCE([[int main() { return 0; }]])],
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   950
                   [
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   951
		        AC_MSG_RESULT([yes])
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   952
                   ],
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   953
	           [
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   954
		        AC_MSG_RESULT([no])
12801
948f8ad66ee7 7170079: Adjustments to build-infra makefiles
erikj
parents: 12475
diff changeset
   955
	                AC_MSG_ERROR([The selected compiler $CXX does not support -mstackrealign! Try to put another compiler in the path.])
12258
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   956
	           ])
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   957
fi
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   958
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   959
if test "x$BUILD_OS" = xsolaris; then
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   960
    AC_PATH_PROG(NM, nm)
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   961
    WHICHCMD(NM)
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   962
    AC_PATH_PROG(STRIP, strip)
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   963
    WHICHCMD(STRIP)
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   964
    AC_PATH_PROG(MCS, mcs)
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   965
    WHICHCMD(MCS)
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   966
else
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   967
    AC_CHECK_TOOL(NM, nm)
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   968
    WHICHCMD(NM)
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   969
    AC_CHECK_TOOL(STRIP, strip)
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   970
    WHICHCMD(STRIP)
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   971
fi
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   972
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   973
# When using cygwin, we need a wrapper binary that renames
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   974
# /cygdrive/c/ arguments into c:/ arguments and peeks into
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   975
# @files and rewrites these too! This wrapper binary is
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   976
# called uncygdrive.exe.
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   977
UNCYGDRIVE=
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   978
if test "x$BUILD_OS" = xwindows; then
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   979
    AC_MSG_CHECKING([if uncygdrive can be created])
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   980
    UNCYGDRIVE_SRC=`$CYGPATH -m $SRC_ROOT/common/src/uncygdrive.c`
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   981
    rm -f $OUTPUT_ROOT/uncygdrive*
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   982
    UNCYGDRIVE=`$CYGPATH -m $OUTPUT_ROOT/uncygdrive.exe`
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   983
    cd $OUTPUT_ROOT
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   984
    $CC $UNCYGDRIVE_SRC /Fe$UNCYGDRIVE > $OUTPUT_ROOT/uncygdrive1.log 2>&1
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   985
    cd $CURDIR
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   986
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   987
    if test ! -x $OUTPUT_ROOT/uncygdrive.exe; then 
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   988
        AC_MSG_RESULT([no])
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   989
        cat $OUTPUT_ROOT/uncygdrive1.log
12801
948f8ad66ee7 7170079: Adjustments to build-infra makefiles
erikj
parents: 12475
diff changeset
   990
        AC_MSG_ERROR([Could not create $OUTPUT_ROOT/uncygdrive.exe])
12258
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   991
    fi
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   992
    AC_MSG_RESULT([$UNCYGDRIVE])
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   993
    AC_MSG_CHECKING([if uncygdrive.exe works])
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   994
    cd $OUTPUT_ROOT
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   995
    $UNCYGDRIVE $CC $SRC_ROOT/common/src/uncygdrive.c /Fe$OUTPUT_ROOT/uncygdrive2.exe > $OUTPUT_ROOT/uncygdrive2.log 2>&1 
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   996
    cd $CURDIR
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   997
    if test ! -x $OUTPUT_ROOT/uncygdrive2.exe; then 
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   998
        AC_MSG_RESULT([no])
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   999
        cat $OUTPUT_ROOT/uncygdrive2.log
12801
948f8ad66ee7 7170079: Adjustments to build-infra makefiles
erikj
parents: 12475
diff changeset
  1000
        AC_MSG_ERROR([Uncygdrive did not work!])
12258
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  1001
    fi
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  1002
    AC_MSG_RESULT([yes])
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  1003
    rm -f $OUTPUT_ROOT/uncygdrive?.??? $OUTPUT_ROOT/uncygdrive.obj
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  1004
fi
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  1005
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  1006
AC_SUBST(UNCYGDRIVE)
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  1007
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  1008
TESTFOR_PROG_CCACHE
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  1009
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  1010
# Used on GNU/Linux systems, can be empty...
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  1011
#AC_PATH_PROG(ELFDUMP, elfdump)
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  1012
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  1013
# Setup default logging of stdout and stderr to build.log in the output root.
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  1014
BUILD_LOG='$(OUTPUT_ROOT)/build.log'
12475
0881e7d017ef 7165277: Fix missing execute permission issue running logger.sh
ihse
parents: 12258
diff changeset
  1015
BUILD_LOG_WRAPPER='$(SH) $(SRC_ROOT)/common/bin/logger.sh $(BUILD_LOG)'
12258
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  1016
AC_SUBST(BUILD_LOG)
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  1017
AC_SUBST(BUILD_LOG_WRAPPER)
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  1018
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  1019
###############################################################################
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  1020
#
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  1021
# Now we check if libjvm.so will use 32 or 64 bit pointers for the C/C++ code.
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  1022
# (The JVM can use 32 or 64 bit Java pointers but that decision
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  1023
# is made at runtime.)
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  1024
#
12801
948f8ad66ee7 7170079: Adjustments to build-infra makefiles
erikj
parents: 12475
diff changeset
  1025
AC_LANG_PUSH(C++)
948f8ad66ee7 7170079: Adjustments to build-infra makefiles
erikj
parents: 12475
diff changeset
  1026
OLD_CXXFLAGS="$CXXFLAGS"
948f8ad66ee7 7170079: Adjustments to build-infra makefiles
erikj
parents: 12475
diff changeset
  1027
if test "x$HOST_OS" = xsolaris && test "x$with_data_model" != x; then
948f8ad66ee7 7170079: Adjustments to build-infra makefiles
erikj
parents: 12475
diff changeset
  1028
	CXXFLAGS="-m{$with_data_model} $CXXFLAGS"
948f8ad66ee7 7170079: Adjustments to build-infra makefiles
erikj
parents: 12475
diff changeset
  1029
fi
12258
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  1030
AC_CHECK_SIZEOF([int *], [1111])
12801
948f8ad66ee7 7170079: Adjustments to build-infra makefiles
erikj
parents: 12475
diff changeset
  1031
CXXFLAGS="$OLD_CXXFLAGS"
948f8ad66ee7 7170079: Adjustments to build-infra makefiles
erikj
parents: 12475
diff changeset
  1032
AC_LANG_POP(C++)
948f8ad66ee7 7170079: Adjustments to build-infra makefiles
erikj
parents: 12475
diff changeset
  1033
12258
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  1034
if test "x$ac_cv_sizeof_int_p" = x0; then 
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  1035
    # The test failed, lets pick the assumed value.
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  1036
    ARCH_DATA_MODEL=$HOST_CPU_BITS
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  1037
else
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  1038
    ARCH_DATA_MODEL=`expr 8 \* $ac_cv_sizeof_int_p`
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  1039
fi
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  1040
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  1041
if test "x$ARCH_DATA_MODEL" = x64; then
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  1042
    A_LP64="LP64:="
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  1043
    ADD_LP64="-D_LP64=1"
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  1044
fi
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  1045
AC_MSG_CHECKING([for host address size])
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  1046
AC_MSG_RESULT([$ARCH_DATA_MODEL bits])
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  1047
AC_SUBST(LP64,$A_LP64)
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  1048
AC_SUBST(ARCH_DATA_MODEL)
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  1049
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  1050
if test "x$ARCH_DATA_MODEL" != "x$HOST_CPU_BITS"; then
12801
948f8ad66ee7 7170079: Adjustments to build-infra makefiles
erikj
parents: 12475
diff changeset
  1051
    AC_MSG_ERROR([The tested number of bits in the host ($ARCH_DATA_MODEL) differs from the number of bits expected to be found in the host ($HOST_CPU_BITS)])
12258
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  1052
fi
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  1053
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  1054
###############################################################################
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  1055
#
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  1056
# Can the C/C++ compiler use precompiled headers?
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  1057
#
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  1058
AC_ARG_ENABLE([precompiled-headers], [AS_HELP_STRING([--disable-precompiled-headers],
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  1059
	[use precompiled headers when compiling C++ @<:@enabled@:>@])],
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  1060
    [ENABLE_PRECOMPH=${enable_precompiled-headers}], [ENABLE_PRECOMPH=yes])
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  1061
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  1062
USE_PRECOMPILED_HEADER=1
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  1063
if test "x$ENABLE_PRECOMPH" = xno; then
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  1064
    USE_PRECOMPILED_HEADER=0
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  1065
fi
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  1066
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  1067
if test "x$ENABLE_PRECOMPH" = xyes; then
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  1068
    # Check that the compiler actually supports precomp headers.
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  1069
    if test "x$GCC" = xyes; then
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  1070
         AC_MSG_CHECKING([that precompiled headers work])         
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  1071
         echo "int alfa();" > conftest.h
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  1072
         $CXX -x c++-header conftest.h -o conftest.hpp.gch
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  1073
         if test ! -f conftest.hpp.gch; then
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  1074
             echo Precompiled header is not working!
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  1075
             USE_PRECOMPILED_HEADER=0
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  1076
             AC_MSG_RESULT([no])        
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  1077
         else
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  1078
             AC_MSG_RESULT([yes])
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  1079
         fi
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  1080
         rm -f conftest.h
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  1081
    fi
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  1082
fi
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  1083
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  1084
AC_SUBST(USE_PRECOMPILED_HEADER)
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  1085
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  1086
###############################################################################
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  1087
#
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  1088
# How to compile shared libraries. 
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  1089
#
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  1090
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  1091
if test "x$GCC" = xyes; then
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  1092
    COMPILER_NAME=gcc
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  1093
    PICFLAG="-fPIC"
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  1094
    LIBRARY_PREFIX=lib
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  1095
    SHARED_LIBRARY='lib$1.so'
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  1096
    STATIC_LIBRARY='lib$1.a'
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  1097
    SHARED_LIBRARY_FLAGS="-shared"
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  1098
    SHARED_LIBRARY_SUFFIX='.so'
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  1099
    STATIC_LIBRARY_SUFFIX='.a'
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  1100
    OBJ_SUFFIX='.o'
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  1101
    EXE_SUFFIX=''
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  1102
    SET_SHARED_LIBRARY_NAME='-Xlinker -soname=$1'
12801
948f8ad66ee7 7170079: Adjustments to build-infra makefiles
erikj
parents: 12475
diff changeset
  1103
    SET_SHARED_LIBRARY_MAPFILE='-Xlinker -version-script=$1'
948f8ad66ee7 7170079: Adjustments to build-infra makefiles
erikj
parents: 12475
diff changeset
  1104
    C_FLAG_REORDER=''
948f8ad66ee7 7170079: Adjustments to build-infra makefiles
erikj
parents: 12475
diff changeset
  1105
    CXX_FLAG_REORDER=''
12258
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  1106
    SET_SHARED_LIBRARY_ORIGIN='-Xlinker -z -Xlinker origin -Xlinker -rpath -Xlinker \$$$$ORIGIN/$1'
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  1107
    LD="$CC"
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  1108
    LDEXE="$CC"
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  1109
    LDCXX="$CXX"
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  1110
    LDEXECXX="$CXX"
12801
948f8ad66ee7 7170079: Adjustments to build-infra makefiles
erikj
parents: 12475
diff changeset
  1111
    # TODO: for embedded set --strip-unneeded
948f8ad66ee7 7170079: Adjustments to build-infra makefiles
erikj
parents: 12475
diff changeset
  1112
    POST_STRIP_CMD="$STRIP -g"
12258
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  1113
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  1114
    # Linking is different on MacOSX
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  1115
    if test "x$BUILD_OS" = xmacosx; then
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  1116
        # Might change in the future to clang.
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  1117
        COMPILER_NAME=gcc
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  1118
        SHARED_LIBRARY='lib$1.dylib'
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  1119
        SHARED_LIBRARY_FLAGS="-dynamiclib -compatibility_version 1.0.0 -current_version 1.0.0 $PICFLAG"
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  1120
        SHARED_LIBRARY_SUFFIX='.dylib'
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  1121
        EXE_SUFFIX=''
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  1122
        SET_SHARED_LIBRARY_NAME='-Xlinker -install_name -Xlinker @rpath/$1' 
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  1123
        SET_SHARED_LIBRARY_MAPFILE=''
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  1124
        SET_SHARED_LIBRARY_ORIGIN='-Xlinker -rpath -Xlinker @loader_path/.'
12801
948f8ad66ee7 7170079: Adjustments to build-infra makefiles
erikj
parents: 12475
diff changeset
  1125
        POST_STRIP_CMD="$STRIP -S"
12258
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  1126
    fi
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  1127
else
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  1128
    if test "x$BUILD_OS" = xsolaris; then
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  1129
        # If it is not gcc, then assume it is the Oracle Solaris Studio Compiler
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  1130
        COMPILER_NAME=ossc
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  1131
        PICFLAG="-KPIC"
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  1132
        LIBRARY_PREFIX=lib
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  1133
        SHARED_LIBRARY='lib$1.so'
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  1134
        STATIC_LIBRARY='lib$1.a'
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  1135
        SHARED_LIBRARY_FLAGS="-G"
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  1136
        SHARED_LIBRARY_SUFFIX='.so'
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  1137
        STATIC_LIBRARY_SUFFIX='.a'
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  1138
        OBJ_SUFFIX='.o'
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  1139
        EXE_SUFFIX=''
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  1140
        SET_SHARED_LIBRARY_NAME=''
12801
948f8ad66ee7 7170079: Adjustments to build-infra makefiles
erikj
parents: 12475
diff changeset
  1141
        SET_SHARED_LIBRARY_MAPFILE='-M $1'
948f8ad66ee7 7170079: Adjustments to build-infra makefiles
erikj
parents: 12475
diff changeset
  1142
	C_FLAG_REORDER='-xF'
948f8ad66ee7 7170079: Adjustments to build-infra makefiles
erikj
parents: 12475
diff changeset
  1143
	CXX_FLAG_REORDER='-xF'
12258
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  1144
        SET_SHARED_LIBRARY_ORIGIN='-R \$$$$ORIGIN/$1'
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  1145
        CFLAGS_JDKLIB_EXTRA='-xstrconst -D__solaris__'
12801
948f8ad66ee7 7170079: Adjustments to build-infra makefiles
erikj
parents: 12475
diff changeset
  1146
        POST_STRIP_CMD="$STRIP -x"
948f8ad66ee7 7170079: Adjustments to build-infra makefiles
erikj
parents: 12475
diff changeset
  1147
        POST_MCS_CMD="$MCS -d -a \"JDK $FULL_VERSION\""
12258
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  1148
    fi
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  1149
    if test "x$BUILD_OS" = xwindows; then
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  1150
        # If it is not gcc, then assume it is the MS Visual Studio compiler
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  1151
        COMPILER_NAME=cl
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  1152
        PICFLAG=""
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  1153
        LIBRARY_PREFIX=
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  1154
        SHARED_LIBRARY='$1.dll'
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  1155
        STATIC_LIBRARY='$1.lib'
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  1156
        SHARED_LIBRARY_FLAGS="-LD"
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  1157
        SHARED_LIBRARY_SUFFIX='.dll'
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  1158
        STATIC_LIBRARY_SUFFIX='.lib'
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  1159
        OBJ_SUFFIX='.obj'
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  1160
        EXE_SUFFIX='.exe'
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  1161
        SET_SHARED_LIBRARY_NAME=''
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  1162
        SET_SHARED_LIBRARY_MAPFILE=''
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  1163
        SET_SHARED_LIBRARY_ORIGIN=''
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  1164
    fi
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  1165
fi
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  1166
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  1167
AC_SUBST(OBJ_SUFFIX)
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  1168
AC_SUBST(SHARED_LIBRARY)
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  1169
AC_SUBST(STATIC_LIBRARY)
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  1170
AC_SUBST(LIBRARY_PREFIX)
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  1171
AC_SUBST(SHARED_LIBRARY_SUFFIX)
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  1172
AC_SUBST(STATIC_LIBRARY_SUFFIX)
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  1173
AC_SUBST(EXE_SUFFIX)
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  1174
AC_SUBST(SHARED_LIBRARY_FLAGS)
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  1175
AC_SUBST(SET_SHARED_LIBRARY_NAME)
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  1176
AC_SUBST(SET_SHARED_LIBRARY_MAPFILE)
12801
948f8ad66ee7 7170079: Adjustments to build-infra makefiles
erikj
parents: 12475
diff changeset
  1177
AC_SUBST(C_FLAG_REORDER)
948f8ad66ee7 7170079: Adjustments to build-infra makefiles
erikj
parents: 12475
diff changeset
  1178
AC_SUBST(CXX_FLAG_REORDER)
12258
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  1179
AC_SUBST(SET_SHARED_LIBRARY_ORIGIN)
12801
948f8ad66ee7 7170079: Adjustments to build-infra makefiles
erikj
parents: 12475
diff changeset
  1180
AC_SUBST(POST_STRIP_CMD)
948f8ad66ee7 7170079: Adjustments to build-infra makefiles
erikj
parents: 12475
diff changeset
  1181
AC_SUBST(POST_MCS_CMD)
12258
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  1182
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  1183
# The (cross) compiler is now configured, we can now test capabilities
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  1184
# of the host platform.
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  1185
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  1186
###############################################################################
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  1187
#
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  1188
# Is the host little of big endian?
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  1189
#
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  1190
AC_C_BIGENDIAN([ENDIAN="big"],[ENDIAN="little"],[ENDIAN="unknown"],[ENDIAN="universal"])
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  1191
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  1192
if test "x$ENDIAN" = xuniversal; then
12801
948f8ad66ee7 7170079: Adjustments to build-infra makefiles
erikj
parents: 12475
diff changeset
  1193
    AC_MSG_ERROR([It seems like someone needs to decide how we are to deal with universal binaries on the MacOSX?])
12258
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  1194
fi
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  1195
if test "x$ENDIAN" = xunknown; then
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  1196
    ENDIAN="$HOST_CPU_ENDIAN"
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  1197
fi
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  1198
if test "x$ENDIAN" != "x$HOST_CPU_ENDIAN"; then
12801
948f8ad66ee7 7170079: Adjustments to build-infra makefiles
erikj
parents: 12475
diff changeset
  1199
    AC_MSG_WARN([The tested endian in the host ($ENDIAN) differs from the endian expected to be found in the host ($HOST_CPU_ENDIAN)])
12258
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  1200
    ENDIAN="$HOST_CPU_ENDIAN"
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  1201
fi
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  1202
AC_SUBST(ENDIAN)
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  1203
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  1204
###############################################################################
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  1205
#
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  1206
# We need a Boot JDK to bootstrap the build. 
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  1207
#
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  1208
BOOT_JDK_FOUND=no
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  1209
AC_ARG_WITH(boot-jdk, [AS_HELP_STRING([--with-boot-jdk],
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  1210
    [path to Boot JDK (used to bootstrap build) @<:@probed@:>@])])
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  1211
                    
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  1212
if test "x$with_boot_jdk" != x; then
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  1213
    BOOT_JDK=$with_boot_jdk
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  1214
    BOOT_JDK_FOUND=yes
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  1215
fi
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  1216
if test "x$BOOT_JDK_FOUND" = xno; then
12801
948f8ad66ee7 7170079: Adjustments to build-infra makefiles
erikj
parents: 12475
diff changeset
  1217
    BDEPS_CHECK_MODULE(BOOT_JDK, boot-jdk, xxx, [BOOT_JDK_FOUND=yes], [BOOT_JDK_FOUND=no])
12258
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  1218
fi
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  1219
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  1220
if test "x$BOOT_JDK_FOUND" = xno; then
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  1221
    if test "x$JAVA_HOME" != x; then
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  1222
        if test ! -d "$JAVA_HOME"; then
12801
948f8ad66ee7 7170079: Adjustments to build-infra makefiles
erikj
parents: 12475
diff changeset
  1223
            AC_MSG_ERROR([Your JAVA_HOME points to a non-existing directory!])
12258
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  1224
        fi
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  1225
        # Aha, the user has set a JAVA_HOME
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  1226
        # let us use that as the Boot JDK.
12801
948f8ad66ee7 7170079: Adjustments to build-infra makefiles
erikj
parents: 12475
diff changeset
  1227
        BOOT_JDK="$JAVA_HOME"
12258
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  1228
        BOOT_JDK_FOUND=yes
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  1229
        # To be on the safe side, lets check that it is a JDK.
12801
948f8ad66ee7 7170079: Adjustments to build-infra makefiles
erikj
parents: 12475
diff changeset
  1230
        if test -x "$BOOT_JDK/bin/javac" && test -x "$BOOT_JDK/bin/java"; then
948f8ad66ee7 7170079: Adjustments to build-infra makefiles
erikj
parents: 12475
diff changeset
  1231
            JAVAC="$BOOT_JDK/bin/javac"
948f8ad66ee7 7170079: Adjustments to build-infra makefiles
erikj
parents: 12475
diff changeset
  1232
            JAVA="$BOOT_JDK/bin/java"
12258
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  1233
            BOOT_JDK_FOUND=yes
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  1234
        else
12801
948f8ad66ee7 7170079: Adjustments to build-infra makefiles
erikj
parents: 12475
diff changeset
  1235
            AC_MSG_ERROR([Your JAVA_HOME points to a JRE! The build needs a JDK! Please point JAVA_HOME to a JDK. JAVA_HOME=[$]JAVA_HOME])
12258
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  1236
        fi            
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  1237
    fi
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  1238
fi
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  1239
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  1240
if test "x$BOOT_JDK_FOUND" = xno; then
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  1241
    AC_PATH_PROG(JAVAC_CHECK, javac)
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  1242
    AC_PATH_PROG(JAVA_CHECK, java)
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  1243
    BINARY="$JAVAC_CHECK"
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  1244
    if test "x$JAVAC_CHECK" = x; then
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  1245
        BINARY="$JAVA_CHECK"
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  1246
    fi
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  1247
    if test "x$BINARY" != x; then
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  1248
        # So there is a java(c) binary, it might be part of a JDK.
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  1249
        # Lets find the JDK/JRE directory by following symbolic links.
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  1250
        # Linux/GNU systems often have links from /usr/bin/java to 
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  1251
        # /etc/alternatives/java to the real JDK binary.
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  1252
	WHICHCMD_SPACESAFE(BINARY,[path to javac])
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  1253
        REMOVE_SYMBOLIC_LINKS(BINARY)
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  1254
        BOOT_JDK=`dirname $BINARY`
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  1255
        BOOT_JDK=`cd $BOOT_JDK/..; pwd`
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  1256
        if test -x $BOOT_JDK/bin/javac && test -x $BOOT_JDK/bin/java; then
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  1257
            JAVAC=$BOOT_JDK/bin/javac
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  1258
            JAVA=$BOOT_JDK/bin/java
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  1259
            BOOT_JDK_FOUND=yes
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  1260
        fi
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  1261
    fi
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  1262
fi
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  1263
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  1264
if test "x$BOOT_JDK_FOUND" = xno; then
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  1265
    # Try the MacOSX way.
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  1266
    if test -x /usr/libexec/java_home; then
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  1267
        BOOT_JDK=`/usr/libexec/java_home`
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  1268
        if test -x $BOOT_JDK/bin/javac && test -x $BOOT_JDK/bin/java; then
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  1269
            JAVAC=$BOOT_JDK/bin/javac
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  1270
            JAVA=$BOOT_JDK/bin/java
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  1271
            BOOT_JDK_FOUND=yes
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  1272
        fi
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  1273
    fi
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  1274
fi
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  1275
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  1276
if test "x$BOOT_JDK_FOUND" = xno; then
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  1277
    AC_PATH_PROG(JAVA_CHECK, java)
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  1278
    if test "x$JAVA_CHECK" != x; then
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  1279
        # There is a java in the path. But apparently we have not found a javac 
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  1280
        # in the path, since that would have been tested earlier.
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  1281
        if test "x$HOST_OS" = xwindows; then
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  1282
            # Now if this is a windows platform. The default installation of a JDK
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  1283
            # actually puts the JRE in the path and keeps the JDK out of the path!
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  1284
            # Go look in the default installation location.
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  1285
            BOOT_JDK=/cygdrive/c/Program\ Files/Java/`ls /cygdrive/c/Program\ Files/Java | grep jdk | sort -r | head --lines 1`
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  1286
            if test -d "$BOOT_JDK"; then
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  1287
                BOOT_JDK_FOUND=yes
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  1288
            fi
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  1289
        fi
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  1290
        if test "x$BOOT_JDK_FOUND" = xno; then
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  1291
            help_on_build_dependency openjdk
12801
948f8ad66ee7 7170079: Adjustments to build-infra makefiles
erikj
parents: 12475
diff changeset
  1292
            AC_MSG_ERROR([Found a JRE, not not a JDK! Please remove the JRE from your path and put a JDK there instead. $HELP_MSG])
12258
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  1293
        fi
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  1294
    else
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  1295
        help_on_build_dependency openjdk
12801
948f8ad66ee7 7170079: Adjustments to build-infra makefiles
erikj
parents: 12475
diff changeset
  1296
        AC_MSG_ERROR([Could not find a JDK. $HELP_MSG])
12258
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  1297
    fi
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  1298
fi
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  1299
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  1300
WIN_FIX_PATH(BOOT_JDK)
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  1301
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  1302
# Now see if we can find the rt.jar, or its nearest equivalent.
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  1303
BOOT_RTJAR="$BOOT_JDK/jre/lib/rt.jar"
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  1304
SPACESAFE(BOOT_RTJAR,[the path to the Boot JDK rt.jar (or nearest equivalent)])
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  1305
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  1306
BOOT_TOOLSJAR="$BOOT_JDK/lib/tools.jar"
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  1307
SPACESAFE(BOOT_TOOLSJAR,[the path to the Boot JDK tools.jar (or nearest equivalent)])
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  1308
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  1309
if test ! -f $BOOT_RTJAR; then
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  1310
    # On MacOSX it is called classes.jar
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  1311
    BOOT_RTJAR=$BOOT_JDK/../Classes/classes.jar
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  1312
    if test ! -f $BOOT_RTJAR; then
12801
948f8ad66ee7 7170079: Adjustments to build-infra makefiles
erikj
parents: 12475
diff changeset
  1313
        AC_MSG_ERROR([Cannot find the rt.jar or its equivalent!])
12258
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  1314
    fi
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  1315
    # Remove the .. 
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  1316
    BOOT_RTJAR="`cd ${BOOT_RTJAR%/*} && pwd`/${BOOT_RTJAR##*/}"
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  1317
    # The tools.jar is part of classes.jar
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  1318
    BOOT_TOOLSJAR="$BOOT_RTJAR"
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  1319
fi
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  1320
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  1321
AC_SUBST(BOOT_JDK)
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  1322
AC_SUBST(BOOT_RTJAR)
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  1323
AC_SUBST(BOOT_TOOLSJAR)
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  1324
AC_MSG_CHECKING([for Boot JDK])
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  1325
AC_MSG_RESULT([$BOOT_JDK])
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  1326
AC_MSG_CHECKING([for Boot rt.jar])
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  1327
AC_MSG_RESULT([$BOOT_RTJAR])
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  1328
AC_MSG_CHECKING([for Boot tools.jar])
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  1329
AC_MSG_RESULT([$BOOT_TOOLSJAR])
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  1330
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  1331
# Use the java tool from the Boot JDK.
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  1332
AC_MSG_CHECKING([for java in Boot JDK])
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  1333
JAVA=$BOOT_JDK/bin/java
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  1334
if test ! -x $JAVA; then
12801
948f8ad66ee7 7170079: Adjustments to build-infra makefiles
erikj
parents: 12475
diff changeset
  1335
    AC_MSG_ERROR([Could not find a working java])
12258
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  1336
fi
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  1337
BOOT_JDK_VERSION=`$JAVA -version 2>&1 | head -n 1`
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  1338
AC_MSG_RESULT([yes $BOOT_JDK_VERSION])
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  1339
AC_SUBST(JAVA)
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  1340
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  1341
# Extra M4 quote needed to protect [] in grep expression.
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  1342
[FOUND_VERSION_78=`echo $BOOT_JDK_VERSION | grep  '\"1\.[78]\.'`]
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  1343
if test "x$FOUND_VERSION_78" = x; then
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  1344
    help_on_build_dependency openjdk
12801
948f8ad66ee7 7170079: Adjustments to build-infra makefiles
erikj
parents: 12475
diff changeset
  1345
    AC_MSG_ERROR([Your boot-jdk must be version 7 or 8. $HELP_MSG])
12258
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  1346
fi
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  1347
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  1348
# When compiling code to be executed by the Boot JDK, force jdk7 compatibility.
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  1349
BOOT_JDK_SOURCETARGET="-source 7 -target 7"
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  1350
AC_SUBST(BOOT_JDK_SOURCETARGET)
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  1351
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  1352
# Use the javac tool from the Boot JDK.
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  1353
AC_MSG_CHECKING([for javac in Boot JDK])
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  1354
JAVAC=$BOOT_JDK/bin/javac
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  1355
if test ! -x $JAVAC; then
12801
948f8ad66ee7 7170079: Adjustments to build-infra makefiles
erikj
parents: 12475
diff changeset
  1356
    AC_MSG_ERROR([Could not find a working javac])
12258
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  1357
fi
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  1358
AC_MSG_RESULT(yes)
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  1359
AC_SUBST(JAVAC)
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  1360
AC_SUBST(JAVAC_FLAGS)
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  1361
12801
948f8ad66ee7 7170079: Adjustments to build-infra makefiles
erikj
parents: 12475
diff changeset
  1362
# Use the javah tool from the Boot JDK.
12258
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  1363
AC_MSG_CHECKING([for javah in Boot JDK])
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  1364
JAVAH=$BOOT_JDK/bin/javah
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  1365
if test ! -x $JAVAH; then
12801
948f8ad66ee7 7170079: Adjustments to build-infra makefiles
erikj
parents: 12475
diff changeset
  1366
    AC_MSG_ERROR([Could not find a working javah])
12258
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  1367
fi
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  1368
AC_MSG_RESULT(yes)
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  1369
AC_SUBST(JAVAH)
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  1370
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  1371
# Use the jar tool from the Boot JDK.
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  1372
AC_MSG_CHECKING([for jar in Boot JDK])
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  1373
JAR=$BOOT_JDK/bin/jar
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  1374
if test ! -x $JAR; then
12801
948f8ad66ee7 7170079: Adjustments to build-infra makefiles
erikj
parents: 12475
diff changeset
  1375
    AC_MSG_ERROR([Could not find a working jar])
12258
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  1376
fi
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  1377
AC_SUBST(JAR)
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  1378
AC_MSG_RESULT(yes)
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  1379
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  1380
# Use the rmic tool from the Boot JDK.
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  1381
AC_MSG_CHECKING([for rmic in Boot JDK])
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  1382
RMIC=$BOOT_JDK/bin/rmic
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  1383
if test ! -x $RMIC; then
12801
948f8ad66ee7 7170079: Adjustments to build-infra makefiles
erikj
parents: 12475
diff changeset
  1384
    AC_MSG_ERROR([Could not find a working rmic])
12258
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  1385
fi
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  1386
AC_SUBST(RMIC)
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  1387
AC_MSG_RESULT(yes)
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  1388
12801
948f8ad66ee7 7170079: Adjustments to build-infra makefiles
erikj
parents: 12475
diff changeset
  1389
# Use the native2ascii tool from the Boot JDK.
948f8ad66ee7 7170079: Adjustments to build-infra makefiles
erikj
parents: 12475
diff changeset
  1390
AC_MSG_CHECKING([for native2ascii in Boot JDK])
948f8ad66ee7 7170079: Adjustments to build-infra makefiles
erikj
parents: 12475
diff changeset
  1391
NATIVE2ASCII=$BOOT_JDK/bin/native2ascii
948f8ad66ee7 7170079: Adjustments to build-infra makefiles
erikj
parents: 12475
diff changeset
  1392
if test ! -x $NATIVE2ASCII; then
948f8ad66ee7 7170079: Adjustments to build-infra makefiles
erikj
parents: 12475
diff changeset
  1393
    AC_MSG_ERROR([Could not find a working native2ascii])
948f8ad66ee7 7170079: Adjustments to build-infra makefiles
erikj
parents: 12475
diff changeset
  1394
fi
948f8ad66ee7 7170079: Adjustments to build-infra makefiles
erikj
parents: 12475
diff changeset
  1395
AC_MSG_RESULT(yes)
948f8ad66ee7 7170079: Adjustments to build-infra makefiles
erikj
parents: 12475
diff changeset
  1396
AC_SUBST(NATIVE2ASCII)
948f8ad66ee7 7170079: Adjustments to build-infra makefiles
erikj
parents: 12475
diff changeset
  1397
12258
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  1398
###############################################################################
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  1399
#
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  1400
# Pickup additional source for a component from outside of the source root
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  1401
# or override source for a component. 
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  1402
#
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  1403
AC_ARG_WITH(add-source-root, [AS_HELP_STRING([--with-add-source-root],
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  1404
    [for each and every source directory, look in this additional source root for
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  1405
     the same directory; if it exists and have files in it, include it in the build])])                             
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  1406
                             
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  1407
AC_ARG_WITH(override-source-root, [AS_HELP_STRING([--with-override-source-root],
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  1408
    [for each and every source directory, look in this override source root for
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  1409
     the same directory; if it exists, use that directory instead and
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  1410
     ignore the directory in the original source root])])
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  1411
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  1412
AC_ARG_WITH(adds-and-overrides, [AS_HELP_STRING([--with-adds-and-overrides],
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  1413
    [use the subdirs 'adds' and 'overrides' in the specified directory as
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  1414
     add-source-root and override-source-root])])
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  1415
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  1416
if test "x$with_adds_and_overrides" != x; then
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  1417
    with_add_source_root="$with_adds_and_overrides/adds"
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  1418
    with_override_source_root="$with_adds_and_overrides/overrides"
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  1419
fi
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  1420
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  1421
if test "x$with_add_source_root" != x; then
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  1422
    if ! test -d $with_add_source_root; then
12801
948f8ad66ee7 7170079: Adjustments to build-infra makefiles
erikj
parents: 12475
diff changeset
  1423
       AC_MSG_ERROR([Trying to use a non-existant add-source-root $with_add_source_root])
12258
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  1424
    fi
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  1425
    CURDIR="$PWD"
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  1426
    cd "$with_add_source_root"
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  1427
    ADD_SRC_ROOT="`pwd`"
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  1428
    cd "$CURDIR"
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  1429
    # Verify that the addon source root does not have any root makefiles.
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  1430
    # If it does, then it is usually an error, prevent this.
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  1431
    if test -f $with_add_source_root/langtools/makefiles/Makefile || \
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  1432
       test -f $with_add_source_root/langtools/make/Makefile; then
12801
948f8ad66ee7 7170079: Adjustments to build-infra makefiles
erikj
parents: 12475
diff changeset
  1433
        AC_MSG_ERROR([Your add source root seems to contain a full langtools repo! An add source root should only contain additional sources.])
12258
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  1434
    fi
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  1435
    if test -f $with_add_source_root/corba/makefiles/Makefile || \
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  1436
       test -f $with_add_source_root/corba/make/Makefile; then
12801
948f8ad66ee7 7170079: Adjustments to build-infra makefiles
erikj
parents: 12475
diff changeset
  1437
        AC_MSG_ERROR([Your add source root seems to contain a full corba repo! An add source root should only contain additional sources.])
12258
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  1438
    fi
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  1439
    if test -f $with_add_source_root/jaxp/makefiles/Makefile || \
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  1440
       test -f $with_add_source_root/jaxp/make/Makefile; then
12801
948f8ad66ee7 7170079: Adjustments to build-infra makefiles
erikj
parents: 12475
diff changeset
  1441
        AC_MSG_ERROR([Your add source root seems to contain a full jaxp repo! An add source root should only contain additional sources.])
12258
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  1442
    fi
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  1443
    if test -f $with_add_source_root/jaxws/makefiles/Makefile || \
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  1444
       test -f $with_add_source_root/jaxws/make/Makefile; then
12801
948f8ad66ee7 7170079: Adjustments to build-infra makefiles
erikj
parents: 12475
diff changeset
  1445
        AC_MSG_ERROR([Your add source root seems to contain a full jaxws repo! An add source root should only contain additional sources.])
12258
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  1446
    fi
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  1447
    if test -f $with_add_source_root/hotspot/makefiles/Makefile || \
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  1448
       test -f $with_add_source_root/hotspot/make/Makefile; then
12801
948f8ad66ee7 7170079: Adjustments to build-infra makefiles
erikj
parents: 12475
diff changeset
  1449
        AC_MSG_ERROR([Your add source root seems to contain a full hotspot repo! An add source root should only contain additional sources.])
12258
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  1450
    fi
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  1451
    if test -f $with_add_source_root/jdk/makefiles/Makefile || \
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  1452
       test -f $with_add_source_root/jdk/make/Makefile; then
12801
948f8ad66ee7 7170079: Adjustments to build-infra makefiles
erikj
parents: 12475
diff changeset
  1453
        AC_MSG_ERROR([Your add source root seems to contain a full JDK repo! An add source root should only contain additional sources.])
12258
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  1454
    fi
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  1455
fi
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  1456
AC_SUBST(ADD_SRC_ROOT)
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  1457
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  1458
if test "x$with_override_source_root" != x; then
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  1459
    if ! test -d $with_override_source_root; then
12801
948f8ad66ee7 7170079: Adjustments to build-infra makefiles
erikj
parents: 12475
diff changeset
  1460
       AC_MSG_ERROR([Trying to use a non-existant override-source-root $with_override_source_root])
12258
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  1461
    fi
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  1462
    CURDIR="$PWD"
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  1463
    cd "$with_override_source_root"
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  1464
    OVERRIDE_SRC_ROOT="`pwd`"
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  1465
    cd "$CURDIR"
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  1466
    if test -f $with_override_source_root/langtools/makefiles/Makefile || \
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  1467
       test -f $with_override_source_root/langtools/make/Makefile; then
12801
948f8ad66ee7 7170079: Adjustments to build-infra makefiles
erikj
parents: 12475
diff changeset
  1468
        AC_MSG_ERROR([Your override source root seems to contain a full langtools repo! An override source root should only contain sources that override.])
12258
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  1469
    fi
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  1470
    if test -f $with_override_source_root/corba/makefiles/Makefile || \
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  1471
       test -f $with_override_source_root/corba/make/Makefile; then
12801
948f8ad66ee7 7170079: Adjustments to build-infra makefiles
erikj
parents: 12475
diff changeset
  1472
        AC_MSG_ERROR([Your override source root seems to contain a full corba repo! An override source root should only contain sources that override.])
12258
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  1473
    fi
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  1474
    if test -f $with_override_source_root/jaxp/makefiles/Makefile || \
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  1475
       test -f $with_override_source_root/jaxp/make/Makefile; then
12801
948f8ad66ee7 7170079: Adjustments to build-infra makefiles
erikj
parents: 12475
diff changeset
  1476
        AC_MSG_ERROR([Your override source root seems to contain a full jaxp repo! An override source root should only contain sources that override.])
12258
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  1477
    fi
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  1478
    if test -f $with_override_source_root/jaxws/makefiles/Makefile || \
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  1479
       test -f $with_override_source_root/jaxws/make/Makefile; then
12801
948f8ad66ee7 7170079: Adjustments to build-infra makefiles
erikj
parents: 12475
diff changeset
  1480
        AC_MSG_ERROR([Your override source root seems to contain a full jaxws repo! An override source root should only contain sources that override.])
12258
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  1481
    fi
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  1482
    if test -f $with_override_source_root/hotspot/makefiles/Makefile || \
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  1483
       test -f $with_override_source_root/hotspot/make/Makefile; then
12801
948f8ad66ee7 7170079: Adjustments to build-infra makefiles
erikj
parents: 12475
diff changeset
  1484
        AC_MSG_ERROR([Your override source root seems to contain a full hotspot repo! An override source root should only contain sources that override.])
12258
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  1485
    fi
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  1486
    if test -f $with_override_source_root/jdk/makefiles/Makefile || \
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  1487
       test -f $with_override_source_root/jdk/make/Makefile; then
12801
948f8ad66ee7 7170079: Adjustments to build-infra makefiles
erikj
parents: 12475
diff changeset
  1488
        AC_MSG_ERROR([Your override source root seems to contain a full JDK repo! An override source root should only contain sources that override.])
12258
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  1489
    fi
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  1490
fi
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  1491
AC_SUBST(OVERRIDE_SRC_ROOT)
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  1492
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  1493
###############################################################################
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  1494
#
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  1495
# Override a repo completely, this is used for example when you have 3 small
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  1496
# development sandboxes of the langtools sources and want to avoid having 3 full
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  1497
# OpenJDK sources checked out on disk.
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  1498
#
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  1499
# Assuming that the 3 langtools sandboxes are located here:
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  1500
# /home/fredrik/sandbox1/langtools
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  1501
# /home/fredrik/sandbox2/langtools
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  1502
# /home/fredrik/sandbox3/langtools
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  1503
#
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  1504
# From the source root you create build subdirs manually:
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  1505
#     mkdir -p build1 build2 build3 
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  1506
# in each build directory run:
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  1507
#     (cd build1 && ../configure --with-override-langtools=/home/fredrik/sandbox1 && make)
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  1508
#     (cd build2 && ../configure --with-override-langtools=/home/fredrik/sandbox2 && make)
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  1509
#     (cd build3 && ../configure --with-override-langtools=/home/fredrik/sandbox3 && make)
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  1510
#
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  1511
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  1512
AC_ARG_WITH(override-langtools, [AS_HELP_STRING([--with-override-langtools],
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  1513
    [use this langtools dir for the build])])
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  1514
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  1515
AC_ARG_WITH(override-corba, [AS_HELP_STRING([--with-override-corba],
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  1516
    [use this corba dir for the build])])
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  1517
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  1518
AC_ARG_WITH(override-jaxp, [AS_HELP_STRING([--with-override-jaxp],
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  1519
	[use this jaxp dir for the build])])
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  1520
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  1521
AC_ARG_WITH(override-jaxws, [AS_HELP_STRING([--with-override-jaxws],
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  1522
	[use this jaxws dir for the build])])
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  1523
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  1524
AC_ARG_WITH(override-hotspot, [AS_HELP_STRING([--with-override-hotspot],
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  1525
	[use this hotspot dir for the build])])
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  1526
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  1527
AC_ARG_WITH(override-jdk, [AS_HELP_STRING([--with-override-jdk],
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  1528
	[use this jdk dir for the build])])
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  1529
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  1530
if test "x$with_override_langtools" != x; then
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  1531
    CURDIR="$PWD"
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  1532
    cd "$with_override_langtools"
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  1533
    LANGTOOLS_TOPDIR="`pwd`"
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  1534
    cd "$CURDIR"
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  1535
    if ! test -f $LANGTOOLS_TOPDIR/makefiles/Makefile; then
12801
948f8ad66ee7 7170079: Adjustments to build-infra makefiles
erikj
parents: 12475
diff changeset
  1536
        AC_MSG_ERROR([You have to override langtools with a full langtools repo!])
12258
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  1537
    fi
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  1538
    AC_MSG_CHECKING([if langtools should be overridden])
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  1539
    AC_MSG_RESULT([yes with $LANGTOOLS_TOPDIR])
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  1540
fi    
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  1541
if test "x$with_override_corba" != x; then
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  1542
    CURDIR="$PWD"
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  1543
    cd "$with_override_corba"
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  1544
    CORBA_TOPDIR="`pwd`"
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  1545
    cd "$CURDIR"
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  1546
    if ! test -f $CORBA_TOPDIR/makefiles/Makefile; then
12801
948f8ad66ee7 7170079: Adjustments to build-infra makefiles
erikj
parents: 12475
diff changeset
  1547
        AC_MSG_ERROR([You have to override corba with a full corba repo!])
12258
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  1548
    fi
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  1549
    AC_MSG_CHECKING([if corba should be overridden])
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  1550
    AC_MSG_RESULT([yes with $CORBA_TOPDIR])
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  1551
fi    
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  1552
if test "x$with_override_jaxp" != x; then
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  1553
    CURDIR="$PWD"
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  1554
    cd "$with_override_jaxp"
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  1555
    JAXP_TOPDIR="`pwd`"
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  1556
    cd "$CURDIR"
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  1557
    if ! test -f $JAXP_TOPDIR/makefiles/Makefile; then
12801
948f8ad66ee7 7170079: Adjustments to build-infra makefiles
erikj
parents: 12475
diff changeset
  1558
        AC_MSG_ERROR([You have to override jaxp with a full jaxp repo!])
12258
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  1559
    fi
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  1560
    AC_MSG_CHECKING([if jaxp should be overridden])
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  1561
    AC_MSG_RESULT([yes with $JAXP_TOPDIR])
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  1562
fi    
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  1563
if test "x$with_override_jaxws" != x; then
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  1564
    CURDIR="$PWD"
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  1565
    cd "$with_override_jaxws"
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  1566
    JAXWS_TOPDIR="`pwd`"
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  1567
    cd "$CURDIR"
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  1568
    if ! test -f $JAXWS_TOPDIR/makefiles/Makefile; then
12801
948f8ad66ee7 7170079: Adjustments to build-infra makefiles
erikj
parents: 12475
diff changeset
  1569
        AC_MSG_ERROR([You have to override jaxws with a full jaxws repo!])
12258
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  1570
    fi
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  1571
    AC_MSG_CHECKING([if jaxws should be overridden])
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  1572
    AC_MSG_RESULT([yes with $JAXWS_TOPDIR])
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  1573
fi    
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  1574
if test "x$with_override_hotspot" != x; then
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  1575
    CURDIR="$PWD"
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  1576
    cd "$with_override_hotspot"
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  1577
    HOTSPOT_TOPDIR="`pwd`"
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  1578
    cd "$CURDIR"
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  1579
    if ! test -f $HOTSPOT_TOPDIR/make/Makefile && \
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  1580
       ! test -f $HOTSPOT_TOPDIR/makefiles/Makefile; then
12801
948f8ad66ee7 7170079: Adjustments to build-infra makefiles
erikj
parents: 12475
diff changeset
  1581
        AC_MSG_ERROR([You have to override hotspot with a full hotspot repo!])
12258
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  1582
    fi
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  1583
    AC_MSG_CHECKING([if hotspot should be overridden])
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  1584
    AC_MSG_RESULT([yes with $HOTSPOT_TOPDIR])
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  1585
fi    
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  1586
if test "x$with_override_jdk" != x; then
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  1587
    CURDIR="$PWD"
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  1588
    cd "$with_override_jdk"
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  1589
    JDK_TOPDIR="`pwd`"
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  1590
    cd "$CURDIR"
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  1591
    if ! test -f $JDK_TOPDIR/makefiles/Makefile; then
12801
948f8ad66ee7 7170079: Adjustments to build-infra makefiles
erikj
parents: 12475
diff changeset
  1592
        AC_MSG_ERROR([You have to override JDK with a full JDK repo!])
12258
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  1593
    fi
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  1594
    AC_MSG_CHECKING([if JDK should be overridden])
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  1595
    AC_MSG_RESULT([yes with $JDK_TOPDIR])
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  1596
fi    
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  1597
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  1598
###############################################################################
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  1599
#
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  1600
# Specify options for anything that is run with the Boot JDK.
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  1601
#
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  1602
AC_ARG_WITH(boot-jdk-jvmargs, [AS_HELP_STRING([--with-boot-jdk-jvmargs],
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  1603
	[specify JVM arguments to be passed to all invocations of the Boot JDK, overriding the default values,
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  1604
     e.g --with-boot-jdk-jvmargs="-Xmx8G -enableassertions"])])
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  1605
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  1606
if test "x$with_boot_jdk_jvmargs" = x; then
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  1607
    # Not all JVM:s accept the same arguments on the command line.
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  1608
    # OpenJDK specific increase in thread stack for JDK build,
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  1609
    # well more specifically, when running javac.
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  1610
    if test "x$BUILD_NUM_BITS" = x32; then
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  1611
       STACK_SIZE=768
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  1612
    else
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  1613
       # Running Javac on a JVM on a 64-bit machine, the stack takes more space
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  1614
       # since 64-bit pointers are pushed on the stach. Apparently, we need
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  1615
       # to increase the stack space when javacing the JDK....
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  1616
       STACK_SIZE=1536
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  1617
    fi
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  1618
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  1619
    # Minimum amount of heap memory.
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  1620
    ADD_JVM_ARG_IF_OK([-Xms64M],boot_jdk_jvmargs,[$JAVA])
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  1621
    if test "x$HOST_OS" = "xmacosx"; then
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  1622
        # Why does macosx need more heap? Its the huge JDK batch.
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  1623
        ADD_JVM_ARG_IF_OK([-Xmx1600M],boot_jdk_jvmargs,[$JAVA])
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  1624
    else
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  1625
        ADD_JVM_ARG_IF_OK([-Xmx1100M],boot_jdk_jvmargs,[$JAVA])
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  1626
    fi
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  1627
    # When is adding -client something that speeds up the JVM?
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  1628
    # ADD_JVM_ARG_IF_OK([-client],boot_jdk_jvmargs,[$JAVA])
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  1629
    ADD_JVM_ARG_IF_OK([-XX:PermSize=32m],boot_jdk_jvmargs,[$JAVA])
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  1630
    ADD_JVM_ARG_IF_OK([-XX:MaxPermSize=160m],boot_jdk_jvmargs,[$JAVA])
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  1631
    ADD_JVM_ARG_IF_OK([-XX:ThreadStackSize=$STACK_SIZE],boot_jdk_jvmargs,[$JAVA])
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  1632
    # Disable special log output when a debug build is used as Boot JDK...
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  1633
    ADD_JVM_ARG_IF_OK([-XX:-PrintVMOptions -XX:-UnlockDiagnosticVMOptions -XX:-LogVMOutput],boot_jdk_jvmargs,[$JAVA])
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  1634
fi
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  1635
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  1636
AC_SUBST(BOOT_JDK_JVMARGS, $boot_jdk_jvmargs)
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  1637
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  1638
AC_ARG_WITH(server-java, [AS_HELP_STRING([--with-server-java],
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  1639
	[use this java binary for running the javac background server and other long running java tasks in the build process,
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  1640
     e.g. ---with-server-java="/opt/jrockit/bin/java -server"])])
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  1641
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  1642
if test "x$with_server_java" != x; then
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  1643
    SERVER_JAVA="$with_server_java"
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  1644
    FOUND_VERSION=`$SERVER_JAVA -version 2>&1 | grep " version \""`
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  1645
    if test "x$FOUND_VERSION" = x; then
12801
948f8ad66ee7 7170079: Adjustments to build-infra makefiles
erikj
parents: 12475
diff changeset
  1646
        AC_MSG_ERROR([Could not execute server java: $SERVER_JAVA])
12258
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  1647
    fi
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  1648
else
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  1649
    SERVER_JAVA=""
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  1650
    # Hotspot specific options.
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  1651
    ADD_JVM_ARG_IF_OK([-XX:+UseParallelOldGC],SERVER_JAVA,[$JAVA])
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  1652
    ADD_JVM_ARG_IF_OK([-verbosegc],SERVER_JAVA,[$JAVA])
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  1653
    # JRockit specific options.
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  1654
    ADD_JVM_ARG_IF_OK([-Xverbose:gc],SERVER_JAVA,[$JAVA])
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  1655
    SERVER_JAVA="$JAVA $SERVER_JAVA"
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  1656
fi                    
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  1657
AC_SUBST(SERVER_JAVA)
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  1658
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  1659
AC_MSG_CHECKING([whether to use shared server for javac])
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  1660
AC_ARG_ENABLE([javac-server], [AS_HELP_STRING([--enable-javac-server],
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  1661
	[enable the shared javac server during the build process @<:@disabled@:>@])],
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  1662
	[ENABLE_JAVAC_SERVER="${enableval}"], [ENABLE_JAVAC_SERVER='no'])
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  1663
AC_MSG_RESULT([$ENABLE_JAVAC_SERVER])
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  1664
if test "x$ENABLE_JAVAC_SERVER" = xyes; then
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  1665
    JAVAC_USE_REMOTE=true
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  1666
    JAVAC_SERVERS="$OUTPUT_ROOT/javacservers"
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  1667
else
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  1668
    JAVAC_USE_REMOTE=false
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  1669
    JAVAC_SERVERS=
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  1670
fi
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  1671
AC_SUBST(JAVAC_USE_REMOTE)
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  1672
AC_SUBST(JAVAC_SERVERS)
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  1673
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  1674
AC_ARG_WITH(javac-server-cores, [AS_HELP_STRING([--with-javac-server-cores],
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  1675
	[use at most this number of concurrent threads on the javac server @<:@probed@:>@])])
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  1676
if test "x$with_javac_server_cores" != x; then
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  1677
    JAVAC_SERVER_CORES="$with_javac_server_cores"
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  1678
else
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  1679
    if test "$NUM_CORES" -gt 16; then
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  1680
        # We set this arbitrary limit because we want to limit the heap
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  1681
        # size of the javac server.
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  1682
        # In the future we will make the javac compilers in the server
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  1683
        # share more and more state, thus enabling us to use more and
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  1684
        # more concurrent threads in the server.
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  1685
        JAVAC_SERVER_CORES="16"
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  1686
    else
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  1687
        JAVAC_SERVER_CORES="$NUM_CORES"
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  1688
    fi
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  1689
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  1690
    if test "$MEMORY_SIZE" -gt "17000"; then
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  1691
        MAX_HEAP_MEM=10000
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  1692
        ADD_JVM_ARG_IF_OK([-d64],SERVER_JAVA,[$SERVER_JAVA])
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  1693
        ADD_JVM_ARG_IF_OK([-Xms10G -Xmx10G],SERVER_JAVA,[$SERVER_JAVA])
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  1694
        ADD_JVM_ARG_IF_OK([-Xmn2G],SERVER_JAVA,[$SERVER_JAVA])
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  1695
    elif test "$MEMORY_SIZE" -gt "10000"; then
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  1696
        MAX_HEAP_MEM=6000
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  1697
        ADD_JVM_ARG_IF_OK([-d64],SERVER_JAVA,[$SERVER_JAVA])
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  1698
        ADD_JVM_ARG_IF_OK([-Xms6G -Xmx6G],SERVER_JAVA,[$SERVER_JAVA])
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  1699
        ADD_JVM_ARG_IF_OK([-Xmn1G],SERVER_JAVA,[$SERVER_JAVA])
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  1700
    elif test "$MEMORY_SIZE" -gt "5000"; then
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  1701
        MAX_HEAP_MEM=3000
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  1702
        ADD_JVM_ARG_IF_OK([-d64],SERVER_JAVA,[$SERVER_JAVA])
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  1703
        ADD_JVM_ARG_IF_OK([-Xms1G -Xmx3G],SERVER_JAVA,[$SERVER_JAVA])
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  1704
        ADD_JVM_ARG_IF_OK([-Xmn256M],SERVER_JAVA,[$SERVER_JAVA])
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  1705
    elif test "$MEMORY_SIZE" -gt "3800"; then
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  1706
        MAX_HEAP_MEM=2500
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  1707
        ADD_JVM_ARG_IF_OK([-Xms1G -Xmx2500M],SERVER_JAVA,[$SERVER_JAVA])
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  1708
        ADD_JVM_ARG_IF_OK([-Xmn256M],SERVER_JAVA,[$SERVER_JAVA])
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  1709
    elif test "$MEMORY_SIZE" -gt "1900"; then
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  1710
        MAX_HEAP_MEM=1200
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  1711
        ADD_JVM_ARG_IF_OK([-Xms700M -Xmx1200M],SERVER_JAVA,[$SERVER_JAVA])
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  1712
        ADD_JVM_ARG_IF_OK([-Xmn256M],SERVER_JAVA,[$SERVER_JAVA])
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  1713
    elif test "$MEMORY_SIZE" -gt "1000"; then
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  1714
        MAX_HEAP_MEM=900
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  1715
        ADD_JVM_ARG_IF_OK([-Xms400M -Xmx900M],SERVER_JAVA,[$SERVER_JAVA])
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  1716
        ADD_JVM_ARG_IF_OK([-Xmn128M],SERVER_JAVA,[$SERVER_JAVA])
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  1717
    else
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  1718
        MAX_HEAP_MEM=512
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  1719
        ADD_JVM_ARG_IF_OK([-Xms256M -Xmx512M],SERVER_JAVA,[$SERVER_JAVA])
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  1720
        ADD_JVM_ARG_IF_OK([-Xmn128M],SERVER_JAVA,[$SERVER_JAVA])
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  1721
    fi
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  1722
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  1723
    MAX_COMPILERS_IN_HEAP=`expr $MAX_HEAP_MEM / 501`
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  1724
    if test "$JAVAC_SERVER_CORES" -gt "$MAX_COMPILERS_IN_HEAP"; then
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  1725
        AC_MSG_CHECKING([if number of server cores must be reduced])
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  1726
        JAVAC_SERVER_CORES="$MAX_COMPILERS_IN_HEAP"
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  1727
        AC_MSG_RESULT([yes, to $JAVAC_SERVER_CORES with max heap size $MAX_HEAP_MEM MB])
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  1728
    fi
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  1729
fi                    
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  1730
AC_SUBST(JAVAC_SERVER_CORES)
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  1731
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  1732
AC_MSG_CHECKING([whether to track dependencies between Java packages])
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  1733
AC_ARG_ENABLE([javac-deps], [AS_HELP_STRING([--enable-javac-deps],
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  1734
	[enable the dependency tracking between Java packages @<:@disabled@:>@])],
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  1735
	[ENABLE_JAVAC_DEPS="${enableval}"], [ENABLE_JAVAC_DEPS='no'])
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  1736
AC_MSG_RESULT([$ENABLE_JAVAC_DEPS])
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  1737
if test "x$ENABLE_JAVAC_DEPS" = xyes; then
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  1738
    JAVAC_USE_DEPS=true
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  1739
else
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  1740
    JAVAC_USE_DEPS=false
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  1741
fi
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  1742
AC_SUBST(JAVAC_USE_DEPS)
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  1743
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  1744
AC_MSG_CHECKING([whether to use multiple cores for javac compilation])
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  1745
AC_ARG_ENABLE([javac-multi-core], [AS_HELP_STRING([--enable-javac-multi-core],
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  1746
	[compile Java packages concurrently @<:@disabled@:>@])],
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  1747
	[ENABLE_JAVAC_MULTICORE="${enableval}"], [ENABLE_JAVAC_MULTICORE='no'])
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  1748
AC_MSG_RESULT([$ENABLE_JAVAC_MULTICORE])
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  1749
if test "x$ENABLE_JAVAC_MULTICORE" = xyes; then
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  1750
    JAVAC_USE_MODE=MULTI_CORE_CONCURRENT
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  1751
else
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  1752
    JAVAC_USE_MODE=SINGLE_THREADED_BATCH
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  1753
    if test "x$ENABLE_JAVAC_DEPS" = xyes; then
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  1754
        AC_MSG_WARN([Dependency tracking is not supported with single threaded batch compiles of Java source roots. Please add --disable-javac-deps to your configure options.])
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  1755
        AC_MSG_WARN([Disabling dependency tracking for you now.])
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  1756
        JAVAC_USE_DEPS=false
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  1757
    fi
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  1758
    if test "x$ENABLE_JAVAC_SERVER" = xyes; then
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  1759
        AC_MSG_WARN([The javac server will not be used since single threaded batch compiles are run within their own JVM. Please add --disable-javac-server to your configure options.])
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  1760
        AC_MSG_WARN([Disabling javac server for you now.])
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  1761
        JAVAC_USE_REMOTE=false
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  1762
    fi
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  1763
fi
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  1764
AC_SUBST(JAVAC_USE_MODE)
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  1765
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  1766
###############################################################################
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  1767
#
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  1768
# OS specific settings that we never will need to probe.
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  1769
#
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  1770
if test "x$HOST_OS" = xlinux; then
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  1771
    AC_MSG_CHECKING([what is not needed on Linux?])
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  1772
    PULSE_NOT_NEEDED=yes
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  1773
    AC_MSG_RESULT([pulse])
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  1774
fi
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  1775
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  1776
if test "x$HOST_OS" = xsolaris; then
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  1777
    AC_MSG_CHECKING([what is not needed on Solaris?])
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  1778
    ALSA_NOT_NEEDED=yes
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  1779
    PULSE_NOT_NEEDED=yes
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  1780
    AC_MSG_RESULT([alsa pulse])
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  1781
fi
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  1782
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  1783
if test "x$HOST_OS" = xwindows; then
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  1784
    AC_MSG_CHECKING([what is not needed on Windows?])
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  1785
    CUPS_NOT_NEEDED=yes    
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  1786
    ALSA_NOT_NEEDED=yes
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  1787
    PULSE_NOT_NEEDED=yes
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  1788
    X11_NOT_NEEDED=yes
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  1789
    AC_MSG_RESULT([alsa cups pulse x11])
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  1790
fi
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  1791
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  1792
if test "x$HOST_OS" = xmacosx; then
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  1793
    AC_MSG_CHECKING([what is not needed on MacOSX?])
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  1794
    ALSA_NOT_NEEDED=yes
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  1795
    PULSE_NOT_NEEDED=yes
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  1796
    X11_NOT_NEEDED=yes
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  1797
    FREETYPE2_NOT_NEEDED=yes    
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  1798
    # If the java runtime framework is disabled, then we need X11.
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  1799
    # This will be adjusted below.
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  1800
    AC_MSG_RESULT([alsa pulse x11])
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  1801
fi
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  1802
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  1803
if test "x$HOST_OS" = xbsd; then
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  1804
    AC_MSG_CHECKING([what is not needed on bsd?])
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  1805
    ALSA_NOT_NEEDED=yes
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  1806
    AC_MSG_RESULT([alsa])    
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  1807
fi
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  1808
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  1809
###############################################################################
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  1810
#
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  1811
# Check for MacOSX support for OpenJDK. If this exists, try to build a JVM
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  1812
# that uses this API. 
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  1813
#
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  1814
AC_ARG_ENABLE([macosx-runtime-support], [AS_HELP_STRING([--disable-macosx-runtime-support],
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  1815
	[disable the use of MacOSX Java runtime support framework @<:@enabled@:>@])],
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  1816
	[MACOSX_RUNTIME_SUPPORT="${enableval}"],[MACOSX_RUNTIME_SUPPORT="no"])
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  1817
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  1818
USE_MACOSX_RUNTIME_SUPPORT=no
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  1819
AC_MSG_CHECKING([for explicit Java runtime support in the OS])
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  1820
if test -f /System/Library/Frameworks/JavaVM.framework/Frameworks/JavaRuntimeSupport.framework/Headers/JavaRuntimeSupport.h; then
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  1821
    if test "x$MACOSX_RUNTIME_SUPPORT" != xno; then
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  1822
        MACOSX_RUNTIME_SUPPORT=yes
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  1823
        USE_MACOSX_RUNTIME_SUPPORT=yes
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  1824
        AC_MSG_RESULT([yes, does not need alsa freetype2 pulse and X11])
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  1825
    else
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  1826
        AC_MSG_RESULT([yes, but explicitly disabled.])
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  1827
    fi
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  1828
else
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  1829
    AC_MSG_RESULT([no])
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  1830
fi
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  1831
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  1832
if test "x$HOST_OS" = xmacosx && test "x$USE_MACOSX_RUNTIME_SUPPORT" = xno; then
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  1833
    AC_MSG_CHECKING([what is not needed on an X11 build on MacOSX?])
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  1834
    X11_NOT_NEEDED=
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  1835
    FREETYPE2_NOT_NEEDED=
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  1836
    AC_MSG_RESULT([alsa pulse])
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  1837
fi
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  1838
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  1839
###############################################################################
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  1840
#
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  1841
# Check for X Windows
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  1842
#
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  1843
AC_PATH_XTRA
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  1844
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  1845
if test "x$no_x" = xyes && test "x$X11_NOT_NEEDED" != xyes; then 
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  1846
    help_on_build_dependency x11
12801
948f8ad66ee7 7170079: Adjustments to build-infra makefiles
erikj
parents: 12475
diff changeset
  1847
    AC_MSG_ERROR([Could not find X11 libraries. $HELP_MSG])
12258
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  1848
fi
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  1849
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  1850
# Some of the old makefiles require a setting of OPENWIN_HOME
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  1851
# Since the X11R6 directory has disappeared on later Linuxes,
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  1852
# we need to probe for it.
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  1853
if test "x$HOST_OS" = xlinux; then
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  1854
    if test -d "$SYS_ROOT/usr/X11R6"; then
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  1855
        OPENWIN_HOME="$SYS_ROOT/usr/X11R6"
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  1856
    fi
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  1857
    if test -d "$SYS_ROOT/usr/include/X11"; then
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  1858
        OPENWIN_HOME="$SYS_ROOT/usr"
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  1859
    fi
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  1860
fi
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  1861
if test "x$HOST_OS" = xsolaris; then
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  1862
    OPENWIN_HOME="/usr/openwin"
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  1863
fi
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  1864
AC_SUBST(OPENWIN_HOME)
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  1865
12801
948f8ad66ee7 7170079: Adjustments to build-infra makefiles
erikj
parents: 12475
diff changeset
  1866
948f8ad66ee7 7170079: Adjustments to build-infra makefiles
erikj
parents: 12475
diff changeset
  1867
#
948f8ad66ee7 7170079: Adjustments to build-infra makefiles
erikj
parents: 12475
diff changeset
  1868
# Weird Sol10 something check...TODO change to try compile
948f8ad66ee7 7170079: Adjustments to build-infra makefiles
erikj
parents: 12475
diff changeset
  1869
#
948f8ad66ee7 7170079: Adjustments to build-infra makefiles
erikj
parents: 12475
diff changeset
  1870
if test "x${HOST_OS}" = xsolaris; then
948f8ad66ee7 7170079: Adjustments to build-infra makefiles
erikj
parents: 12475
diff changeset
  1871
  if test "`uname -r`" = "5.10"; then
948f8ad66ee7 7170079: Adjustments to build-infra makefiles
erikj
parents: 12475
diff changeset
  1872
     if test "`${EGREP} -c XLinearGradient ${OPENWIN_HOME}/share/include/X11/extensions/Xrender.h`" = "0"; then
948f8ad66ee7 7170079: Adjustments to build-infra makefiles
erikj
parents: 12475
diff changeset
  1873
     	X_CFLAGS="${X_CFLAGS} -DSOLARIS10_NO_XRENDER_STRUCTS"
948f8ad66ee7 7170079: Adjustments to build-infra makefiles
erikj
parents: 12475
diff changeset
  1874
     fi
948f8ad66ee7 7170079: Adjustments to build-infra makefiles
erikj
parents: 12475
diff changeset
  1875
  fi
948f8ad66ee7 7170079: Adjustments to build-infra makefiles
erikj
parents: 12475
diff changeset
  1876
fi
948f8ad66ee7 7170079: Adjustments to build-infra makefiles
erikj
parents: 12475
diff changeset
  1877
12258
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  1878
AC_LANG_PUSH(C)
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  1879
OLD_CFLAGS="$CFLAGS"
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  1880
CFLAGS="$CFLAGS $X_CFLAGS"
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  1881
AC_CHECK_HEADERS([X11/extensions/shape.h X11/extensions/Xrender.h X11/extensions/XTest.h],
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  1882
                [X11_A_OK=yes],
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  1883
                [X11_A_OK=no])
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  1884
CFLAGS="$OLD_CFLAGS"
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  1885
AC_LANG_POP(C)
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  1886
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  1887
if test "x$X11_A_OK" = xno && test "x$X11_NOT_NEEDED" != xyes; then 
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  1888
    help_on_build_dependency x11
12801
948f8ad66ee7 7170079: Adjustments to build-infra makefiles
erikj
parents: 12475
diff changeset
  1889
    AC_MSG_ERROR([Could not find all X11 headers (shape.h Xrender.h XTest.h). $HELP_MSG])
12258
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  1890
fi
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  1891
12801
948f8ad66ee7 7170079: Adjustments to build-infra makefiles
erikj
parents: 12475
diff changeset
  1892
AC_SUBST(X_CFLAGS)
948f8ad66ee7 7170079: Adjustments to build-infra makefiles
erikj
parents: 12475
diff changeset
  1893
AC_SUBST(X_LIBS)
948f8ad66ee7 7170079: Adjustments to build-infra makefiles
erikj
parents: 12475
diff changeset
  1894
12258
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  1895
###############################################################################
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  1896
#
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  1897
# The common unix printing system cups is used to print from java.
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  1898
#
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  1899
AC_ARG_WITH(cups, [AS_HELP_STRING([--with-cups],
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  1900
    [specify prefix directory for the cups package
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  1901
	 (expecting the libraries under PATH/lib and the headers under PATH/include)])])
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  1902
AC_ARG_WITH(cups-include, [AS_HELP_STRING([--with-cups-include],
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  1903
	[specify directory for the cups include files])])
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  1904
AC_ARG_WITH(cups-lib, [AS_HELP_STRING([--with-cups-lib],
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  1905
	[specify directory for the cups library])])
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  1906
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  1907
if test "x$CUPS_NOT_NEEDED" = xyes; then
12801
948f8ad66ee7 7170079: Adjustments to build-infra makefiles
erikj
parents: 12475
diff changeset
  1908
	if test "x${with_cups}" != x || test "x${with_cups_include}" != x || test "x${with_cups_lib}" != x; then
12258
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  1909
		AC_MSG_WARN([cups not used, so --with-cups is ignored])
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  1910
	fi
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  1911
	CUPS_CFLAGS=
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  1912
	CUPS_LIBS=
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  1913
else
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  1914
	CUPS_FOUND=no
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  1915
12801
948f8ad66ee7 7170079: Adjustments to build-infra makefiles
erikj
parents: 12475
diff changeset
  1916
	if test "x${with_cups}" = xno || test "x${with_cups_include}" = xno || test "x${with_cups_lib}" = xno; then
948f8ad66ee7 7170079: Adjustments to build-infra makefiles
erikj
parents: 12475
diff changeset
  1917
	    AC_MSG_ERROR([It is not possible to disable the use of cups. Remove the --without-cups option.])
12258
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  1918
	fi
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  1919
12801
948f8ad66ee7 7170079: Adjustments to build-infra makefiles
erikj
parents: 12475
diff changeset
  1920
	if test "x${with_cups}" != x; then
948f8ad66ee7 7170079: Adjustments to build-infra makefiles
erikj
parents: 12475
diff changeset
  1921
	    CUPS_LIBS="-L${with_cups}/lib -lcups"
948f8ad66ee7 7170079: Adjustments to build-infra makefiles
erikj
parents: 12475
diff changeset
  1922
	    CUPS_CFLAGS="-I${with_cups}/include"
12258
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  1923
	    CUPS_FOUND=yes
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  1924
	fi
12801
948f8ad66ee7 7170079: Adjustments to build-infra makefiles
erikj
parents: 12475
diff changeset
  1925
	if test "x${with_cups_include}" != x; then
948f8ad66ee7 7170079: Adjustments to build-infra makefiles
erikj
parents: 12475
diff changeset
  1926
	    CUPS_CFLAGS="-I${with_cups_include}"
12258
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  1927
	    CUPS_FOUND=yes
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  1928
	fi
12801
948f8ad66ee7 7170079: Adjustments to build-infra makefiles
erikj
parents: 12475
diff changeset
  1929
	if test "x${with_cups_lib}" != x; then
948f8ad66ee7 7170079: Adjustments to build-infra makefiles
erikj
parents: 12475
diff changeset
  1930
	    CUPS_LIBS="-L${with_cups_lib} -lcups"
12258
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  1931
	    CUPS_FOUND=yes
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  1932
	fi
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  1933
	if test "x$CUPS_FOUND" = xno; then
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  1934
	    BDEPS_CHECK_MODULE(CUPS, cups, xxx, [CUPS_FOUND=yes])
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  1935
	fi
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  1936
	if test "x$CUPS_FOUND" = xno; then
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  1937
	    # Are the cups headers installed in the default /usr/include location?
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  1938
	    AC_CHECK_HEADERS([cups/cups.h cups/ppd.h],
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  1939
	                     [CUPS_FOUND=yes
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  1940
	                      CUPS_CFLAGS=
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  1941
	                      CUPS_LIBS="-lcups"
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  1942
	                      DEFAULT_CUPS=yes])
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  1943
	fi
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  1944
	if test "x$CUPS_FOUND" = xno; then
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  1945
	    # Getting nervous now? Lets poke around for standard Solaris third-party
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  1946
	    # package installation locations.
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  1947
	    AC_MSG_CHECKING([for cups headers and libs])
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  1948
	    if test -s /opt/sfw/cups/include/cups/cups.h; then
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  1949
	       # An SFW package seems to be installed!
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  1950
	       CUPS_FOUND=yes
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  1951
	       CUPS_CFLAGS="-I/opt/sfw/cups/include"
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  1952
	       CUPS_LIBS="-L/opt/sfw/cups/lib -lcups"
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  1953
	    elif test -s /opt/csw/include/cups/cups.h; then
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  1954
	       # A CSW package seems to be installed!
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  1955
	       CUPS_FOUND=yes
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  1956
	       CUPS_CFLAGS="-I/opt/csw/include"
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  1957
	       CUPS_LIBS="-L/opt/csw/lib -lcups"
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  1958
	    fi
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  1959
	    AC_MSG_RESULT([$CUPS_FOUND])
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  1960
	fi
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  1961
	if test "x$CUPS_FOUND" = xno; then 
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  1962
	    help_on_build_dependency cups
12801
948f8ad66ee7 7170079: Adjustments to build-infra makefiles
erikj
parents: 12475
diff changeset
  1963
	    AC_MSG_ERROR([Could not find cups! $HELP_MSG ])
12258
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  1964
	fi
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  1965
fi
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  1966
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  1967
AC_SUBST(CUPS_CFLAGS)
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  1968
AC_SUBST(CUPS_LIBS)
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  1969
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  1970
###############################################################################
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  1971
#
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  1972
# The ubiquitous freetype2 library is used to render fonts.
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  1973
#
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  1974
AC_ARG_WITH(freetype, [AS_HELP_STRING([--with-freetype],
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  1975
	[specify prefix directory for the freetype2 package
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  1976
     (expecting the libraries under PATH/lib and the headers under PATH/include)])])
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  1977
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  1978
# If we are using the OS installed system lib for freetype, then we do not need to copy it to the build tree
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  1979
USING_SYSTEM_FT_LIB=false
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  1980
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  1981
if test "x$FREETYPE2_NOT_NEEDED" = xyes; then
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  1982
	if test "x$with_freetype" != x || test "x$with_freetype_include" != x || test "x$with_freetype_lib" != x; then
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  1983
		AC_MSG_WARN([freetype not used, so --with-freetype is ignored])
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  1984
	fi
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  1985
	FREETYPE2_CFLAGS=
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  1986
	FREETYPE2_LIBS=
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  1987
        FREETYPE2_LIB_PATH=
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  1988
else
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  1989
	FREETYPE2_FOUND=no
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  1990
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  1991
	if test "x$with_freetype" != x; then
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  1992
            SPACESAFE(with_freetype,[the path to freetype])
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  1993
	    FREETYPE2_LIBS="-L$with_freetype/lib -lfreetype"
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  1994
            if test "x$HOST_OS" = xwindows; then
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  1995
                FREETYPE2_LIBS="$with_freetype/lib/freetype.lib"
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  1996
            fi
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  1997
            FREETYPE2_LIB_PATH="$with_freetype/lib"
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  1998
	    FREETYPE2_CFLAGS="-I$with_freetype/include"
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  1999
            if test -s $with_freetype/include/ft2build.h && test -d $with_freetype/include/freetype2/freetype; then
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  2000
                FREETYPE2_CFLAGS="-I$with_freetype/include/freetype2 -I$with_freetype/include"
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  2001
            fi
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  2002
	    FREETYPE2_FOUND=yes
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  2003
   	    if test "x$FREETYPE2_FOUND" = xyes; then
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  2004
	        # Verify that the directories exist 
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  2005
                if ! test -d "$with_freetype/lib" || ! test -d "$with_freetype/include"; then
12801
948f8ad66ee7 7170079: Adjustments to build-infra makefiles
erikj
parents: 12475
diff changeset
  2006
		   AC_MSG_ERROR([Could not find the expected directories $with_freetype/lib and $with_freetype/include])
12258
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  2007
		fi
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  2008
	        # List the contents of the lib.
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  2009
		FREETYPELIB=`ls $with_freetype/lib/libfreetype.so $with_freetype/lib/freetype.dll 2> /dev/null`
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  2010
                if test "x$FREETYPELIB" = x; then
12801
948f8ad66ee7 7170079: Adjustments to build-infra makefiles
erikj
parents: 12475
diff changeset
  2011
		   AC_MSG_ERROR([Could not find libfreetype.se nor freetype.dll in $with_freetype/lib])
12258
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  2012
		fi
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  2013
	        # Check one h-file
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  2014
                if ! test -s "$with_freetype/include/ft2build.h"; then
12801
948f8ad66ee7 7170079: Adjustments to build-infra makefiles
erikj
parents: 12475
diff changeset
  2015
		   AC_MSG_ERROR([Could not find $with_freetype/include/ft2build.h])
12258
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  2016
		fi
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  2017
            fi
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  2018
        fi
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  2019
	if test "x$FREETYPE2_FOUND" = xno; then
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  2020
	    BDEPS_CHECK_MODULE(FREETYPE2, freetype2, xxx, [FREETYPE2_FOUND=yes], [FREETYPE2_FOUND=no])
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  2021
            USING_SYSTEM_FT_LIB=true
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  2022
	fi
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  2023
	if test "x$FREETYPE2_FOUND" = xno; then
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  2024
	    PKG_CHECK_MODULES(FREETYPE2, freetype2, [FREETYPE2_FOUND=yes], [FREETYPE2_FOUND=no])
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  2025
            USING_SYSTEM_FT_LIB=true
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  2026
	fi
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  2027
	if test "x$FREETYPE2_FOUND" = xno; then
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  2028
	    AC_MSG_CHECKING([for freetype in some standard locations])
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  2029
	
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  2030
	    if test -s /usr/X11/include/ft2build.h && test -d /usr/X11/include/freetype2/freetype; then
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  2031
	        DEFAULT_FREETYPE_CFLAGS="-I/usr/X11/include/freetype2 -I/usr/X11/include"
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  2032
	        DEFAULT_FREETYPE_LIBS="-L/usr/X11/lib -lfreetype"
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  2033
	    fi
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  2034
	    if test -s /usr/include/ft2build.h && test -d /usr/include/freetype2/freetype; then
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  2035
	        DEFAULT_FREETYPE_CFLAGS="-I/usr/include/freetype2"
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  2036
	        DEFAULT_FREETYPE_LIBS="-lfreetype"
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  2037
	    fi
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  2038
	
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  2039
	    PREV_CXXCFLAGS="$CXXFLAGS"
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  2040
	    PREV_LDFLAGS="$LDFLAGS"
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  2041
	    CXXFLAGS="$CXXFLAGS $DEFAULT_FREETYPE_CFLAGS"
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  2042
	    LDFLAGS="$LDFLAGS $DEFAULT_FREETYPE_LIBS"
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  2043
	    AC_LINK_IFELSE([AC_LANG_SOURCE([[#include<ft2build.h>
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  2044
	                    #include FT_FREETYPE_H 
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  2045
	                   int main() { return 0; }
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  2046
	                  ]])],
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  2047
	                  [
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  2048
	                      # Yes, the default cflags and libs did the trick.
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  2049
	                      FREETYPE2_FOUND=yes
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  2050
	                      FREETYPE2_CFLAGS="$DEFAULT_FREETYPE_CFLAGS"
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  2051
	                      FREETYPE2_LIBS="$DEFAULT_FREETYPE_LIBS"
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  2052
	                  ],
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  2053
	                  [
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  2054
	                      FREETYPE2_FOUND=no
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  2055
	                  ])
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  2056
            CXXCFLAGS="$PREV_CXXFLAGS"
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  2057
	    LDFLAGS="$PREV_LDFLAGS"
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  2058
	    AC_MSG_RESULT([$FREETYPE2_FOUND])
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  2059
            USING_SYSTEM_FT_LIB=true
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  2060
	fi
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  2061
	if test "x$FREETYPE2_FOUND" = xno; then
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  2062
		help_on_build_dependency freetype2
12801
948f8ad66ee7 7170079: Adjustments to build-infra makefiles
erikj
parents: 12475
diff changeset
  2063
		AC_MSG_ERROR([Could not find freetype2! $HELP_MSG ])
12258
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  2064
	fi    
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  2065
fi
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  2066
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  2067
AC_SUBST(USING_SYSTEM_FT_LIB)
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  2068
AC_SUBST(FREETYPE2_LIB_PATH)
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  2069
AC_SUBST(FREETYPE2_CFLAGS)
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  2070
AC_SUBST(FREETYPE2_LIBS)
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  2071
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  2072
###############################################################################
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  2073
#
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  2074
# Check for alsa headers and libraries. Used on Linux/GNU systems.
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  2075
#
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  2076
AC_ARG_WITH(alsa, [AS_HELP_STRING([--with-alsa],
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  2077
	[specify prefix directory for the alsa package
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  2078
	 (expecting the libraries under PATH/lib and the headers under PATH/include)])])
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  2079
AC_ARG_WITH(alsa-include, [AS_HELP_STRING([--with-alsa-include],
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  2080
	[specify directory for the alsa include files])])
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  2081
AC_ARG_WITH(alsa-lib, [AS_HELP_STRING([--with-alsa-lib],
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  2082
	[specify directory for the alsa library])])
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  2083
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  2084
if test "x$ALSA_NOT_NEEDED" = xyes; then
12801
948f8ad66ee7 7170079: Adjustments to build-infra makefiles
erikj
parents: 12475
diff changeset
  2085
	if test "x${with_alsa}" != x || test "x${with_alsa_include}" != x || test "x${with_alsa_lib}" != x; then
12258
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  2086
		AC_MSG_WARN([alsa not used, so --with-alsa is ignored])
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  2087
	fi
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  2088
	ALSA_CFLAGS=
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  2089
	ALSA_LIBS=
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  2090
else
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  2091
	ALSA_FOUND=no
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  2092
12801
948f8ad66ee7 7170079: Adjustments to build-infra makefiles
erikj
parents: 12475
diff changeset
  2093
	if test "x${with_alsa}" = xno || test "x${with_alsa_include}" = xno || test "x${with_alsa_lib}" = xno; then
948f8ad66ee7 7170079: Adjustments to build-infra makefiles
erikj
parents: 12475
diff changeset
  2094
	    AC_MSG_ERROR([It is not possible to disable the use of alsa. Remove the --without-alsa option.])
12258
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  2095
	fi
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  2096
12801
948f8ad66ee7 7170079: Adjustments to build-infra makefiles
erikj
parents: 12475
diff changeset
  2097
	if test "x${with_alsa}" != x; then
948f8ad66ee7 7170079: Adjustments to build-infra makefiles
erikj
parents: 12475
diff changeset
  2098
	    ALSA_LIBS="-L${with_alsa}/lib -lalsa"
948f8ad66ee7 7170079: Adjustments to build-infra makefiles
erikj
parents: 12475
diff changeset
  2099
	    ALSA_CFLAGS="-I${with_alsa}/include"
12258
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  2100
	    ALSA_FOUND=yes
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  2101
	fi
12801
948f8ad66ee7 7170079: Adjustments to build-infra makefiles
erikj
parents: 12475
diff changeset
  2102
	if test "x${with_alsa_include}" != x; then
948f8ad66ee7 7170079: Adjustments to build-infra makefiles
erikj
parents: 12475
diff changeset
  2103
	    ALSA_CFLAGS="-I${with_alsa_include}"
12258
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  2104
	    ALSA_FOUND=yes
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  2105
	fi
12801
948f8ad66ee7 7170079: Adjustments to build-infra makefiles
erikj
parents: 12475
diff changeset
  2106
	if test "x${with_alsa_lib}" != x; then
948f8ad66ee7 7170079: Adjustments to build-infra makefiles
erikj
parents: 12475
diff changeset
  2107
	    ALSA_LIBS="-L${with_alsa_lib} -lalsa"
12258
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  2108
	    ALSA_FOUND=yes
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  2109
	fi
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  2110
	if test "x$ALSA_FOUND" = xno; then
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  2111
	    BDEPS_CHECK_MODULE(ALSA, alsa, xxx, [ALSA_FOUND=yes], [ALSA_FOUND=no])
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  2112
	fi
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  2113
	if test "x$ALSA_FOUND" = xno; then
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  2114
	    PKG_CHECK_MODULES(ALSA, alsa, [ALSA_FOUND=yes], [ALSA_FOUND=no])
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  2115
	fi
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  2116
	if test "x$ALSA_FOUND" = xno; then
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  2117
	    AC_CHECK_HEADERS([alsa/asoundlib.h],
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  2118
	                     [ALSA_FOUND=yes
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  2119
	                      ALSA_CFLAGS=-Iignoreme
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  2120
	                      ALSA_LIBS=-lasound
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  2121
	                      DEFAULT_ALSA=yes],
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  2122
	                     [ALSA_FOUND=no])
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  2123
	fi
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  2124
	if test "x$ALSA_FOUND" = xno; then 
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  2125
	    help_on_build_dependency alsa
12801
948f8ad66ee7 7170079: Adjustments to build-infra makefiles
erikj
parents: 12475
diff changeset
  2126
	    AC_MSG_ERROR([Could not find alsa! $HELP_MSG ])
12258
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  2127
	fi    
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  2128
fi
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  2129
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  2130
AC_SUBST(ALSA_CFLAGS)
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  2131
AC_SUBST(ALSA_LIBS)
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  2132
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  2133
###############################################################################
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  2134
#
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  2135
# Check for pulse audio headers and libraries.
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  2136
#
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  2137
PULSE_FOUND=no
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  2138
AC_ARG_WITH(pulse, [AS_HELP_STRING([--with-pulse],
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  2139
	[specify prefix directory for the pulseaudio package
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  2140
	 (expecting the libraries under PATH/lib and the headers under PATH/include)])])
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  2141
AC_ARG_WITH(pulse-include, [AS_HELP_STRING([--with-pulse-include],
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  2142
	[specify directory for the pulseaudio include files])])
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  2143
AC_ARG_WITH(pulse-lib, [AS_HELP_STRING([--with-pulse-lib],
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  2144
	[specify directory for the pulseaudio library])])
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  2145
12801
948f8ad66ee7 7170079: Adjustments to build-infra makefiles
erikj
parents: 12475
diff changeset
  2146
if test "x${with_pulse}" != x; then
948f8ad66ee7 7170079: Adjustments to build-infra makefiles
erikj
parents: 12475
diff changeset
  2147
    PULSE_LIBS="-L${with_pulse}/lib -lfreetype"
948f8ad66ee7 7170079: Adjustments to build-infra makefiles
erikj
parents: 12475
diff changeset
  2148
    PULSE_CFLAGS="-I${with_pulse}/include"
12258
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  2149
    PULSE_FOUND=yes
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  2150
fi
12801
948f8ad66ee7 7170079: Adjustments to build-infra makefiles
erikj
parents: 12475
diff changeset
  2151
if test "x${with_pulse_include}" != x; then
948f8ad66ee7 7170079: Adjustments to build-infra makefiles
erikj
parents: 12475
diff changeset
  2152
    PULSE_CFLAGS="-I${with_pulse_include}"
12258
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  2153
    PULSE_FOUND=yes
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  2154
fi
12801
948f8ad66ee7 7170079: Adjustments to build-infra makefiles
erikj
parents: 12475
diff changeset
  2155
if test "x${with_pulse_lib}" != x; then
948f8ad66ee7 7170079: Adjustments to build-infra makefiles
erikj
parents: 12475
diff changeset
  2156
    PULSE_LIBS="-L${with_pulse_lib} -lpulse"
12258
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  2157
    PULSE_FOUND=yes
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  2158
fi
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  2159
if test "x$PULSE_FOUND" = xno; then
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  2160
    BDEPS_CHECK_MODULE(PULSE, pulse, xxx, [PULSE_FOUND=yes], [PULSE_FOUND=no])
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  2161
fi
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  2162
if test "x$PULSE_FOUND" = xno; then
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  2163
    PKG_CHECK_MODULES(LIBPULSE,[libpulse >= 0.9.11],[PULSE_FOUND=yes],[PULSE_FOUND=no])
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  2164
fi
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  2165
if test "x$PULSE_FOUND" = xno; then
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  2166
    AC_CHECK_HEADERS([pulse/pulseaudio.h],
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  2167
                     [PULSE_FOUND=yes
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  2168
                      PULSE_CFLAGS=-Iignoreme
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  2169
                      PULSE_LIBS=
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  2170
                      DEFAULT_PULSE=yes],
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  2171
                     [PULSE_FOUND=no])
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  2172
fi
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  2173
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  2174
if test "x$PULSE_FOUND" = xno && test "x$PULSE_NOT_NEEDED" != xyes; then 
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  2175
    help_on_build_dependency pulse
12801
948f8ad66ee7 7170079: Adjustments to build-infra makefiles
erikj
parents: 12475
diff changeset
  2176
    AC_MSG_ERROR([Could not find pulse audio libraries. $HELP_MSG ])
12258
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  2177
fi    
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  2178
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  2179
AC_SUBST(PULSE_CFLAGS)
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  2180
AC_SUBST(PULSE_LIBS)
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  2181
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  2182
###############################################################################
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  2183
#
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  2184
# Check for the jpeg library
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  2185
#
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  2186
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  2187
USE_EXTERNAL_LIBJPEG=true
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  2188
AC_CHECK_LIB(jpeg, main, [],
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  2189
             [ USE_EXTERNAL_LIBJPEG=false
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  2190
               AC_MSG_NOTICE([Will use jpeg decoder bundled with the OpenJDK source])
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  2191
             ])
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  2192
AC_SUBST(USE_EXTERNAL_LIBJPEG)
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  2193
        
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  2194
###############################################################################
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  2195
#
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  2196
# Check for the gif library
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  2197
#
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  2198
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  2199
USE_EXTERNAL_LIBJPEG=true
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  2200
AC_CHECK_LIB(gif, main, [],
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  2201
             [ USE_EXTERNAL_LIBGIF=false
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  2202
               AC_MSG_NOTICE([Will use gif decoder bundled with the OpenJDK source])
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  2203
             ])
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  2204
AC_SUBST(USE_EXTERNAL_LIBGIF)
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  2205
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  2206
###############################################################################
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  2207
#
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  2208
# Check for the zlib library
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  2209
#
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  2210
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  2211
USE_EXTERNAL_LIBZ=true
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  2212
AC_CHECK_LIB(z, main, [],
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  2213
             [ USE_EXTERNAL_LIBZ=false
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  2214
               AC_MSG_NOTICE([Will use zlib bundled with the OpenJDK source])
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  2215
             ])
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  2216
AC_SUBST(USE_EXTERNAL_LIBZ)
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  2217
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  2218
###############################################################################
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  2219
#
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  2220
# Check if altzone exists in time.h
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  2221
#
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  2222
12801
948f8ad66ee7 7170079: Adjustments to build-infra makefiles
erikj
parents: 12475
diff changeset
  2223
AC_LINK_IFELSE([AC_LANG_PROGRAM([#include <time.h>], [return (int)altzone;])],
948f8ad66ee7 7170079: Adjustments to build-infra makefiles
erikj
parents: 12475
diff changeset
  2224
            [has_altzone=yes],
948f8ad66ee7 7170079: Adjustments to build-infra makefiles
erikj
parents: 12475
diff changeset
  2225
            [has_altzone=no])
12258
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  2226
if test "x$has_altzone" = xyes; then
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  2227
    AC_DEFINE([HAVE_ALTZONE], 1, [Define if you have the external 'altzone' variable in time.h])
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  2228
fi
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  2229
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  2230
###############################################################################
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  2231
#
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  2232
# Check the maths library
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  2233
#
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  2234
12801
948f8ad66ee7 7170079: Adjustments to build-infra makefiles
erikj
parents: 12475
diff changeset
  2235
AC_CHECK_LIB(m, cos, [],
12258
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  2236
             [ 
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  2237
                  AC_MSG_NOTICE([Maths library was not found])
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  2238
             ])
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  2239
AC_SUBST(LIBM)
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  2240
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  2241
###############################################################################
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  2242
#
12801
948f8ad66ee7 7170079: Adjustments to build-infra makefiles
erikj
parents: 12475
diff changeset
  2243
# Check for libdl.so
948f8ad66ee7 7170079: Adjustments to build-infra makefiles
erikj
parents: 12475
diff changeset
  2244
948f8ad66ee7 7170079: Adjustments to build-infra makefiles
erikj
parents: 12475
diff changeset
  2245
save_LIBS="$LIBS"
948f8ad66ee7 7170079: Adjustments to build-infra makefiles
erikj
parents: 12475
diff changeset
  2246
LIBS=""
948f8ad66ee7 7170079: Adjustments to build-infra makefiles
erikj
parents: 12475
diff changeset
  2247
AC_CHECK_LIB(dl,dlopen)
948f8ad66ee7 7170079: Adjustments to build-infra makefiles
erikj
parents: 12475
diff changeset
  2248
LIBDL="$LIBS"
948f8ad66ee7 7170079: Adjustments to build-infra makefiles
erikj
parents: 12475
diff changeset
  2249
AC_SUBST(LIBDL)
948f8ad66ee7 7170079: Adjustments to build-infra makefiles
erikj
parents: 12475
diff changeset
  2250
LIBS="$save_LIBS"
948f8ad66ee7 7170079: Adjustments to build-infra makefiles
erikj
parents: 12475
diff changeset
  2251
948f8ad66ee7 7170079: Adjustments to build-infra makefiles
erikj
parents: 12475
diff changeset
  2252
###############################################################################
948f8ad66ee7 7170079: Adjustments to build-infra makefiles
erikj
parents: 12475
diff changeset
  2253
#
12258
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  2254
# Should we run the painfully slow javadoc tool?
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  2255
#
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  2256
AC_MSG_CHECKING([whether to build documentation])
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  2257
AC_ARG_ENABLE([docs], [AS_HELP_STRING([--enable-docs],
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  2258
	[enable generation of Javadoc documentation @<:@disabled@:>@])],
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  2259
	[ENABLE_DOCS="${enableval}"], [ENABLE_DOCS='no'])
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  2260
AC_MSG_RESULT([$ENABLE_DOCS])
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  2261
AC_SUBST(ENABLE_DOCS)
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  2262
GENERATE_DOCS=false
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  2263
if test "x$ENABLE_DOCS" = xyes; then
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  2264
    GENERATE_DOCS=true
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  2265
fi
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  2266
AC_SUBST(GENERATE_DOCS)
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  2267
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  2268
###############################################################################
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  2269
#
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  2270
# Should we compile nimbus swing L&F? We can probably remove this option
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  2271
# since nimbus is officially part of javax now.
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  2272
#
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  2273
AC_MSG_CHECKING([whether to build nimbus L&F])
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  2274
AC_ARG_ENABLE([nimbus], [AS_HELP_STRING([--disable-nimbus],
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  2275
	[disable Nimbus L&F @<:@enabled@:>@])],
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  2276
	[ENABLE_NIMBUS="${enableval}"], [ENABLE_NIMBUS='yes'])
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  2277
AC_MSG_RESULT([$ENABLE_NIMBUS])
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  2278
DISABLE_NIMBUS=
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  2279
if test "x$ENABLE_NIMBUS" = xno; then
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  2280
    DISABLE_NIMBUS=true
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  2281
fi
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  2282
AC_SUBST(DISABLE_NIMBUS)
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  2283
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  2284
###############################################################################
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  2285
#
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  2286
# Setup the opt flags for different compilers
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  2287
# and different operating systems.
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  2288
#
12801
948f8ad66ee7 7170079: Adjustments to build-infra makefiles
erikj
parents: 12475
diff changeset
  2289
C_FLAG_DEPS="-MMD -MF"
948f8ad66ee7 7170079: Adjustments to build-infra makefiles
erikj
parents: 12475
diff changeset
  2290
CXX_FLAG_DEPS="-MMD -MF"
948f8ad66ee7 7170079: Adjustments to build-infra makefiles
erikj
parents: 12475
diff changeset
  2291
12258
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  2292
case $COMPILER_TYPE in
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  2293
  CC )
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  2294
    D_FLAG="-g"
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  2295
    case $COMPILER_NAME in
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  2296
      gcc )
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  2297
      	case $PLATFORM in
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  2298
	  macosx )
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  2299
	    # On MacOSX we optimize for size, something
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  2300
	    # we should do for all platforms?
12801
948f8ad66ee7 7170079: Adjustments to build-infra makefiles
erikj
parents: 12475
diff changeset
  2301
	    C_O_FLAG_HI="-Os"
12258
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  2302
	    C_O_FLAG_NORM="-Os"
12801
948f8ad66ee7 7170079: Adjustments to build-infra makefiles
erikj
parents: 12475
diff changeset
  2303
	    C_O_FLAG_NONE=""
12258
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  2304
	    ;;
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  2305
	  *)
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  2306
	    C_O_FLAG_HI="-O3"
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  2307
	    C_O_FLAG_NORM="-O2"
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  2308
	    C_O_FLAG_NONE="-O0"
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  2309
	    ;;
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  2310
	esac
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  2311
        CXX_O_FLAG_HI="$C_O_FLAG_HI"
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  2312
        CXX_O_FLAG_NORM="$C_O_FLAG_NORM"
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  2313
        CXX_O_FLAG_NONE="$C_O_FLAG_NONE"
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  2314
        ;;
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  2315
      ossc )
12801
948f8ad66ee7 7170079: Adjustments to build-infra makefiles
erikj
parents: 12475
diff changeset
  2316
        #
948f8ad66ee7 7170079: Adjustments to build-infra makefiles
erikj
parents: 12475
diff changeset
  2317
        # Forte has different names for this with their C++ compiler...
948f8ad66ee7 7170079: Adjustments to build-infra makefiles
erikj
parents: 12475
diff changeset
  2318
        #
948f8ad66ee7 7170079: Adjustments to build-infra makefiles
erikj
parents: 12475
diff changeset
  2319
	CXX_FLAG_DEPS="-xMMD -xMF"
948f8ad66ee7 7170079: Adjustments to build-infra makefiles
erikj
parents: 12475
diff changeset
  2320
948f8ad66ee7 7170079: Adjustments to build-infra makefiles
erikj
parents: 12475
diff changeset
  2321
# Extra options used with HIGHEST
948f8ad66ee7 7170079: Adjustments to build-infra makefiles
erikj
parents: 12475
diff changeset
  2322
#
948f8ad66ee7 7170079: Adjustments to build-infra makefiles
erikj
parents: 12475
diff changeset
  2323
# WARNING: Use of OPTIMIZATION_LEVEL=HIGHEST in your Makefile needs to be
948f8ad66ee7 7170079: Adjustments to build-infra makefiles
erikj
parents: 12475
diff changeset
  2324
#          done with care, there are some assumptions below that need to
948f8ad66ee7 7170079: Adjustments to build-infra makefiles
erikj
parents: 12475
diff changeset
  2325
#          be understood about the use of pointers, and IEEE behavior.
948f8ad66ee7 7170079: Adjustments to build-infra makefiles
erikj
parents: 12475
diff changeset
  2326
#
948f8ad66ee7 7170079: Adjustments to build-infra makefiles
erikj
parents: 12475
diff changeset
  2327
# Use non-standard floating point mode (not IEEE 754)
948f8ad66ee7 7170079: Adjustments to build-infra makefiles
erikj
parents: 12475
diff changeset
  2328
CC_HIGHEST="$CC_HIGHEST -fns"
948f8ad66ee7 7170079: Adjustments to build-infra makefiles
erikj
parents: 12475
diff changeset
  2329
# Do some simplification of floating point arithmetic (not IEEE 754)
948f8ad66ee7 7170079: Adjustments to build-infra makefiles
erikj
parents: 12475
diff changeset
  2330
CC_HIGHEST="$CC_HIGHEST -fsimple"
948f8ad66ee7 7170079: Adjustments to build-infra makefiles
erikj
parents: 12475
diff changeset
  2331
# Use single precision floating point with 'float'
948f8ad66ee7 7170079: Adjustments to build-infra makefiles
erikj
parents: 12475
diff changeset
  2332
CC_HIGHEST="$CC_HIGHEST -fsingle"
948f8ad66ee7 7170079: Adjustments to build-infra makefiles
erikj
parents: 12475
diff changeset
  2333
# Assume memory references via basic pointer types do not alias
948f8ad66ee7 7170079: Adjustments to build-infra makefiles
erikj
parents: 12475
diff changeset
  2334
#   (Source with excessing pointer casting and data access with mixed 
948f8ad66ee7 7170079: Adjustments to build-infra makefiles
erikj
parents: 12475
diff changeset
  2335
#    pointer types are not recommended)
948f8ad66ee7 7170079: Adjustments to build-infra makefiles
erikj
parents: 12475
diff changeset
  2336
CC_HIGHEST="$CC_HIGHEST -xalias_level=basic"
948f8ad66ee7 7170079: Adjustments to build-infra makefiles
erikj
parents: 12475
diff changeset
  2337
# Use intrinsic or inline versions for math/std functions
948f8ad66ee7 7170079: Adjustments to build-infra makefiles
erikj
parents: 12475
diff changeset
  2338
#   (If you expect perfect errno behavior, do not use this)
948f8ad66ee7 7170079: Adjustments to build-infra makefiles
erikj
parents: 12475
diff changeset
  2339
CC_HIGHEST="$CC_HIGHEST -xbuiltin=%all"
948f8ad66ee7 7170079: Adjustments to build-infra makefiles
erikj
parents: 12475
diff changeset
  2340
# Loop data dependency optimizations (need -xO3 or higher)
948f8ad66ee7 7170079: Adjustments to build-infra makefiles
erikj
parents: 12475
diff changeset
  2341
CC_HIGHEST="$CC_HIGHEST -xdepend"
948f8ad66ee7 7170079: Adjustments to build-infra makefiles
erikj
parents: 12475
diff changeset
  2342
# Pointer parameters to functions do not overlap
948f8ad66ee7 7170079: Adjustments to build-infra makefiles
erikj
parents: 12475
diff changeset
  2343
#   (Similar to -xalias_level=basic usage, but less obvious sometimes.
948f8ad66ee7 7170079: Adjustments to build-infra makefiles
erikj
parents: 12475
diff changeset
  2344
#    If you pass in multiple pointers to the same data, do not use this)
948f8ad66ee7 7170079: Adjustments to build-infra makefiles
erikj
parents: 12475
diff changeset
  2345
CC_HIGHEST="$CC_HIGHEST -xrestrict"
948f8ad66ee7 7170079: Adjustments to build-infra makefiles
erikj
parents: 12475
diff changeset
  2346
# Inline some library routines
948f8ad66ee7 7170079: Adjustments to build-infra makefiles
erikj
parents: 12475
diff changeset
  2347
#   (If you expect perfect errno behavior, do not use this)
948f8ad66ee7 7170079: Adjustments to build-infra makefiles
erikj
parents: 12475
diff changeset
  2348
CC_HIGHEST="$CC_HIGHEST -xlibmil"
948f8ad66ee7 7170079: Adjustments to build-infra makefiles
erikj
parents: 12475
diff changeset
  2349
# Use optimized math routines
948f8ad66ee7 7170079: Adjustments to build-infra makefiles
erikj
parents: 12475
diff changeset
  2350
#   (If you expect perfect errno behavior, do not use this)
948f8ad66ee7 7170079: Adjustments to build-infra makefiles
erikj
parents: 12475
diff changeset
  2351
#  Can cause undefined external on Solaris 8 X86 on __sincos, removing for now
948f8ad66ee7 7170079: Adjustments to build-infra makefiles
erikj
parents: 12475
diff changeset
  2352
#CC_HIGHEST="$CC_HIGHEST -xlibmopt"
948f8ad66ee7 7170079: Adjustments to build-infra makefiles
erikj
parents: 12475
diff changeset
  2353
12258
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  2354
        case $LEGACY_HOST_CPU1 in
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  2355
          i586)
12801
948f8ad66ee7 7170079: Adjustments to build-infra makefiles
erikj
parents: 12475
diff changeset
  2356
            C_O_FLAG_HIGHEST="-xO4 -Wu,-O4~yz $CC_HIGHEST -xchip=pentium"
12258
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  2357
            C_O_FLAG_HI="-xO4 -Wu,-O4~yz"
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  2358
            C_O_FLAG_NORM="-xO2 -Wu,-O2~yz"
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  2359
            C_O_FLAG_NONE=""
12801
948f8ad66ee7 7170079: Adjustments to build-infra makefiles
erikj
parents: 12475
diff changeset
  2360
            CXX_O_FLAG_HIGHEST="-xO4 -Qoption ube -O4~yz $CC_HIGHEST -xchip=pentium"
12258
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  2361
            CXX_O_FLAG_HI="-xO4 -Qoption ube -O4~yz"
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  2362
            CXX_O_FLAG_NORM="-xO2 -Qoption ube -O2~yz"
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  2363
            CXX_O_FLAG_NONE=""
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  2364
            ;;
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  2365
          sparc)
12801
948f8ad66ee7 7170079: Adjustments to build-infra makefiles
erikj
parents: 12475
diff changeset
  2366
            C_O_FLAG_HIGHEST="-xO4 -Wc,-Qrm-s -Wc,-Qiselect-T0 $CC_HIGHEST -xprefetch=auto,explicit -xchip=ultra"
12258
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  2367
            C_O_FLAG_HI="-xO4 -Wc,-Qrm-s -Wc,-Qiselect-T0"
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  2368
            C_O_FLAG_NORM="-xO2 -Wc,-Qrm-s -Wc,-Qiselect-T0"
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  2369
            C_O_FLAG_NONE=""
12801
948f8ad66ee7 7170079: Adjustments to build-infra makefiles
erikj
parents: 12475
diff changeset
  2370
            CXX_O_FLAG_HIGHEST="-xO4 -Qoption cg -Qrm-s -Qoption cg -Qiselect-T0 $CC_HIGHEST -xprefetch=auto,explicit -xchip=ultra"
12258
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  2371
            CXX_O_FLAG_HI="-xO4 -Qoption cg -Qrm-s -Qoption cg -Qiselect-T0"
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  2372
            CXX_O_FLAG_NORM="-xO2 -Qoption cg -Qrm-s -Qoption cg -Qiselect-T0"
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  2373
            CXX_O_FLAG_NONE=""
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  2374
            ;;
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  2375
        esac
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  2376
    esac
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  2377
    ;;
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  2378
  CL )
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  2379
    D_FLAG=
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  2380
    C_O_FLAG_HI="-O2"
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  2381
    C_O_FLAG_NORM="-O1"
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  2382
    C_O_FLAG_NONE="-Od"
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  2383
    CXX_O_FLAG_HI="$C_O_FLAG_HI"
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  2384
    CXX_O_FLAG_NORM="$C_O_FLAG_NORM"
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  2385
    CXX_O_FLAG_NONE="$C_O_FLAG_NONE"
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  2386
    ;;
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  2387
esac
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  2388
12801
948f8ad66ee7 7170079: Adjustments to build-infra makefiles
erikj
parents: 12475
diff changeset
  2389
if test -z "$C_O_FLAG_HIGHEST"; then
948f8ad66ee7 7170079: Adjustments to build-infra makefiles
erikj
parents: 12475
diff changeset
  2390
   C_O_FLAG_HIGHEST="$C_O_FLAG_HI"
948f8ad66ee7 7170079: Adjustments to build-infra makefiles
erikj
parents: 12475
diff changeset
  2391
fi
948f8ad66ee7 7170079: Adjustments to build-infra makefiles
erikj
parents: 12475
diff changeset
  2392
948f8ad66ee7 7170079: Adjustments to build-infra makefiles
erikj
parents: 12475
diff changeset
  2393
if test -z "$CXX_O_FLAG_HIGHEST"; then
948f8ad66ee7 7170079: Adjustments to build-infra makefiles
erikj
parents: 12475
diff changeset
  2394
   CXX_O_FLAG_HIGHEST="$CXX_O_FLAG_HI"
948f8ad66ee7 7170079: Adjustments to build-infra makefiles
erikj
parents: 12475
diff changeset
  2395
fi
948f8ad66ee7 7170079: Adjustments to build-infra makefiles
erikj
parents: 12475
diff changeset
  2396
948f8ad66ee7 7170079: Adjustments to build-infra makefiles
erikj
parents: 12475
diff changeset
  2397
AC_SUBST(C_O_FLAG_HIGHEST)
12258
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  2398
AC_SUBST(C_O_FLAG_HI)
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  2399
AC_SUBST(C_O_FLAG_NORM)
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  2400
AC_SUBST(C_O_FLAG_NONE)
12801
948f8ad66ee7 7170079: Adjustments to build-infra makefiles
erikj
parents: 12475
diff changeset
  2401
AC_SUBST(CXX_O_FLAG_HIGHEST)
12258
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  2402
AC_SUBST(CXX_O_FLAG_HI)
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  2403
AC_SUBST(CXX_O_FLAG_NORM)
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  2404
AC_SUBST(CXX_O_FLAG_NONE)
12801
948f8ad66ee7 7170079: Adjustments to build-infra makefiles
erikj
parents: 12475
diff changeset
  2405
AC_SUBST(C_FLAG_DEPS)
948f8ad66ee7 7170079: Adjustments to build-infra makefiles
erikj
parents: 12475
diff changeset
  2406
AC_SUBST(CXX_FLAG_DEPS)
12258
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  2407
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  2408
###############################################################################
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  2409
#
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  2410
# Setup legacy vars/targets and new vars to deal with different debug levels.
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  2411
#
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  2412
case $DEBUG_LEVEL in
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  2413
      release )
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  2414
              HOTSPOT_DEBUG_LEVEL="product"
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  2415
              HOTSPOT_EXPORT="product"
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  2416
              ;;
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  2417
      fastdebug ) 
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  2418
              HOTSPOT_DEBUG_LEVEL="fastdebug"   
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  2419
              HOTSPOT_EXPORT="fastdebug"
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  2420
              CFLAGS="$CFLAGS $D_FLAG"
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  2421
              JAVAC_FLAGS="$JAVAC_FLAGS -g"
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  2422
              ;;
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  2423
      slowdebug )
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  2424
              HOTSPOT_DEBUG_LEVEL="jvmg"
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  2425
              HOTSPOT_EXPORT="debug"
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  2426
              CFLAGS="$CFLAGS $D_FLAG"
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  2427
	      C_O_FLAG_HI="$C_O_FLAG_NONE"
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  2428
	      C_O_FLAG_NORM="$C_O_FLAG_NONE"
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  2429
	      CXX_O_FLAG_HI="$CXX_O_FLAG_NONE"
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  2430
	      CXX_O_FLAG_NORM="$CXX_O_FLAG_NONE"
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  2431
              JAVAC_FLAGS="$JAVAC_FLAGS -g"
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  2432
              ;;
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  2433
esac              
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  2434
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  2435
###############################################################################
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  2436
#
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  2437
# Generate the legacy makefile targets for hotspot.
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  2438
# The hotspot api for selecting the build artifacts, really, needs to be improved.
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  2439
#
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  2440
HOTSPOT_TARGET=""
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  2441
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  2442
if test "x$JVM_VARIANT_SERVER" = xtrue; then
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  2443
    HOTSPOT_TARGET="$HOTSPOT_TARGET${HOTSPOT_DEBUG_LEVEL} "
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  2444
fi
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  2445
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  2446
if test "x$JVM_VARIANT_CLIENT" = xtrue; then
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  2447
    HOTSPOT_TARGET="$HOTSPOT_TARGET${HOTSPOT_DEBUG_LEVEL}1 "
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  2448
fi
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  2449
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  2450
if test "x$JVM_VARIANT_KERNEL" = xtrue; then
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  2451
    HOTSPOT_TARGET="$HOTSPOT_TARGET${HOTSPOT_DEBUG_LEVEL}kernel "
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  2452
fi
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  2453
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  2454
if test "x$JVM_VARIANT_ZERO" = xtrue; then
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  2455
    HOTSPOT_TARGET="$HOTSPOT_TARGET${HOTSPOT_DEBUG_LEVEL}zero "
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  2456
fi
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  2457
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  2458
if test "x$JVM_VARIANT_ZEROSHARK" = xtrue; then
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  2459
    HOTSPOT_TARGET="$HOTSPOT_TARGET${HOTSPOT_DEBUG_LEVEL}shark "
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  2460
fi
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  2461
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  2462
HOTSPOT_TARGET="$HOTSPOT_TARGET docs export_$HOTSPOT_EXPORT"
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  2463
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  2464
###############################################################################
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  2465
#
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  2466
# Setup all directories for the subrepoes and the arguments to the sub makes.
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  2467
#
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  2468
LANGTOOLS_OUTPUTDIR="$OUTPUT_ROOT/langtools"
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  2469
LANGTOOLS_DIST="$OUTPUT_ROOT/langtools/dist"
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  2470
LANGTOOLS_MAKE_ARGS=""
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  2471
AC_SUBST(LANGTOOLS_OUTPUTDIR)
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  2472
AC_SUBST(LANGTOOLS_DIST)
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  2473
AC_SUBST(LANGTOOLS_MAKE_ARGS)
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  2474
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  2475
CORBA_OUTPUTDIR="$OUTPUT_ROOT/corba"
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  2476
CORBA_DIST="$OUTPUT_ROOT/corba/dist"
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  2477
CORBA_MAKE_ARGS=""
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  2478
AC_SUBST(CORBA_OUTPUTDIR)
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  2479
AC_SUBST(CORBA_DIST)
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  2480
AC_SUBST(CORBA_MAKE_ARGS)
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  2481
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  2482
JAXP_OUTPUTDIR="$OUTPUT_ROOT/jaxp"
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  2483
JAXP_DIST="$OUTPUT_ROOT/jaxp/dist"
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  2484
JAXP_MAKE_ARGS=""
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  2485
AC_SUBST(JAXP_OUTPUTDIR)
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  2486
AC_SUBST(JAXP_DIST)
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  2487
AC_SUBST(JAXP_MAKE_ARGS)
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  2488
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  2489
JAXWS_OUTPUTDIR="$OUTPUT_ROOT/jaxws"
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  2490
JAXWS_DIST="$OUTPUT_ROOT/jaxws/dist"
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  2491
JAXWS_MAKE_ARGS=""
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  2492
AC_SUBST(JAXWS_OUTPUTDIR)
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  2493
AC_SUBST(JAXWS_DIST)
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  2494
AC_SUBST(JAXWS_MAKE_ARGS)
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  2495
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  2496
HOTSPOT_OUTPUTDIR="$OUTPUT_ROOT/hotspot"
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  2497
HOTSPOT_DIST="$OUTPUT_ROOT/hotspot/dist"
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  2498
HOTSPOT_MAKE_ARGS="ALT_OUTPUTDIR=$HOTSPOT_OUTPUTDIR ALT_EXPORT_PATH=$HOTSPOT_DIST $HOTSPOT_TARGET"
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  2499
AC_SUBST(HOTSPOT_OUTPUTDIR)
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  2500
AC_SUBST(HOTSPOT_DIST)
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  2501
AC_SUBST(HOTSPOT_MAKE_ARGS)
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  2502
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  2503
JDK_OUTPUTDIR="$OUTPUT_ROOT/jdk"
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  2504
JDK_MAKE_ARGS="ALT_OUTPUTDIR=\"$OUTPUT_ROOT/jdk\""
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  2505
AC_SUBST(JDK_OUTPUTDIR)
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  2506
AC_SUBST(JDK_MAKE_ARGS)
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  2507
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  2508
IMAGES_OUTPUTDIR=$OUTPUT_ROOT/images
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  2509
IMAGES_MAKE_ARGS="ALT_OUTPUTDIR=$OUTPUT_ROOT/jdk \
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  2510
                  SHARE_SRC=$JDK_TOPDIR/src/share \
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  2511
                  PLATFORM_SRC=$JDK_TOPDIR/src/$LEGACY_HOST_OS_API \
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  2512
                  TEMPDIR=$IMAGES_OUTPUTDIR/tmp \
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  2513
                  ABS_TEMPDIR=$IMAGES_OUTPUTDIR/tmp "
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  2514
AC_SUBST(IMAGES_OUTPUTDIR)
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  2515
AC_SUBST(IMAGES_MAKE_ARGS)
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  2516
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  2517
###############################################################################
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  2518
#
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  2519
# Now setup the CFLAGS and LDFLAGS for the JDK build.
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  2520
# Later we will also have CFLAGS and LDFLAGS for the hotspot subrepo build.
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  2521
#
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  2522
case $COMPILER_NAME in
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  2523
      gcc )
12801
948f8ad66ee7 7170079: Adjustments to build-infra makefiles
erikj
parents: 12475
diff changeset
  2524
      	  CCXXFLAGS_JDK="$CCXXFLAGS $CCXXFLAGS_JDK -W -Wall -Wno-unused -Wno-parentheses \
948f8ad66ee7 7170079: Adjustments to build-infra makefiles
erikj
parents: 12475
diff changeset
  2525
                          -pipe -fno-omit-frame-pointer \
12258
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  2526
                          -D_GNU_SOURCE -D_REENTRANT -D_LARGEFILE64_SOURCE"
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  2527
          CFLAGS_JDK="$CFLAGS_JDK -fno-strict-aliasing"
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  2528
          ;;
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  2529
      ossc )
12801
948f8ad66ee7 7170079: Adjustments to build-infra makefiles
erikj
parents: 12475
diff changeset
  2530
      	  CFLAGS_JDK="$CFLAGS_JDK -xc99=%none -xCC -errshort=tags -Xa -v -mt -norunpath -xnolib"
948f8ad66ee7 7170079: Adjustments to build-infra makefiles
erikj
parents: 12475
diff changeset
  2531
      	  CXXFLAGS_JDK="$CXXFLAGS_JDK -errtags=yes +w -mt -features=no%except -DCC_NOEX"
12258
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  2532
          ;;
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  2533
      cl )
12801
948f8ad66ee7 7170079: Adjustments to build-infra makefiles
erikj
parents: 12475
diff changeset
  2534
          CCXXFLAGS_JDK="$CCXXFLAGS $CCXXFLAGS_JDK -Zi -MD -Zc:wchar_t- -W3 -wd4800 \
12258
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  2535
               -D_STATIC_CPPLIB -D_DISABLE_DEPRECATE_STATIC_CPPLIB -DWIN32_LEAN_AND_MEAN \
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  2536
	       -D_CRT_SECURE_NO_DEPRECATE -D_CRT_NONSTDC_NO_DEPRECATE \
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  2537
	       -DWIN32 -DIAL"
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  2538
          case $LEGACY_HOST_CPU1 in
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  2539
              i?86 )
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  2540
                  CCXXFLAGS_JDK="$CCXXFLAGS_JDK -D_X86_ -Dx86"
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  2541
                  ;;
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  2542
              amd64 )
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  2543
                  CCXXFLAGS_JDK="$CCXXFLAGS_JDK -D_AMD64_ -Damd64"
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  2544
                  ;;
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  2545
          esac
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  2546
          ;;
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  2547
esac
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  2548
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  2549
CCXXFLAGS_JDK="$CCXXFLAGS_JDK $ADD_LP64"
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  2550
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  2551
# The package path is used only on macosx?
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  2552
PACKAGE_PATH=/opt/local
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  2553
AC_SUBST(PACKAGE_PATH)
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  2554
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  2555
# Sometimes we use a cpu dir (.../lib/amd64/server) 
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  2556
# Sometimes not (.../lib/server) 
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  2557
LIBARCHDIR="$LEGACY_HOST_CPU2/"
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  2558
if test "x$ENDIAN" = xlittle; then
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  2559
    CCXXFLAGS_JDK="$CCXXFLAGS_JDK -D_LITTLE_ENDIAN"
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  2560
else
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  2561
    CCXXFLAGS_JDK="$CCXXFLAGS_JDK -D_BIG_ENDIAN"
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  2562
fi
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  2563
if test "x$HOST_OS" = xlinux; then
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  2564
    CCXXFLAGS_JDK="$CCXXFLAGS_JDK -DLINUX"
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  2565
fi
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  2566
if test "x$HOST_OS" = xwindows; then
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  2567
    CCXXFLAGS_JDK="$CCXXFLAGS_JDK -DWINDOWS"
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  2568
fi
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  2569
if test "x$HOST_OS" = xsolaris; then
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  2570
    CCXXFLAGS_JDK="$CCXXFLAGS_JDK -DSOLARIS"
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  2571
fi
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  2572
if test "x$HOST_OS" = xmacosx; then
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  2573
    CCXXFLAGS_JDK="$CCXXFLAGS_JDK -DMACOSX -D_ALLBSD_SOURCE"
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  2574
    LIBARCHDIR=""
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  2575
fi
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  2576
if test "x$HOST_OS" = xbsd; then
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  2577
    CCXXFLAGS_JDK="$CCXXFLAGS_JDK -DBSD -D_ALLBSD_SOURCE"
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  2578
fi
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  2579
if test "x$DEBUG_LEVEL" = xrelease; then
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  2580
    CCXXFLAGS_JDK="$CCXXFLAGS_JDK -DNDEBUG"
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  2581
else
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  2582
    CCXXFLAGS_JDK="$CCXXFLAGS_JDK -DDEBUG"
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  2583
fi
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  2584
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  2585
CCXXFLAGS_JDK="$CCXXFLAGS_JDK -DARCH='\"$LEGACY_HOST_CPU1\"' -D$LEGACY_HOST_CPU1"
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  2586
CCXXFLAGS_JDK="$CCXXFLAGS_JDK -DRELEASE='\"$RELEASE\"'"
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  2587
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  2588
CCXXFLAGS_JDK="$CCXXFLAGS_JDK \
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  2589
        -I${JDK_OUTPUTDIR}/include \
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  2590
        -I${JDK_OUTPUTDIR}/include/$PLATFORM \
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  2591
        -I${JDK_TOPDIR}/src/share/javavm/export \
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  2592
        -I${JDK_TOPDIR}/src/$LEGACY_HOST_OS_API/javavm/export \
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  2593
        -I${JDK_TOPDIR}/src/share/native/common \
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  2594
        -I${JDK_TOPDIR}/src/$LEGACY_HOST_OS_API/native/common"
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  2595
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  2596
# The shared libraries are compiled using the picflag.
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  2597
CFLAGS_JDKLIB="$CCXXFLAGS_JDK $CFLAGS_JDK $PICFLAG $CFLAGS_JDKLIB_EXTRA"
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  2598
CXXFLAGS_JDKLIB="$CCXXFLAGS_JDK $CXXFLAGS_JDK $PICFLAG"
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  2599
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  2600
# Executable flags
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  2601
CFLAGS_JDKEXE="$CCXXFLAGS_JDK $CFLAGS_JDK"
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  2602
CXXFLAGS_JDKEXE="$CCXXFLAGS_JDK $CXXFLAGS_JDK"
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  2603
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  2604
# Now this is odd. The JDK native libraries have to link against libjvm.so
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  2605
# On 32-bit machines there is normally two distinct libjvm.so:s, client and server.
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  2606
# Which should we link to? Are we lucky enough that the binary api to the libjvm.so library
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  2607
# is identical for client and server? Yes. Which is picked at runtime (client or server)?
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  2608
# Neither, since the chosen libjvm.so has already been loaded by the launcher, all the following
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  2609
# libraries will link to whatever is in memory. Yuck. 
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  2610
#
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  2611
# Thus we offer the compiler to find libjvm.so first in server then in client. It works. Ugh.
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  2612
if test "x$COMPILER_TYPE" = xCL; then
12801
948f8ad66ee7 7170079: Adjustments to build-infra makefiles
erikj
parents: 12475
diff changeset
  2613
    LDFLAGS_JDKLIB="$LDFLAGS -dll -libpath:${JDK_OUTPUTDIR}/lib -libpath:${JDK_OUTPUTDIR}/objs"
12258
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  2614
    LDFLAGS_JDKLIB_SUFFIX=""
12801
948f8ad66ee7 7170079: Adjustments to build-infra makefiles
erikj
parents: 12475
diff changeset
  2615
    if test "$HOST_CPU_BITS" == "64"; then
948f8ad66ee7 7170079: Adjustments to build-infra makefiles
erikj
parents: 12475
diff changeset
  2616
        LDFLAGS_STACK_SIZE=1048576
12258
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  2617
    else
12801
948f8ad66ee7 7170079: Adjustments to build-infra makefiles
erikj
parents: 12475
diff changeset
  2618
        LDFLAGS_STACK_SIZE=327680
12258
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  2619
    fi
12801
948f8ad66ee7 7170079: Adjustments to build-infra makefiles
erikj
parents: 12475
diff changeset
  2620
    LDFLAGS_JDKEXE="$LDFLAGS /STACK:$LDFLAGS_STACK_SIZE"
12258
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  2621
else
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  2622
    # If this is a --hash-style=gnu system, use --hash-style=both, why?
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  2623
    HAS_GNU_HASH=`$CC -dumpspecs 2>/dev/null | $GREP 'hash-style=gnu'`
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  2624
    if test -n "$HAS_GNU_HASH"; then
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  2625
        # And since we now know that the linker is gnu, then add -z defs, to forbid
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  2626
        # undefined symbols in object files.
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  2627
        LDFLAGS="$LDFLAGS -Xlinker --hash-style=both -Xlinker -z -Xlinker defs"
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  2628
        if test "x$DEBUG_LEVEL" == "xrelease"; then
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  2629
            # When building release libraries, tell the linker optimize them.
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  2630
            # Should this be supplied to the OSS linker as well?
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  2631
            LDFLAGS="$LDFLAGS -Xlinker -O1"
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  2632
        fi
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  2633
    fi
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  2634
12801
948f8ad66ee7 7170079: Adjustments to build-infra makefiles
erikj
parents: 12475
diff changeset
  2635
    LDFLAGS_JDKLIB="$LDFLAGS $SHARED_LIBRARY_FLAGS \
948f8ad66ee7 7170079: Adjustments to build-infra makefiles
erikj
parents: 12475
diff changeset
  2636
                    -L${JDK_OUTPUTDIR}/objs \
948f8ad66ee7 7170079: Adjustments to build-infra makefiles
erikj
parents: 12475
diff changeset
  2637
                    -L${JDK_OUTPUTDIR}/lib/${LIBARCHDIR}server \
12258
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  2638
                    -L${JDK_OUTPUTDIR}/lib/${LIBARCHDIR}client \
12801
948f8ad66ee7 7170079: Adjustments to build-infra makefiles
erikj
parents: 12475
diff changeset
  2639
  	            -L${JDK_OUTPUTDIR}/lib/${LIBARCHDIR}"
12258
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  2640
    LDFLAGS_JDKLIB_SUFFIX="-ljvm -ljava"
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  2641
    if test "x$COMPILER_NAME" = xossc; then
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  2642
        LDFLAGS_JDKLIB_SUFFIX="$LDFLAGS_JDKLIB_SUFFIX -lc"
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  2643
    fi
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  2644
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  2645
    # Only the jli library is explicitly linked when the launchers are built.
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  2646
    # The libjvm is then dynamically loaded/linked by the launcher.
12801
948f8ad66ee7 7170079: Adjustments to build-infra makefiles
erikj
parents: 12475
diff changeset
  2647
    if test "x$HOST_OS" != "xmacosx"; then
948f8ad66ee7 7170079: Adjustments to build-infra makefiles
erikj
parents: 12475
diff changeset
  2648
       LDFLAGS_JDKEXE="$LDFLAGS -L${JDK_OUTPUTDIR}/lib/${LIBARCHDIR}jli"
948f8ad66ee7 7170079: Adjustments to build-infra makefiles
erikj
parents: 12475
diff changeset
  2649
       LDFLAGS_JDKEXE_SUFFIX="-ljli"
948f8ad66ee7 7170079: Adjustments to build-infra makefiles
erikj
parents: 12475
diff changeset
  2650
    fi
12258
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  2651
fi
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  2652
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  2653
                
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  2654
AC_SUBST(CFLAGS_JDKLIB)
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  2655
AC_SUBST(CFLAGS_JDKEXE)
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  2656
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  2657
AC_SUBST(CXXFLAGS_JDKLIB)
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  2658
AC_SUBST(CXXFLAGS_JDKEXE)
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  2659
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  2660
AC_SUBST(LDFLAGS_JDKLIB)
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  2661
AC_SUBST(LDFLAGS_JDKEXE)
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  2662
AC_SUBST(LDFLAGS_JDKLIB_SUFFIX)
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  2663
AC_SUBST(LDFLAGS_JDKEXE_SUFFIX)
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  2664
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  2665
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  2666
###############################################################################
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  2667
#
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  2668
# statically link libstdc++ before C++ ABI is stablized on Linux unless 
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  2669
# dynamic build is configured on command line.
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  2670
#
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  2671
AC_ARG_ENABLE([static-link-stdc++], [AS_HELP_STRING([--disable-static-link-stdc++],
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  2672
	[disable static linking of the C++ runtime on Linux @<:@enabled@:>@])],,
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  2673
	[
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  2674
		enable_static_link_stdc__=yes
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  2675
    ])
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  2676
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  2677
if test "x$HOST_OS" = xlinux; then
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  2678
    # Test if -lstdc++ works.
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  2679
    AC_MSG_CHECKING([if dynamic link of stdc++ is possible])
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  2680
    AC_LANG_PUSH(C++)
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  2681
    OLD_CXXFLAGS="$CXXFLAGS"
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  2682
    CXXFLAGS="$CXXFLAGS -lstdc++"
12801
948f8ad66ee7 7170079: Adjustments to build-infra makefiles
erikj
parents: 12475
diff changeset
  2683
    AC_LINK_IFELSE([AC_LANG_PROGRAM([], [return 0;])],
948f8ad66ee7 7170079: Adjustments to build-infra makefiles
erikj
parents: 12475
diff changeset
  2684
            [has_dynamic_libstdcxx=yes],
948f8ad66ee7 7170079: Adjustments to build-infra makefiles
erikj
parents: 12475
diff changeset
  2685
            [has_dynamic_libstdcxx=no])
12258
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  2686
    CXXFLAGS="$OLD_CXXFLAGS"
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  2687
    AC_LANG_POP(C++)
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  2688
    AC_MSG_RESULT([$has_dynamic_libstdcxx])
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  2689
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  2690
    # Test if stdc++ can be linked statically.
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  2691
    AC_MSG_CHECKING([if static link of stdc++ is possible])
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  2692
    STATIC_STDCXX_FLAGS="-Wl,-Bstatic -lstdc++ -lgcc -Wl,-Bdynamic"
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  2693
    AC_LANG_PUSH(C++)
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  2694
    OLD_LIBS="$LIBS"
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  2695
    OLD_CXX="$CXX"
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  2696
    LIBS="$STATIC_STDCXX_FLAGS"
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  2697
    CXX="$CC"                       
12801
948f8ad66ee7 7170079: Adjustments to build-infra makefiles
erikj
parents: 12475
diff changeset
  2698
    AC_LINK_IFELSE([AC_LANG_PROGRAM([], [return 0;])],
948f8ad66ee7 7170079: Adjustments to build-infra makefiles
erikj
parents: 12475
diff changeset
  2699
            [has_static_libstdcxx=yes],
948f8ad66ee7 7170079: Adjustments to build-infra makefiles
erikj
parents: 12475
diff changeset
  2700
            [has_static_libstdcxx=no])
12258
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  2701
    LIBS="$OLD_LIBS"
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  2702
    CXX="$OLD_CXX"
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  2703
    AC_LANG_POP(C++)
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  2704
    AC_MSG_RESULT([$has_static_libstdcxx])
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  2705
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  2706
    if test "x$has_static_libcxx" = xno && test "x$has_dynamic_libcxx" = xno; then
12801
948f8ad66ee7 7170079: Adjustments to build-infra makefiles
erikj
parents: 12475
diff changeset
  2707
        AC_MSG_ERROR([I cannot link to stdc++! Neither dynamically nor statically.])
12258
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  2708
    fi
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  2709
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  2710
    if test "x$enable_static_link_stdc__" = xyes && test "x$has_static_libstdcxx" = xno; then
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  2711
        AC_MSG_NOTICE([Static linking of libstdc++ was not possible reverting to dynamic linking.])
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  2712
        enable_static_link_stdc__=no
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  2713
    fi
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  2714
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  2715
    if test "x$enable_static_link_stdc__" = xno && test "x$has_dynamic_libstdcxx" = xno; then
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  2716
        AC_MSG_NOTICE([Dynamic linking of libstdc++ was not possible reverting to static linking.])
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  2717
        enable_static_link_stdc__=yes
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  2718
    fi
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  2719
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  2720
    AC_MSG_CHECKING([how to link with libstdc++])
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  2721
    if test "x$enable_static_link_stdc__" = xyes; then
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  2722
        LIBCXX="$LIBCXX $STATIC_STDCXX_FLAGS"
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  2723
        LDCXX="$CC"
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  2724
        AC_MSG_RESULT([static])
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  2725
    else
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  2726
        LIBCXX="$LIBCXX -lstdc++"
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  2727
        LDCXX="$CXX"
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  2728
        AC_MSG_RESULT([dynamic])
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  2729
    fi
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  2730
fi
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  2731
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  2732
###############################################################################
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  2733
#
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  2734
# Could someone enlighten this configure script with a comment about libCrun?
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  2735
# The LEGACY_HOST_CPU3 is the setting for ISA_DIR.
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  2736
#
12801
948f8ad66ee7 7170079: Adjustments to build-infra makefiles
erikj
parents: 12475
diff changeset
  2737
if test "x$HOST_OS" = xsolaris && test "x$LIBCXX" = x; then
948f8ad66ee7 7170079: Adjustments to build-infra makefiles
erikj
parents: 12475
diff changeset
  2738
    LIBCXX="/usr/lib${LEGACY_HOST_CPU3}/libCrun.so.1"
948f8ad66ee7 7170079: Adjustments to build-infra makefiles
erikj
parents: 12475
diff changeset
  2739
fi
948f8ad66ee7 7170079: Adjustments to build-infra makefiles
erikj
parents: 12475
diff changeset
  2740
948f8ad66ee7 7170079: Adjustments to build-infra makefiles
erikj
parents: 12475
diff changeset
  2741
# TODO better (platform agnostic) test
948f8ad66ee7 7170079: Adjustments to build-infra makefiles
erikj
parents: 12475
diff changeset
  2742
if test "x$HOST_OS" = xmacosx && test "x$LIBCXX" = x && test "x$GCC" = xyes; then
948f8ad66ee7 7170079: Adjustments to build-infra makefiles
erikj
parents: 12475
diff changeset
  2743
    LIBCXX="-lstdc++"
12258
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  2744
fi
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  2745
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  2746
AC_SUBST(LIBCXX)
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  2747
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  2748
###############################################################################
12801
948f8ad66ee7 7170079: Adjustments to build-infra makefiles
erikj
parents: 12475
diff changeset
  2749
948f8ad66ee7 7170079: Adjustments to build-infra makefiles
erikj
parents: 12475
diff changeset
  2750
OS_VERSION="`uname -r | ${SED} 's!\.! !g' | ${SED} 's!-! !g'`"
948f8ad66ee7 7170079: Adjustments to build-infra makefiles
erikj
parents: 12475
diff changeset
  2751
OS_VERSION_MAJOR="`${ECHO} ${OS_VERSION} | ${CUT} -f 1 -d ' '`"
948f8ad66ee7 7170079: Adjustments to build-infra makefiles
erikj
parents: 12475
diff changeset
  2752
OS_VERSION_MINOR="`${ECHO} ${OS_VERSION} | ${CUT} -f 2 -d ' '`"
948f8ad66ee7 7170079: Adjustments to build-infra makefiles
erikj
parents: 12475
diff changeset
  2753
OS_VERSION_MICRO="`${ECHO} ${OS_VERSION} | ${CUT} -f 3 -d ' '`"
948f8ad66ee7 7170079: Adjustments to build-infra makefiles
erikj
parents: 12475
diff changeset
  2754
AC_SUBST(OS_VERSION_MAJOR)
948f8ad66ee7 7170079: Adjustments to build-infra makefiles
erikj
parents: 12475
diff changeset
  2755
AC_SUBST(OS_VERSION_MINOR)
948f8ad66ee7 7170079: Adjustments to build-infra makefiles
erikj
parents: 12475
diff changeset
  2756
AC_SUBST(OS_VERSION_MICRO)
948f8ad66ee7 7170079: Adjustments to build-infra makefiles
erikj
parents: 12475
diff changeset
  2757
948f8ad66ee7 7170079: Adjustments to build-infra makefiles
erikj
parents: 12475
diff changeset
  2758
###############################################################################
12258
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  2759
#
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  2760
# Misc
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  2761
#
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  2762
12801
948f8ad66ee7 7170079: Adjustments to build-infra makefiles
erikj
parents: 12475
diff changeset
  2763
# The name of the Service Agent jar.
948f8ad66ee7 7170079: Adjustments to build-infra makefiles
erikj
parents: 12475
diff changeset
  2764
SALIB_NAME="${LIBRARY_PREFIX}saproc${SHARED_LIBRARY_SUFFIX}"
948f8ad66ee7 7170079: Adjustments to build-infra makefiles
erikj
parents: 12475
diff changeset
  2765
if test "x$HOST_OS" = "xwindows"; then
948f8ad66ee7 7170079: Adjustments to build-infra makefiles
erikj
parents: 12475
diff changeset
  2766
    SALIB_NAME="${LIBRARY_PREFIX}sawindbg${SHARED_LIBRARY_SUFFIX}"
948f8ad66ee7 7170079: Adjustments to build-infra makefiles
erikj
parents: 12475
diff changeset
  2767
fi
948f8ad66ee7 7170079: Adjustments to build-infra makefiles
erikj
parents: 12475
diff changeset
  2768
AC_SUBST(SALIB_NAME)
948f8ad66ee7 7170079: Adjustments to build-infra makefiles
erikj
parents: 12475
diff changeset
  2769
12258
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  2770
# Control wether Hotspot runs Queens test after build.
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  2771
AC_ARG_ENABLE([hotspot-test-in-build], [AS_HELP_STRING([--enable-hotspot-test-in-build],
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  2772
	[enable running of Queens test after Hotspot build (not yet available) @<:@disabled@:>@])],,
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  2773
    [enable_hotspot_test_in_build=no])
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  2774
if test "x$enable_hotspot_test_in_build" = "xyes"; then
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  2775
    TEST_IN_BUILD=true
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  2776
else
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  2777
    TEST_IN_BUILD=false
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  2778
fi
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  2779
AC_SUBST(TEST_IN_BUILD)
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  2780
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  2781
###############################################################################
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  2782
#
12801
948f8ad66ee7 7170079: Adjustments to build-infra makefiles
erikj
parents: 12475
diff changeset
  2783
# Choose cacerts source file
12258
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  2784
#
12801
948f8ad66ee7 7170079: Adjustments to build-infra makefiles
erikj
parents: 12475
diff changeset
  2785
AC_ARG_WITH(cacerts-file, [AS_HELP_STRING([--with-cacerts-file],
948f8ad66ee7 7170079: Adjustments to build-infra makefiles
erikj
parents: 12475
diff changeset
  2786
    [specify alternative cacerts file])])
948f8ad66ee7 7170079: Adjustments to build-infra makefiles
erikj
parents: 12475
diff changeset
  2787
if test "x$with_cacerts_file" != x; then
948f8ad66ee7 7170079: Adjustments to build-infra makefiles
erikj
parents: 12475
diff changeset
  2788
    CACERTS_FILE=$with_cacerts_file
948f8ad66ee7 7170079: Adjustments to build-infra makefiles
erikj
parents: 12475
diff changeset
  2789
else
948f8ad66ee7 7170079: Adjustments to build-infra makefiles
erikj
parents: 12475
diff changeset
  2790
    if test "x$OPENJDK" = "xtrue"; then
948f8ad66ee7 7170079: Adjustments to build-infra makefiles
erikj
parents: 12475
diff changeset
  2791
        CACERTS_FILE=${SRC_ROOT}/jdk/src/share/lib/security/cacerts
948f8ad66ee7 7170079: Adjustments to build-infra makefiles
erikj
parents: 12475
diff changeset
  2792
    else
948f8ad66ee7 7170079: Adjustments to build-infra makefiles
erikj
parents: 12475
diff changeset
  2793
        CACERTS_FILE=${SRC_ROOT}/jdk/src/closed/share/lib/security/cacerts.internal
948f8ad66ee7 7170079: Adjustments to build-infra makefiles
erikj
parents: 12475
diff changeset
  2794
    fi
948f8ad66ee7 7170079: Adjustments to build-infra makefiles
erikj
parents: 12475
diff changeset
  2795
fi
948f8ad66ee7 7170079: Adjustments to build-infra makefiles
erikj
parents: 12475
diff changeset
  2796
AC_SUBST(CACERTS_FILE)
948f8ad66ee7 7170079: Adjustments to build-infra makefiles
erikj
parents: 12475
diff changeset
  2797
948f8ad66ee7 7170079: Adjustments to build-infra makefiles
erikj
parents: 12475
diff changeset
  2798
# Check if build directory is on local disk.
948f8ad66ee7 7170079: Adjustments to build-infra makefiles
erikj
parents: 12475
diff changeset
  2799
# return 0 if it is on local disk, non-0 if on remote disk or failure
948f8ad66ee7 7170079: Adjustments to build-infra makefiles
erikj
parents: 12475
diff changeset
  2800
function is_directory_on_local_disk {
948f8ad66ee7 7170079: Adjustments to build-infra makefiles
erikj
parents: 12475
diff changeset
  2801
	# df -l lists only local disks; if the given directory is not found then
948f8ad66ee7 7170079: Adjustments to build-infra makefiles
erikj
parents: 12475
diff changeset
  2802
	# a non-zero exit code is given
948f8ad66ee7 7170079: Adjustments to build-infra makefiles
erikj
parents: 12475
diff changeset
  2803
	$DF -l $1 > /dev/null 2>&1
948f8ad66ee7 7170079: Adjustments to build-infra makefiles
erikj
parents: 12475
diff changeset
  2804
}
12258
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  2805
12801
948f8ad66ee7 7170079: Adjustments to build-infra makefiles
erikj
parents: 12475
diff changeset
  2806
AC_MSG_CHECKING([if build directory is on local disk])
948f8ad66ee7 7170079: Adjustments to build-infra makefiles
erikj
parents: 12475
diff changeset
  2807
if is_directory_on_local_disk $OUTPUT_ROOT; then
948f8ad66ee7 7170079: Adjustments to build-infra makefiles
erikj
parents: 12475
diff changeset
  2808
	OUTPUT_DIR_IS_LOCAL="yes"
948f8ad66ee7 7170079: Adjustments to build-infra makefiles
erikj
parents: 12475
diff changeset
  2809
else
948f8ad66ee7 7170079: Adjustments to build-infra makefiles
erikj
parents: 12475
diff changeset
  2810
	OUTPUT_DIR_IS_LOCAL="no"
948f8ad66ee7 7170079: Adjustments to build-infra makefiles
erikj
parents: 12475
diff changeset
  2811
fi
948f8ad66ee7 7170079: Adjustments to build-infra makefiles
erikj
parents: 12475
diff changeset
  2812
AC_MSG_RESULT($OUTPUT_DIR_IS_LOCAL)
948f8ad66ee7 7170079: Adjustments to build-infra makefiles
erikj
parents: 12475
diff changeset
  2813
948f8ad66ee7 7170079: Adjustments to build-infra makefiles
erikj
parents: 12475
diff changeset
  2814
# We're messing a bit with internal autoconf variables to put the config.status in the
948f8ad66ee7 7170079: Adjustments to build-infra makefiles
erikj
parents: 12475
diff changeset
  2815
# output directory instead of the current directory.
948f8ad66ee7 7170079: Adjustments to build-infra makefiles
erikj
parents: 12475
diff changeset
  2816
CONFIG_STATUS=$OUTPUT_ROOT/config.status
948f8ad66ee7 7170079: Adjustments to build-infra makefiles
erikj
parents: 12475
diff changeset
  2817
948f8ad66ee7 7170079: Adjustments to build-infra makefiles
erikj
parents: 12475
diff changeset
  2818
# Now create the actual output files, after this, the main work of configure is done
948f8ad66ee7 7170079: Adjustments to build-infra makefiles
erikj
parents: 12475
diff changeset
  2819
AC_OUTPUT
948f8ad66ee7 7170079: Adjustments to build-infra makefiles
erikj
parents: 12475
diff changeset
  2820
948f8ad66ee7 7170079: Adjustments to build-infra makefiles
erikj
parents: 12475
diff changeset
  2821
# Finally output some useful information to the user
948f8ad66ee7 7170079: Adjustments to build-infra makefiles
erikj
parents: 12475
diff changeset
  2822
948f8ad66ee7 7170079: Adjustments to build-infra makefiles
erikj
parents: 12475
diff changeset
  2823
if test "x$CCACHE_FOUND" != x; then
948f8ad66ee7 7170079: Adjustments to build-infra makefiles
erikj
parents: 12475
diff changeset
  2824
	if  test "x$HAS_GOOD_CCACHE" = x; then
948f8ad66ee7 7170079: Adjustments to build-infra makefiles
erikj
parents: 12475
diff changeset
  2825
		CCACHE_STATUS="installed, but disabled (version older than 3.1.4)"
948f8ad66ee7 7170079: Adjustments to build-infra makefiles
erikj
parents: 12475
diff changeset
  2826
		CCACHE_HELP_MSG="You have ccache installed, but it is a version prior to 3.1.4. Try upgrading."
948f8ad66ee7 7170079: Adjustments to build-infra makefiles
erikj
parents: 12475
diff changeset
  2827
	else
948f8ad66ee7 7170079: Adjustments to build-infra makefiles
erikj
parents: 12475
diff changeset
  2828
		CCACHE_STATUS="installed and in use"
948f8ad66ee7 7170079: Adjustments to build-infra makefiles
erikj
parents: 12475
diff changeset
  2829
	fi
948f8ad66ee7 7170079: Adjustments to build-infra makefiles
erikj
parents: 12475
diff changeset
  2830
else
948f8ad66ee7 7170079: Adjustments to build-infra makefiles
erikj
parents: 12475
diff changeset
  2831
	if test "x$GCC" = xyes; then
948f8ad66ee7 7170079: Adjustments to build-infra makefiles
erikj
parents: 12475
diff changeset
  2832
		CCACHE_STATUS="not installed (consider installing)"
948f8ad66ee7 7170079: Adjustments to build-infra makefiles
erikj
parents: 12475
diff changeset
  2833
		CCACHE_HELP_MSG="You do not have ccache installed. Try installing it."
948f8ad66ee7 7170079: Adjustments to build-infra makefiles
erikj
parents: 12475
diff changeset
  2834
	else
948f8ad66ee7 7170079: Adjustments to build-infra makefiles
erikj
parents: 12475
diff changeset
  2835
		CCACHE_STATUS="not available for your system"
948f8ad66ee7 7170079: Adjustments to build-infra makefiles
erikj
parents: 12475
diff changeset
  2836
	fi
12258
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  2837
fi
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  2838
12801
948f8ad66ee7 7170079: Adjustments to build-infra makefiles
erikj
parents: 12475
diff changeset
  2839
printf "\n"
948f8ad66ee7 7170079: Adjustments to build-infra makefiles
erikj
parents: 12475
diff changeset
  2840
printf "====================================================\n"
948f8ad66ee7 7170079: Adjustments to build-infra makefiles
erikj
parents: 12475
diff changeset
  2841
printf "A new configuration has been successfully created in\n"
948f8ad66ee7 7170079: Adjustments to build-infra makefiles
erikj
parents: 12475
diff changeset
  2842
printf "$OUTPUT_ROOT\n"
948f8ad66ee7 7170079: Adjustments to build-infra makefiles
erikj
parents: 12475
diff changeset
  2843
if test "x$CONFIGURE_COMMAND_LINE" != x; then
948f8ad66ee7 7170079: Adjustments to build-infra makefiles
erikj
parents: 12475
diff changeset
  2844
	printf "using configure arguments '$CONFIGURE_COMMAND_LINE'.\n"
948f8ad66ee7 7170079: Adjustments to build-infra makefiles
erikj
parents: 12475
diff changeset
  2845
else
948f8ad66ee7 7170079: Adjustments to build-infra makefiles
erikj
parents: 12475
diff changeset
  2846
	printf "using default settings.\n"
948f8ad66ee7 7170079: Adjustments to build-infra makefiles
erikj
parents: 12475
diff changeset
  2847
fi
948f8ad66ee7 7170079: Adjustments to build-infra makefiles
erikj
parents: 12475
diff changeset
  2848
948f8ad66ee7 7170079: Adjustments to build-infra makefiles
erikj
parents: 12475
diff changeset
  2849
printf "\n"
948f8ad66ee7 7170079: Adjustments to build-infra makefiles
erikj
parents: 12475
diff changeset
  2850
printf "Configuration summary:\n"
948f8ad66ee7 7170079: Adjustments to build-infra makefiles
erikj
parents: 12475
diff changeset
  2851
printf "* Debug level:  $DEBUG_LEVEL\n"
948f8ad66ee7 7170079: Adjustments to build-infra makefiles
erikj
parents: 12475
diff changeset
  2852
printf "* JDK variant:  $JDK_VARIANT\n"
948f8ad66ee7 7170079: Adjustments to build-infra makefiles
erikj
parents: 12475
diff changeset
  2853
printf "* JVM variants: $with_jvm_variants\n"
948f8ad66ee7 7170079: Adjustments to build-infra makefiles
erikj
parents: 12475
diff changeset
  2854
printf "* Host info:    OS: $HOST_OS, CPU architecture: $HOST_CPU_ARCH, address length: $HOST_CPU_BITS\n"
948f8ad66ee7 7170079: Adjustments to build-infra makefiles
erikj
parents: 12475
diff changeset
  2855
printf "* Boot JDK:     $BOOT_JDK\n"
948f8ad66ee7 7170079: Adjustments to build-infra makefiles
erikj
parents: 12475
diff changeset
  2856
948f8ad66ee7 7170079: Adjustments to build-infra makefiles
erikj
parents: 12475
diff changeset
  2857
printf "\n"
948f8ad66ee7 7170079: Adjustments to build-infra makefiles
erikj
parents: 12475
diff changeset
  2858
printf "Build performance summary:\n"
948f8ad66ee7 7170079: Adjustments to build-infra makefiles
erikj
parents: 12475
diff changeset
  2859
printf "* Cores to use:  $NUM_CORES\n"
948f8ad66ee7 7170079: Adjustments to build-infra makefiles
erikj
parents: 12475
diff changeset
  2860
printf "* Memory limit:  $MEMORY_SIZE MB\n"
948f8ad66ee7 7170079: Adjustments to build-infra makefiles
erikj
parents: 12475
diff changeset
  2861
printf "* ccache status: $CCACHE_STATUS\n"
948f8ad66ee7 7170079: Adjustments to build-infra makefiles
erikj
parents: 12475
diff changeset
  2862
948f8ad66ee7 7170079: Adjustments to build-infra makefiles
erikj
parents: 12475
diff changeset
  2863
if test "x$OUTPUT_DIR_IS_LOCAL" != "xyes"; then
948f8ad66ee7 7170079: Adjustments to build-infra makefiles
erikj
parents: 12475
diff changeset
  2864
	printf "\n"
948f8ad66ee7 7170079: Adjustments to build-infra makefiles
erikj
parents: 12475
diff changeset
  2865
	printf "WARNING: Your build output directory is not on a local disk.\n"
948f8ad66ee7 7170079: Adjustments to build-infra makefiles
erikj
parents: 12475
diff changeset
  2866
	printf "This will severely degrade build performance!\n"
948f8ad66ee7 7170079: Adjustments to build-infra makefiles
erikj
parents: 12475
diff changeset
  2867
	printf "It is recommended that you create an output directory on a local disk,\n"
948f8ad66ee7 7170079: Adjustments to build-infra makefiles
erikj
parents: 12475
diff changeset
  2868
	printf "and run the configure script again from that directory.\n"
948f8ad66ee7 7170079: Adjustments to build-infra makefiles
erikj
parents: 12475
diff changeset
  2869
fi
948f8ad66ee7 7170079: Adjustments to build-infra makefiles
erikj
parents: 12475
diff changeset
  2870
948f8ad66ee7 7170079: Adjustments to build-infra makefiles
erikj
parents: 12475
diff changeset
  2871
if test "x$CCACHE_HELP_MSG" != x; then
948f8ad66ee7 7170079: Adjustments to build-infra makefiles
erikj
parents: 12475
diff changeset
  2872
	printf "\n"
948f8ad66ee7 7170079: Adjustments to build-infra makefiles
erikj
parents: 12475
diff changeset
  2873
	printf "Build performance tip: ccache gives a tremendous speedup for C++ recompilations.\n"
948f8ad66ee7 7170079: Adjustments to build-infra makefiles
erikj
parents: 12475
diff changeset
  2874
	printf "$CCACHE_HELP_MSG\n"
948f8ad66ee7 7170079: Adjustments to build-infra makefiles
erikj
parents: 12475
diff changeset
  2875
948f8ad66ee7 7170079: Adjustments to build-infra makefiles
erikj
parents: 12475
diff changeset
  2876
    help_on_build_dependency ccache
948f8ad66ee7 7170079: Adjustments to build-infra makefiles
erikj
parents: 12475
diff changeset
  2877
    printf "$HELP_MSG\n"
948f8ad66ee7 7170079: Adjustments to build-infra makefiles
erikj
parents: 12475
diff changeset
  2878
fi