author | shade |
Tue, 01 Sep 2015 12:57:41 +0300 | |
changeset 32467 | 23b29549f8d1 |
parent 31327 | 8c2512d63fac |
child 32921 | 8e0250dfa145 |
permissions | -rw-r--r-- |
13133
701e61c32ece
7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff
changeset
|
1 |
# |
22721
63761da45392
8034788: Rewrite toolchain.m4 to support multiple toolchains per platform.
ihse
parents:
22710
diff
changeset
|
2 |
# Copyright (c) 2011, 2014, Oracle and/or its affiliates. All rights reserved. |
13133
701e61c32ece
7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff
changeset
|
3 |
# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. |
701e61c32ece
7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff
changeset
|
4 |
# |
701e61c32ece
7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff
changeset
|
5 |
# This code is free software; you can redistribute it and/or modify it |
701e61c32ece
7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff
changeset
|
6 |
# under the terms of the GNU General Public License version 2 only, as |
701e61c32ece
7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff
changeset
|
7 |
# published by the Free Software Foundation. Oracle designates this |
701e61c32ece
7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff
changeset
|
8 |
# particular file as subject to the "Classpath" exception as provided |
701e61c32ece
7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff
changeset
|
9 |
# by Oracle in the LICENSE file that accompanied this code. |
701e61c32ece
7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff
changeset
|
10 |
# |
701e61c32ece
7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff
changeset
|
11 |
# This code is distributed in the hope that it will be useful, but WITHOUT |
701e61c32ece
7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff
changeset
|
12 |
# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or |
701e61c32ece
7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff
changeset
|
13 |
# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License |
701e61c32ece
7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff
changeset
|
14 |
# version 2 for more details (a copy is included in the LICENSE file that |
701e61c32ece
7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff
changeset
|
15 |
# accompanied this code). |
701e61c32ece
7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff
changeset
|
16 |
# |
701e61c32ece
7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff
changeset
|
17 |
# You should have received a copy of the GNU General Public License version |
701e61c32ece
7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff
changeset
|
18 |
# 2 along with this work; if not, write to the Free Software Foundation, |
701e61c32ece
7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff
changeset
|
19 |
# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. |
701e61c32ece
7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff
changeset
|
20 |
# |
701e61c32ece
7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff
changeset
|
21 |
# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA |
701e61c32ece
7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff
changeset
|
22 |
# or visit www.oracle.com if you need additional information or have any |
701e61c32ece
7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff
changeset
|
23 |
# questions. |
701e61c32ece
7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff
changeset
|
24 |
# |
701e61c32ece
7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff
changeset
|
25 |
|
701e61c32ece
7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff
changeset
|
26 |
AC_DEFUN_ONCE([LIB_SETUP_INIT], |
701e61c32ece
7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff
changeset
|
27 |
[ |
20363 | 28 |
|
29 |
############################################################################### |
|
30 |
# |
|
31 |
# OS specific settings that we never will need to probe. |
|
32 |
# |
|
33 |
if test "x$OPENJDK_TARGET_OS" = xlinux; then |
|
13133
701e61c32ece
7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff
changeset
|
34 |
AC_MSG_CHECKING([what is not needed on Linux?]) |
701e61c32ece
7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff
changeset
|
35 |
PULSE_NOT_NEEDED=yes |
701e61c32ece
7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff
changeset
|
36 |
AC_MSG_RESULT([pulse]) |
20363 | 37 |
fi |
13133
701e61c32ece
7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff
changeset
|
38 |
|
20363 | 39 |
if test "x$OPENJDK_TARGET_OS" = xsolaris; then |
13133
701e61c32ece
7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff
changeset
|
40 |
AC_MSG_CHECKING([what is not needed on Solaris?]) |
701e61c32ece
7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff
changeset
|
41 |
ALSA_NOT_NEEDED=yes |
701e61c32ece
7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff
changeset
|
42 |
PULSE_NOT_NEEDED=yes |
701e61c32ece
7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff
changeset
|
43 |
AC_MSG_RESULT([alsa pulse]) |
20363 | 44 |
fi |
13133
701e61c32ece
7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff
changeset
|
45 |
|
22467 | 46 |
if test "x$OPENJDK_TARGET_OS" = xaix; then |
22466 | 47 |
AC_MSG_CHECKING([what is not needed on AIX?]) |
48 |
ALSA_NOT_NEEDED=yes |
|
49 |
PULSE_NOT_NEEDED=yes |
|
50 |
AC_MSG_RESULT([alsa pulse]) |
|
22467 | 51 |
fi |
22466 | 52 |
|
53 |
||
20363 | 54 |
if test "x$OPENJDK_TARGET_OS" = xwindows; then |
13133
701e61c32ece
7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff
changeset
|
55 |
AC_MSG_CHECKING([what is not needed on Windows?]) |
20363 | 56 |
CUPS_NOT_NEEDED=yes |
13133
701e61c32ece
7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff
changeset
|
57 |
ALSA_NOT_NEEDED=yes |
701e61c32ece
7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff
changeset
|
58 |
PULSE_NOT_NEEDED=yes |
701e61c32ece
7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff
changeset
|
59 |
X11_NOT_NEEDED=yes |
701e61c32ece
7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff
changeset
|
60 |
AC_MSG_RESULT([alsa cups pulse x11]) |
20363 | 61 |
fi |
13133
701e61c32ece
7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff
changeset
|
62 |
|
20363 | 63 |
if test "x$OPENJDK_TARGET_OS" = xmacosx; then |
13133
701e61c32ece
7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff
changeset
|
64 |
AC_MSG_CHECKING([what is not needed on MacOSX?]) |
701e61c32ece
7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff
changeset
|
65 |
ALSA_NOT_NEEDED=yes |
701e61c32ece
7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff
changeset
|
66 |
PULSE_NOT_NEEDED=yes |
701e61c32ece
7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff
changeset
|
67 |
X11_NOT_NEEDED=yes |
20654 | 68 |
AC_MSG_RESULT([alsa pulse x11]) |
20363 | 69 |
fi |
13133
701e61c32ece
7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff
changeset
|
70 |
|
20363 | 71 |
if test "x$OPENJDK_TARGET_OS" = xbsd; then |
13133
701e61c32ece
7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff
changeset
|
72 |
AC_MSG_CHECKING([what is not needed on bsd?]) |
701e61c32ece
7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff
changeset
|
73 |
ALSA_NOT_NEEDED=yes |
20363 | 74 |
AC_MSG_RESULT([alsa]) |
75 |
fi |
|
13133
701e61c32ece
7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff
changeset
|
76 |
|
20363 | 77 |
if test "x$OPENJDK" = "xfalse"; then |
20654 | 78 |
FREETYPE_NOT_NEEDED=yes |
20363 | 79 |
fi |
13133
701e61c32ece
7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff
changeset
|
80 |
|
20363 | 81 |
if test "x$SUPPORT_HEADFUL" = xno; then |
13697 | 82 |
X11_NOT_NEEDED=yes |
20363 | 83 |
fi |
13133
701e61c32ece
7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff
changeset
|
84 |
]) |
701e61c32ece
7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff
changeset
|
85 |
|
701e61c32ece
7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff
changeset
|
86 |
AC_DEFUN_ONCE([LIB_SETUP_X11], |
701e61c32ece
7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff
changeset
|
87 |
[ |
701e61c32ece
7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff
changeset
|
88 |
|
20363 | 89 |
############################################################################### |
90 |
# |
|
91 |
# Check for X Windows |
|
92 |
# |
|
13133
701e61c32ece
7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff
changeset
|
93 |
|
27330
5e83ad1a521a
8062661: Do not perform X11 checks in configure when X11 is not needed
ihse
parents:
27239
diff
changeset
|
94 |
if test "x$X11_NOT_NEEDED" = xyes; then |
5e83ad1a521a
8062661: Do not perform X11 checks in configure when X11 is not needed
ihse
parents:
27239
diff
changeset
|
95 |
if test "x${with_x}" != x; then |
5e83ad1a521a
8062661: Do not perform X11 checks in configure when X11 is not needed
ihse
parents:
27239
diff
changeset
|
96 |
AC_MSG_WARN([X11 is not used, so --with-x is ignored]) |
5e83ad1a521a
8062661: Do not perform X11 checks in configure when X11 is not needed
ihse
parents:
27239
diff
changeset
|
97 |
fi |
5e83ad1a521a
8062661: Do not perform X11 checks in configure when X11 is not needed
ihse
parents:
27239
diff
changeset
|
98 |
X_CFLAGS= |
5e83ad1a521a
8062661: Do not perform X11 checks in configure when X11 is not needed
ihse
parents:
27239
diff
changeset
|
99 |
X_LIBS= |
5e83ad1a521a
8062661: Do not perform X11 checks in configure when X11 is not needed
ihse
parents:
27239
diff
changeset
|
100 |
else |
5e83ad1a521a
8062661: Do not perform X11 checks in configure when X11 is not needed
ihse
parents:
27239
diff
changeset
|
101 |
# Check if the user has specified sysroot, but not --x-includes or --x-libraries. |
5e83ad1a521a
8062661: Do not perform X11 checks in configure when X11 is not needed
ihse
parents:
27239
diff
changeset
|
102 |
# Make a simple check for the libraries at the sysroot, and setup --x-includes and |
5e83ad1a521a
8062661: Do not perform X11 checks in configure when X11 is not needed
ihse
parents:
27239
diff
changeset
|
103 |
# --x-libraries for the sysroot, if that seems to be correct. |
5e83ad1a521a
8062661: Do not perform X11 checks in configure when X11 is not needed
ihse
parents:
27239
diff
changeset
|
104 |
if test "x$OPENJDK_TARGET_OS" = "xlinux"; then |
5e83ad1a521a
8062661: Do not perform X11 checks in configure when X11 is not needed
ihse
parents:
27239
diff
changeset
|
105 |
if test "x$SYSROOT" != "x"; then |
5e83ad1a521a
8062661: Do not perform X11 checks in configure when X11 is not needed
ihse
parents:
27239
diff
changeset
|
106 |
if test "x$x_includes" = xNONE; then |
5e83ad1a521a
8062661: Do not perform X11 checks in configure when X11 is not needed
ihse
parents:
27239
diff
changeset
|
107 |
if test -f "$SYSROOT/usr/X11R6/include/X11/Xlib.h"; then |
5e83ad1a521a
8062661: Do not perform X11 checks in configure when X11 is not needed
ihse
parents:
27239
diff
changeset
|
108 |
x_includes="$SYSROOT/usr/X11R6/include" |
5e83ad1a521a
8062661: Do not perform X11 checks in configure when X11 is not needed
ihse
parents:
27239
diff
changeset
|
109 |
elif test -f "$SYSROOT/usr/include/X11/Xlib.h"; then |
5e83ad1a521a
8062661: Do not perform X11 checks in configure when X11 is not needed
ihse
parents:
27239
diff
changeset
|
110 |
x_includes="$SYSROOT/usr/include" |
5e83ad1a521a
8062661: Do not perform X11 checks in configure when X11 is not needed
ihse
parents:
27239
diff
changeset
|
111 |
fi |
23428
3c8a05bf4656
8038340: Cleanup and fix sysroot and devkit handling on Linux and Solaris
erikj
parents:
23165
diff
changeset
|
112 |
fi |
27330
5e83ad1a521a
8062661: Do not perform X11 checks in configure when X11 is not needed
ihse
parents:
27239
diff
changeset
|
113 |
if test "x$x_libraries" = xNONE; then |
5e83ad1a521a
8062661: Do not perform X11 checks in configure when X11 is not needed
ihse
parents:
27239
diff
changeset
|
114 |
if test -f "$SYSROOT/usr/X11R6/lib/libX11.so"; then |
5e83ad1a521a
8062661: Do not perform X11 checks in configure when X11 is not needed
ihse
parents:
27239
diff
changeset
|
115 |
x_libraries="$SYSROOT/usr/X11R6/lib" |
31327
8c2512d63fac
8130303: Fix bogus check for libX11.so in libraries.m4
simonis
parents:
28901
diff
changeset
|
116 |
elif test -f "$SYSROOT/usr/lib64/libX11.so" && test "x$OPENJDK_TARGET_CPU_BITS" = x64; then |
27330
5e83ad1a521a
8062661: Do not perform X11 checks in configure when X11 is not needed
ihse
parents:
27239
diff
changeset
|
117 |
x_libraries="$SYSROOT/usr/lib64" |
5e83ad1a521a
8062661: Do not perform X11 checks in configure when X11 is not needed
ihse
parents:
27239
diff
changeset
|
118 |
elif test -f "$SYSROOT/usr/lib/libX11.so"; then |
5e83ad1a521a
8062661: Do not perform X11 checks in configure when X11 is not needed
ihse
parents:
27239
diff
changeset
|
119 |
x_libraries="$SYSROOT/usr/lib" |
5e83ad1a521a
8062661: Do not perform X11 checks in configure when X11 is not needed
ihse
parents:
27239
diff
changeset
|
120 |
fi |
23428
3c8a05bf4656
8038340: Cleanup and fix sysroot and devkit handling on Linux and Solaris
erikj
parents:
23165
diff
changeset
|
121 |
fi |
20363 | 122 |
fi |
13133
701e61c32ece
7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff
changeset
|
123 |
fi |
20363 | 124 |
|
27330
5e83ad1a521a
8062661: Do not perform X11 checks in configure when X11 is not needed
ihse
parents:
27239
diff
changeset
|
125 |
# Now let autoconf do it's magic |
5e83ad1a521a
8062661: Do not perform X11 checks in configure when X11 is not needed
ihse
parents:
27239
diff
changeset
|
126 |
AC_PATH_X |
5e83ad1a521a
8062661: Do not perform X11 checks in configure when X11 is not needed
ihse
parents:
27239
diff
changeset
|
127 |
AC_PATH_XTRA |
13133
701e61c32ece
7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff
changeset
|
128 |
|
27330
5e83ad1a521a
8062661: Do not perform X11 checks in configure when X11 is not needed
ihse
parents:
27239
diff
changeset
|
129 |
# AC_PATH_XTRA creates X_LIBS and sometimes adds -R flags. When cross compiling |
5e83ad1a521a
8062661: Do not perform X11 checks in configure when X11 is not needed
ihse
parents:
27239
diff
changeset
|
130 |
# this doesn't make sense so we remove it. |
5e83ad1a521a
8062661: Do not perform X11 checks in configure when X11 is not needed
ihse
parents:
27239
diff
changeset
|
131 |
if test "x$COMPILE_TYPE" = xcross; then |
5e83ad1a521a
8062661: Do not perform X11 checks in configure when X11 is not needed
ihse
parents:
27239
diff
changeset
|
132 |
X_LIBS=`$ECHO $X_LIBS | $SED 's/-R \{0,1\}[[^ ]]*//g'` |
5e83ad1a521a
8062661: Do not perform X11 checks in configure when X11 is not needed
ihse
parents:
27239
diff
changeset
|
133 |
fi |
13133
701e61c32ece
7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff
changeset
|
134 |
|
27330
5e83ad1a521a
8062661: Do not perform X11 checks in configure when X11 is not needed
ihse
parents:
27239
diff
changeset
|
135 |
if test "x$no_x" = xyes; then |
5e83ad1a521a
8062661: Do not perform X11 checks in configure when X11 is not needed
ihse
parents:
27239
diff
changeset
|
136 |
HELP_MSG_MISSING_DEPENDENCY([x11]) |
5e83ad1a521a
8062661: Do not perform X11 checks in configure when X11 is not needed
ihse
parents:
27239
diff
changeset
|
137 |
AC_MSG_ERROR([Could not find X11 libraries. $HELP_MSG]) |
5e83ad1a521a
8062661: Do not perform X11 checks in configure when X11 is not needed
ihse
parents:
27239
diff
changeset
|
138 |
fi |
13133
701e61c32ece
7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff
changeset
|
139 |
|
27330
5e83ad1a521a
8062661: Do not perform X11 checks in configure when X11 is not needed
ihse
parents:
27239
diff
changeset
|
140 |
if test "x$OPENJDK_TARGET_OS" = xsolaris; then |
5e83ad1a521a
8062661: Do not perform X11 checks in configure when X11 is not needed
ihse
parents:
27239
diff
changeset
|
141 |
OPENWIN_HOME="/usr/openwin" |
5e83ad1a521a
8062661: Do not perform X11 checks in configure when X11 is not needed
ihse
parents:
27239
diff
changeset
|
142 |
X_CFLAGS="-I$SYSROOT$OPENWIN_HOME/include -I$SYSROOT$OPENWIN_HOME/include/X11/extensions" |
5e83ad1a521a
8062661: Do not perform X11 checks in configure when X11 is not needed
ihse
parents:
27239
diff
changeset
|
143 |
X_LIBS="-L$SYSROOT$OPENWIN_HOME/sfw/lib$OPENJDK_TARGET_CPU_ISADIR \ |
5e83ad1a521a
8062661: Do not perform X11 checks in configure when X11 is not needed
ihse
parents:
27239
diff
changeset
|
144 |
-L$SYSROOT$OPENWIN_HOME/lib$OPENJDK_TARGET_CPU_ISADIR \ |
5e83ad1a521a
8062661: Do not perform X11 checks in configure when X11 is not needed
ihse
parents:
27239
diff
changeset
|
145 |
-R$OPENWIN_HOME/sfw/lib$OPENJDK_TARGET_CPU_ISADIR \ |
5e83ad1a521a
8062661: Do not perform X11 checks in configure when X11 is not needed
ihse
parents:
27239
diff
changeset
|
146 |
-R$OPENWIN_HOME/lib$OPENJDK_TARGET_CPU_ISADIR" |
5e83ad1a521a
8062661: Do not perform X11 checks in configure when X11 is not needed
ihse
parents:
27239
diff
changeset
|
147 |
fi |
5e83ad1a521a
8062661: Do not perform X11 checks in configure when X11 is not needed
ihse
parents:
27239
diff
changeset
|
148 |
|
5e83ad1a521a
8062661: Do not perform X11 checks in configure when X11 is not needed
ihse
parents:
27239
diff
changeset
|
149 |
AC_LANG_PUSH(C) |
5e83ad1a521a
8062661: Do not perform X11 checks in configure when X11 is not needed
ihse
parents:
27239
diff
changeset
|
150 |
OLD_CFLAGS="$CFLAGS" |
5e83ad1a521a
8062661: Do not perform X11 checks in configure when X11 is not needed
ihse
parents:
27239
diff
changeset
|
151 |
CFLAGS="$CFLAGS $SYSROOT_CFLAGS $X_CFLAGS" |
13133
701e61c32ece
7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff
changeset
|
152 |
|
27330
5e83ad1a521a
8062661: Do not perform X11 checks in configure when X11 is not needed
ihse
parents:
27239
diff
changeset
|
153 |
# Need to include Xlib.h and Xutil.h to avoid "present but cannot be compiled" warnings on Solaris 10 |
5e83ad1a521a
8062661: Do not perform X11 checks in configure when X11 is not needed
ihse
parents:
27239
diff
changeset
|
154 |
AC_CHECK_HEADERS([X11/extensions/shape.h X11/extensions/Xrender.h X11/extensions/XTest.h X11/Intrinsic.h], |
5e83ad1a521a
8062661: Do not perform X11 checks in configure when X11 is not needed
ihse
parents:
27239
diff
changeset
|
155 |
[X11_HEADERS_OK=yes], |
5e83ad1a521a
8062661: Do not perform X11 checks in configure when X11 is not needed
ihse
parents:
27239
diff
changeset
|
156 |
[X11_HEADERS_OK=no; break], |
5e83ad1a521a
8062661: Do not perform X11 checks in configure when X11 is not needed
ihse
parents:
27239
diff
changeset
|
157 |
[ |
5e83ad1a521a
8062661: Do not perform X11 checks in configure when X11 is not needed
ihse
parents:
27239
diff
changeset
|
158 |
# include <X11/Xlib.h> |
5e83ad1a521a
8062661: Do not perform X11 checks in configure when X11 is not needed
ihse
parents:
27239
diff
changeset
|
159 |
# include <X11/Xutil.h> |
5e83ad1a521a
8062661: Do not perform X11 checks in configure when X11 is not needed
ihse
parents:
27239
diff
changeset
|
160 |
] |
5e83ad1a521a
8062661: Do not perform X11 checks in configure when X11 is not needed
ihse
parents:
27239
diff
changeset
|
161 |
) |
14111 | 162 |
|
27330
5e83ad1a521a
8062661: Do not perform X11 checks in configure when X11 is not needed
ihse
parents:
27239
diff
changeset
|
163 |
if test "x$X11_HEADERS_OK" = xno; then |
5e83ad1a521a
8062661: Do not perform X11 checks in configure when X11 is not needed
ihse
parents:
27239
diff
changeset
|
164 |
HELP_MSG_MISSING_DEPENDENCY([x11]) |
5e83ad1a521a
8062661: Do not perform X11 checks in configure when X11 is not needed
ihse
parents:
27239
diff
changeset
|
165 |
AC_MSG_ERROR([Could not find all X11 headers (shape.h Xrender.h XTest.h Intrinsic.h). $HELP_MSG]) |
5e83ad1a521a
8062661: Do not perform X11 checks in configure when X11 is not needed
ihse
parents:
27239
diff
changeset
|
166 |
fi |
27239 | 167 |
|
27330
5e83ad1a521a
8062661: Do not perform X11 checks in configure when X11 is not needed
ihse
parents:
27239
diff
changeset
|
168 |
# If XLinearGradient isn't available in Xrender.h, signal that it needs to be |
5e83ad1a521a
8062661: Do not perform X11 checks in configure when X11 is not needed
ihse
parents:
27239
diff
changeset
|
169 |
# defined in libawt_xawt. |
5e83ad1a521a
8062661: Do not perform X11 checks in configure when X11 is not needed
ihse
parents:
27239
diff
changeset
|
170 |
AC_MSG_CHECKING([if XlinearGradient is defined in Xrender.h]) |
5e83ad1a521a
8062661: Do not perform X11 checks in configure when X11 is not needed
ihse
parents:
27239
diff
changeset
|
171 |
AC_COMPILE_IFELSE( |
5e83ad1a521a
8062661: Do not perform X11 checks in configure when X11 is not needed
ihse
parents:
27239
diff
changeset
|
172 |
[AC_LANG_PROGRAM([[#include <X11/extensions/Xrender.h>]], |
5e83ad1a521a
8062661: Do not perform X11 checks in configure when X11 is not needed
ihse
parents:
27239
diff
changeset
|
173 |
[[XLinearGradient x;]])], |
5e83ad1a521a
8062661: Do not perform X11 checks in configure when X11 is not needed
ihse
parents:
27239
diff
changeset
|
174 |
[AC_MSG_RESULT([yes])], |
5e83ad1a521a
8062661: Do not perform X11 checks in configure when X11 is not needed
ihse
parents:
27239
diff
changeset
|
175 |
[AC_MSG_RESULT([no]) |
5e83ad1a521a
8062661: Do not perform X11 checks in configure when X11 is not needed
ihse
parents:
27239
diff
changeset
|
176 |
X_CFLAGS="$X_CFLAGS -DSOLARIS10_NO_XRENDER_STRUCTS"]) |
14111 | 177 |
|
27330
5e83ad1a521a
8062661: Do not perform X11 checks in configure when X11 is not needed
ihse
parents:
27239
diff
changeset
|
178 |
CFLAGS="$OLD_CFLAGS" |
5e83ad1a521a
8062661: Do not perform X11 checks in configure when X11 is not needed
ihse
parents:
27239
diff
changeset
|
179 |
AC_LANG_POP(C) |
5e83ad1a521a
8062661: Do not perform X11 checks in configure when X11 is not needed
ihse
parents:
27239
diff
changeset
|
180 |
fi # X11_NOT_NEEDED |
13133
701e61c32ece
7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff
changeset
|
181 |
|
20363 | 182 |
AC_SUBST(X_CFLAGS) |
183 |
AC_SUBST(X_LIBS) |
|
13133
701e61c32ece
7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff
changeset
|
184 |
]) |
701e61c32ece
7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff
changeset
|
185 |
|
701e61c32ece
7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff
changeset
|
186 |
AC_DEFUN_ONCE([LIB_SETUP_CUPS], |
701e61c32ece
7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff
changeset
|
187 |
[ |
701e61c32ece
7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff
changeset
|
188 |
|
20363 | 189 |
############################################################################### |
190 |
# |
|
191 |
# The common unix printing system cups is used to print from java. |
|
192 |
# |
|
193 |
AC_ARG_WITH(cups, [AS_HELP_STRING([--with-cups], |
|
194 |
[specify prefix directory for the cups package |
|
195 |
(expecting the headers under PATH/include)])]) |
|
196 |
AC_ARG_WITH(cups-include, [AS_HELP_STRING([--with-cups-include], |
|
197 |
[specify directory for the cups include files])]) |
|
13133
701e61c32ece
7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff
changeset
|
198 |
|
20363 | 199 |
if test "x$CUPS_NOT_NEEDED" = xyes; then |
200 |
if test "x${with_cups}" != x || test "x${with_cups_include}" != x; then |
|
201 |
AC_MSG_WARN([cups not used, so --with-cups is ignored]) |
|
202 |
fi |
|
203 |
CUPS_CFLAGS= |
|
204 |
else |
|
205 |
CUPS_FOUND=no |
|
13133
701e61c32ece
7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff
changeset
|
206 |
|
20363 | 207 |
if test "x${with_cups}" = xno || test "x${with_cups_include}" = xno; then |
208 |
AC_MSG_ERROR([It is not possible to disable the use of cups. Remove the --without-cups option.]) |
|
209 |
fi |
|
13133
701e61c32ece
7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff
changeset
|
210 |
|
20363 | 211 |
if test "x${with_cups}" != x; then |
212 |
CUPS_CFLAGS="-I${with_cups}/include" |
|
213 |
CUPS_FOUND=yes |
|
214 |
fi |
|
215 |
if test "x${with_cups_include}" != x; then |
|
216 |
CUPS_CFLAGS="-I${with_cups_include}" |
|
217 |
CUPS_FOUND=yes |
|
218 |
fi |
|
219 |
if test "x$CUPS_FOUND" = xno; then |
|
220 |
BDEPS_CHECK_MODULE(CUPS, cups, xxx, [CUPS_FOUND=yes]) |
|
221 |
fi |
|
222 |
if test "x$CUPS_FOUND" = xno; then |
|
223 |
# Are the cups headers installed in the default /usr/include location? |
|
224 |
AC_CHECK_HEADERS([cups/cups.h cups/ppd.h], |
|
225 |
[ |
|
226 |
CUPS_FOUND=yes |
|
227 |
CUPS_CFLAGS= |
|
228 |
DEFAULT_CUPS=yes |
|
229 |
] |
|
230 |
) |
|
231 |
fi |
|
232 |
if test "x$CUPS_FOUND" = xno; then |
|
233 |
# Getting nervous now? Lets poke around for standard Solaris third-party |
|
234 |
# package installation locations. |
|
235 |
AC_MSG_CHECKING([for cups headers]) |
|
23428
3c8a05bf4656
8038340: Cleanup and fix sysroot and devkit handling on Linux and Solaris
erikj
parents:
23165
diff
changeset
|
236 |
if test -s $SYSROOT/opt/sfw/cups/include/cups/cups.h; then |
20363 | 237 |
# An SFW package seems to be installed! |
238 |
CUPS_FOUND=yes |
|
23428
3c8a05bf4656
8038340: Cleanup and fix sysroot and devkit handling on Linux and Solaris
erikj
parents:
23165
diff
changeset
|
239 |
CUPS_CFLAGS="-I$SYSROOT/opt/sfw/cups/include" |
3c8a05bf4656
8038340: Cleanup and fix sysroot and devkit handling on Linux and Solaris
erikj
parents:
23165
diff
changeset
|
240 |
elif test -s $SYSROOT/opt/csw/include/cups/cups.h; then |
20363 | 241 |
# A CSW package seems to be installed! |
242 |
CUPS_FOUND=yes |
|
23428
3c8a05bf4656
8038340: Cleanup and fix sysroot and devkit handling on Linux and Solaris
erikj
parents:
23165
diff
changeset
|
243 |
CUPS_CFLAGS="-I$SYSROOT/opt/csw/include" |
20363 | 244 |
fi |
245 |
AC_MSG_RESULT([$CUPS_FOUND]) |
|
246 |
fi |
|
247 |
if test "x$CUPS_FOUND" = xno; then |
|
248 |
HELP_MSG_MISSING_DEPENDENCY([cups]) |
|
249 |
AC_MSG_ERROR([Could not find cups! $HELP_MSG ]) |
|
250 |
fi |
|
251 |
fi |
|
13133
701e61c32ece
7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff
changeset
|
252 |
|
20363 | 253 |
AC_SUBST(CUPS_CFLAGS) |
13133
701e61c32ece
7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff
changeset
|
254 |
|
701e61c32ece
7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff
changeset
|
255 |
]) |
701e61c32ece
7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff
changeset
|
256 |
|
26400
4d6c6f2df610
8057538: Build the freetype library during configure on Windows
simonis
parents:
25039
diff
changeset
|
257 |
AC_DEFUN([LIB_BUILD_FREETYPE], |
4d6c6f2df610
8057538: Build the freetype library during configure on Windows
simonis
parents:
25039
diff
changeset
|
258 |
[ |
4d6c6f2df610
8057538: Build the freetype library during configure on Windows
simonis
parents:
25039
diff
changeset
|
259 |
FREETYPE_SRC_PATH="$1" |
4d6c6f2df610
8057538: Build the freetype library during configure on Windows
simonis
parents:
25039
diff
changeset
|
260 |
BUILD_FREETYPE=yes |
4d6c6f2df610
8057538: Build the freetype library during configure on Windows
simonis
parents:
25039
diff
changeset
|
261 |
|
4d6c6f2df610
8057538: Build the freetype library during configure on Windows
simonis
parents:
25039
diff
changeset
|
262 |
# Check if the freetype sources are acessible.. |
4d6c6f2df610
8057538: Build the freetype library during configure on Windows
simonis
parents:
25039
diff
changeset
|
263 |
if ! test -d $FREETYPE_SRC_PATH; then |
4d6c6f2df610
8057538: Build the freetype library during configure on Windows
simonis
parents:
25039
diff
changeset
|
264 |
AC_MSG_WARN([--with-freetype-src specified, but can't find path "$FREETYPE_SRC_PATH" - ignoring --with-freetype-src]) |
4d6c6f2df610
8057538: Build the freetype library during configure on Windows
simonis
parents:
25039
diff
changeset
|
265 |
BUILD_FREETYPE=no |
4d6c6f2df610
8057538: Build the freetype library during configure on Windows
simonis
parents:
25039
diff
changeset
|
266 |
fi |
4d6c6f2df610
8057538: Build the freetype library during configure on Windows
simonis
parents:
25039
diff
changeset
|
267 |
# ..and contain a vc2010 project file |
4d6c6f2df610
8057538: Build the freetype library during configure on Windows
simonis
parents:
25039
diff
changeset
|
268 |
vcxproj_path="$FREETYPE_SRC_PATH/builds/windows/vc2010/freetype.vcxproj" |
4d6c6f2df610
8057538: Build the freetype library during configure on Windows
simonis
parents:
25039
diff
changeset
|
269 |
if test "x$BUILD_FREETYPE" = xyes && ! test -s $vcxproj_path; then |
4d6c6f2df610
8057538: Build the freetype library during configure on Windows
simonis
parents:
25039
diff
changeset
|
270 |
AC_MSG_WARN([Can't find project file $vcxproj_path (you may try a newer freetype version) - ignoring --with-freetype-src]) |
4d6c6f2df610
8057538: Build the freetype library during configure on Windows
simonis
parents:
25039
diff
changeset
|
271 |
BUILD_FREETYPE=no |
4d6c6f2df610
8057538: Build the freetype library during configure on Windows
simonis
parents:
25039
diff
changeset
|
272 |
fi |
4d6c6f2df610
8057538: Build the freetype library during configure on Windows
simonis
parents:
25039
diff
changeset
|
273 |
# Now check if configure found a version of 'msbuild.exe' |
4d6c6f2df610
8057538: Build the freetype library during configure on Windows
simonis
parents:
25039
diff
changeset
|
274 |
if test "x$BUILD_FREETYPE" = xyes && test "x$MSBUILD" == x ; then |
27331
3947187af23d
8062816: Fix configure freetype detection on Mac OS X Yosemite
ihse
parents:
27330
diff
changeset
|
275 |
AC_MSG_WARN([Can not find an msbuild.exe executable (you may try to install .NET 4.0) - ignoring --with-freetype-src]) |
26400
4d6c6f2df610
8057538: Build the freetype library during configure on Windows
simonis
parents:
25039
diff
changeset
|
276 |
BUILD_FREETYPE=no |
4d6c6f2df610
8057538: Build the freetype library during configure on Windows
simonis
parents:
25039
diff
changeset
|
277 |
fi |
4d6c6f2df610
8057538: Build the freetype library during configure on Windows
simonis
parents:
25039
diff
changeset
|
278 |
|
4d6c6f2df610
8057538: Build the freetype library during configure on Windows
simonis
parents:
25039
diff
changeset
|
279 |
# Ready to go.. |
4d6c6f2df610
8057538: Build the freetype library during configure on Windows
simonis
parents:
25039
diff
changeset
|
280 |
if test "x$BUILD_FREETYPE" = xyes; then |
4d6c6f2df610
8057538: Build the freetype library during configure on Windows
simonis
parents:
25039
diff
changeset
|
281 |
|
4d6c6f2df610
8057538: Build the freetype library during configure on Windows
simonis
parents:
25039
diff
changeset
|
282 |
# msbuild requires trailing slashes for output directories |
4d6c6f2df610
8057538: Build the freetype library during configure on Windows
simonis
parents:
25039
diff
changeset
|
283 |
freetype_lib_path="$FREETYPE_SRC_PATH/lib$OPENJDK_TARGET_CPU_BITS/" |
4d6c6f2df610
8057538: Build the freetype library during configure on Windows
simonis
parents:
25039
diff
changeset
|
284 |
freetype_lib_path_unix="$freetype_lib_path" |
4d6c6f2df610
8057538: Build the freetype library during configure on Windows
simonis
parents:
25039
diff
changeset
|
285 |
freetype_obj_path="$FREETYPE_SRC_PATH/obj$OPENJDK_TARGET_CPU_BITS/" |
4d6c6f2df610
8057538: Build the freetype library during configure on Windows
simonis
parents:
25039
diff
changeset
|
286 |
BASIC_WINDOWS_REWRITE_AS_WINDOWS_MIXED_PATH(vcxproj_path) |
4d6c6f2df610
8057538: Build the freetype library during configure on Windows
simonis
parents:
25039
diff
changeset
|
287 |
BASIC_WINDOWS_REWRITE_AS_WINDOWS_MIXED_PATH(freetype_lib_path) |
4d6c6f2df610
8057538: Build the freetype library during configure on Windows
simonis
parents:
25039
diff
changeset
|
288 |
BASIC_WINDOWS_REWRITE_AS_WINDOWS_MIXED_PATH(freetype_obj_path) |
4d6c6f2df610
8057538: Build the freetype library during configure on Windows
simonis
parents:
25039
diff
changeset
|
289 |
if test "x$OPENJDK_TARGET_CPU_BITS" = x64; then |
4d6c6f2df610
8057538: Build the freetype library during configure on Windows
simonis
parents:
25039
diff
changeset
|
290 |
freetype_platform=x64 |
4d6c6f2df610
8057538: Build the freetype library during configure on Windows
simonis
parents:
25039
diff
changeset
|
291 |
else |
4d6c6f2df610
8057538: Build the freetype library during configure on Windows
simonis
parents:
25039
diff
changeset
|
292 |
freetype_platform=win32 |
4d6c6f2df610
8057538: Build the freetype library during configure on Windows
simonis
parents:
25039
diff
changeset
|
293 |
fi |
4d6c6f2df610
8057538: Build the freetype library during configure on Windows
simonis
parents:
25039
diff
changeset
|
294 |
|
4d6c6f2df610
8057538: Build the freetype library during configure on Windows
simonis
parents:
25039
diff
changeset
|
295 |
# The original freetype project file is for VS 2010 (i.e. 'v100'), |
4d6c6f2df610
8057538: Build the freetype library during configure on Windows
simonis
parents:
25039
diff
changeset
|
296 |
# so we have to adapt the toolset if building with any other toolsed (i.e. SDK). |
4d6c6f2df610
8057538: Build the freetype library during configure on Windows
simonis
parents:
25039
diff
changeset
|
297 |
# Currently 'PLATFORM_TOOLSET' is set in 'TOOLCHAIN_CHECK_POSSIBLE_VISUAL_STUDIO_ROOT'/ |
4d6c6f2df610
8057538: Build the freetype library during configure on Windows
simonis
parents:
25039
diff
changeset
|
298 |
# 'TOOLCHAIN_CHECK_POSSIBLE_WIN_SDK_ROOT' in toolchain_windows.m4 |
4d6c6f2df610
8057538: Build the freetype library during configure on Windows
simonis
parents:
25039
diff
changeset
|
299 |
AC_MSG_NOTICE([Trying to compile freetype sources with PlatformToolset=$PLATFORM_TOOLSET to $freetype_lib_path_unix ...]) |
4d6c6f2df610
8057538: Build the freetype library during configure on Windows
simonis
parents:
25039
diff
changeset
|
300 |
|
4d6c6f2df610
8057538: Build the freetype library during configure on Windows
simonis
parents:
25039
diff
changeset
|
301 |
# First we try to build the freetype.dll |
4d6c6f2df610
8057538: Build the freetype library during configure on Windows
simonis
parents:
25039
diff
changeset
|
302 |
$ECHO -e "@echo off\n"\ |
4d6c6f2df610
8057538: Build the freetype library during configure on Windows
simonis
parents:
25039
diff
changeset
|
303 |
"$MSBUILD $vcxproj_path "\ |
4d6c6f2df610
8057538: Build the freetype library during configure on Windows
simonis
parents:
25039
diff
changeset
|
304 |
"/p:PlatformToolset=$PLATFORM_TOOLSET "\ |
4d6c6f2df610
8057538: Build the freetype library during configure on Windows
simonis
parents:
25039
diff
changeset
|
305 |
"/p:Configuration=\"Release Multithreaded\" "\ |
4d6c6f2df610
8057538: Build the freetype library during configure on Windows
simonis
parents:
25039
diff
changeset
|
306 |
"/p:Platform=$freetype_platform "\ |
4d6c6f2df610
8057538: Build the freetype library during configure on Windows
simonis
parents:
25039
diff
changeset
|
307 |
"/p:ConfigurationType=DynamicLibrary "\ |
4d6c6f2df610
8057538: Build the freetype library during configure on Windows
simonis
parents:
25039
diff
changeset
|
308 |
"/p:TargetName=freetype "\ |
4d6c6f2df610
8057538: Build the freetype library during configure on Windows
simonis
parents:
25039
diff
changeset
|
309 |
"/p:OutDir=\"$freetype_lib_path\" "\ |
4d6c6f2df610
8057538: Build the freetype library during configure on Windows
simonis
parents:
25039
diff
changeset
|
310 |
"/p:IntDir=\"$freetype_obj_path\" > freetype.log" > freetype.bat |
4d6c6f2df610
8057538: Build the freetype library during configure on Windows
simonis
parents:
25039
diff
changeset
|
311 |
cmd /c freetype.bat |
4d6c6f2df610
8057538: Build the freetype library during configure on Windows
simonis
parents:
25039
diff
changeset
|
312 |
|
4d6c6f2df610
8057538: Build the freetype library during configure on Windows
simonis
parents:
25039
diff
changeset
|
313 |
if test -s "$freetype_lib_path_unix/freetype.dll"; then |
4d6c6f2df610
8057538: Build the freetype library during configure on Windows
simonis
parents:
25039
diff
changeset
|
314 |
# If that succeeds we also build freetype.lib |
4d6c6f2df610
8057538: Build the freetype library during configure on Windows
simonis
parents:
25039
diff
changeset
|
315 |
$ECHO -e "@echo off\n"\ |
4d6c6f2df610
8057538: Build the freetype library during configure on Windows
simonis
parents:
25039
diff
changeset
|
316 |
"$MSBUILD $vcxproj_path "\ |
4d6c6f2df610
8057538: Build the freetype library during configure on Windows
simonis
parents:
25039
diff
changeset
|
317 |
"/p:PlatformToolset=$PLATFORM_TOOLSET "\ |
4d6c6f2df610
8057538: Build the freetype library during configure on Windows
simonis
parents:
25039
diff
changeset
|
318 |
"/p:Configuration=\"Release Multithreaded\" "\ |
4d6c6f2df610
8057538: Build the freetype library during configure on Windows
simonis
parents:
25039
diff
changeset
|
319 |
"/p:Platform=$freetype_platform "\ |
4d6c6f2df610
8057538: Build the freetype library during configure on Windows
simonis
parents:
25039
diff
changeset
|
320 |
"/p:ConfigurationType=StaticLibrary "\ |
4d6c6f2df610
8057538: Build the freetype library during configure on Windows
simonis
parents:
25039
diff
changeset
|
321 |
"/p:TargetName=freetype "\ |
4d6c6f2df610
8057538: Build the freetype library during configure on Windows
simonis
parents:
25039
diff
changeset
|
322 |
"/p:OutDir=\"$freetype_lib_path\" "\ |
4d6c6f2df610
8057538: Build the freetype library during configure on Windows
simonis
parents:
25039
diff
changeset
|
323 |
"/p:IntDir=\"$freetype_obj_path\" >> freetype.log" > freetype.bat |
4d6c6f2df610
8057538: Build the freetype library during configure on Windows
simonis
parents:
25039
diff
changeset
|
324 |
cmd /c freetype.bat |
4d6c6f2df610
8057538: Build the freetype library during configure on Windows
simonis
parents:
25039
diff
changeset
|
325 |
|
4d6c6f2df610
8057538: Build the freetype library during configure on Windows
simonis
parents:
25039
diff
changeset
|
326 |
if test -s "$freetype_lib_path_unix/freetype.lib"; then |
4d6c6f2df610
8057538: Build the freetype library during configure on Windows
simonis
parents:
25039
diff
changeset
|
327 |
# Once we build both, lib and dll, set freetype lib and include path appropriately |
4d6c6f2df610
8057538: Build the freetype library during configure on Windows
simonis
parents:
25039
diff
changeset
|
328 |
POTENTIAL_FREETYPE_INCLUDE_PATH="$FREETYPE_SRC_PATH/include" |
4d6c6f2df610
8057538: Build the freetype library during configure on Windows
simonis
parents:
25039
diff
changeset
|
329 |
POTENTIAL_FREETYPE_LIB_PATH="$freetype_lib_path_unix" |
4d6c6f2df610
8057538: Build the freetype library during configure on Windows
simonis
parents:
25039
diff
changeset
|
330 |
AC_MSG_NOTICE([Compiling freetype sources succeeded! (see freetype.log for build results)]) |
4d6c6f2df610
8057538: Build the freetype library during configure on Windows
simonis
parents:
25039
diff
changeset
|
331 |
else |
4d6c6f2df610
8057538: Build the freetype library during configure on Windows
simonis
parents:
25039
diff
changeset
|
332 |
BUILD_FREETYPE=no |
4d6c6f2df610
8057538: Build the freetype library during configure on Windows
simonis
parents:
25039
diff
changeset
|
333 |
fi |
4d6c6f2df610
8057538: Build the freetype library during configure on Windows
simonis
parents:
25039
diff
changeset
|
334 |
else |
4d6c6f2df610
8057538: Build the freetype library during configure on Windows
simonis
parents:
25039
diff
changeset
|
335 |
BUILD_FREETYPE=no |
4d6c6f2df610
8057538: Build the freetype library during configure on Windows
simonis
parents:
25039
diff
changeset
|
336 |
fi |
4d6c6f2df610
8057538: Build the freetype library during configure on Windows
simonis
parents:
25039
diff
changeset
|
337 |
fi |
4d6c6f2df610
8057538: Build the freetype library during configure on Windows
simonis
parents:
25039
diff
changeset
|
338 |
]) |
4d6c6f2df610
8057538: Build the freetype library during configure on Windows
simonis
parents:
25039
diff
changeset
|
339 |
|
20654 | 340 |
AC_DEFUN([LIB_CHECK_POTENTIAL_FREETYPE], |
341 |
[ |
|
342 |
POTENTIAL_FREETYPE_INCLUDE_PATH="$1" |
|
343 |
POTENTIAL_FREETYPE_LIB_PATH="$2" |
|
344 |
METHOD="$3" |
|
26400
4d6c6f2df610
8057538: Build the freetype library during configure on Windows
simonis
parents:
25039
diff
changeset
|
345 |
|
27331
3947187af23d
8062816: Fix configure freetype detection on Mac OS X Yosemite
ihse
parents:
27330
diff
changeset
|
346 |
# Let's start with an optimistic view of the world :-) |
3947187af23d
8062816: Fix configure freetype detection on Mac OS X Yosemite
ihse
parents:
27330
diff
changeset
|
347 |
FOUND_FREETYPE=yes |
3947187af23d
8062816: Fix configure freetype detection on Mac OS X Yosemite
ihse
parents:
27330
diff
changeset
|
348 |
|
3947187af23d
8062816: Fix configure freetype detection on Mac OS X Yosemite
ihse
parents:
27330
diff
changeset
|
349 |
# First look for the canonical freetype main include file ft2build.h. |
3947187af23d
8062816: Fix configure freetype detection on Mac OS X Yosemite
ihse
parents:
27330
diff
changeset
|
350 |
if ! test -s "$POTENTIAL_FREETYPE_INCLUDE_PATH/ft2build.h"; then |
3947187af23d
8062816: Fix configure freetype detection on Mac OS X Yosemite
ihse
parents:
27330
diff
changeset
|
351 |
# Oh no! Let's try in the freetype2 directory. This is needed at least at Mac OS X Yosemite. |
3947187af23d
8062816: Fix configure freetype detection on Mac OS X Yosemite
ihse
parents:
27330
diff
changeset
|
352 |
POTENTIAL_FREETYPE_INCLUDE_PATH="$POTENTIAL_FREETYPE_INCLUDE_PATH/freetype2" |
3947187af23d
8062816: Fix configure freetype detection on Mac OS X Yosemite
ihse
parents:
27330
diff
changeset
|
353 |
if ! test -s "$POTENTIAL_FREETYPE_INCLUDE_PATH/ft2build.h"; then |
3947187af23d
8062816: Fix configure freetype detection on Mac OS X Yosemite
ihse
parents:
27330
diff
changeset
|
354 |
# Fail. |
3947187af23d
8062816: Fix configure freetype detection on Mac OS X Yosemite
ihse
parents:
27330
diff
changeset
|
355 |
FOUND_FREETYPE=no |
3947187af23d
8062816: Fix configure freetype detection on Mac OS X Yosemite
ihse
parents:
27330
diff
changeset
|
356 |
fi |
3947187af23d
8062816: Fix configure freetype detection on Mac OS X Yosemite
ihse
parents:
27330
diff
changeset
|
357 |
fi |
27595
cff167b3bfa2
8065914: Various improvements and cleanup of build system
ihse
parents:
27331
diff
changeset
|
358 |
|
27331
3947187af23d
8062816: Fix configure freetype detection on Mac OS X Yosemite
ihse
parents:
27330
diff
changeset
|
359 |
if test "x$FOUND_FREETYPE" = xyes; then |
3947187af23d
8062816: Fix configure freetype detection on Mac OS X Yosemite
ihse
parents:
27330
diff
changeset
|
360 |
# Include file found, let's continue the sanity check. |
20654 | 361 |
AC_MSG_NOTICE([Found freetype include files at $POTENTIAL_FREETYPE_INCLUDE_PATH using $METHOD]) |
362 |
||
27331
3947187af23d
8062816: Fix configure freetype detection on Mac OS X Yosemite
ihse
parents:
27330
diff
changeset
|
363 |
# Reset to default value |
3947187af23d
8062816: Fix configure freetype detection on Mac OS X Yosemite
ihse
parents:
27330
diff
changeset
|
364 |
FREETYPE_BASE_NAME=freetype |
3947187af23d
8062816: Fix configure freetype detection on Mac OS X Yosemite
ihse
parents:
27330
diff
changeset
|
365 |
FREETYPE_LIB_NAME="${LIBRARY_PREFIX}${FREETYPE_BASE_NAME}${SHARED_LIBRARY_SUFFIX}" |
20654 | 366 |
if ! test -s "$POTENTIAL_FREETYPE_LIB_PATH/$FREETYPE_LIB_NAME"; then |
27331
3947187af23d
8062816: Fix configure freetype detection on Mac OS X Yosemite
ihse
parents:
27330
diff
changeset
|
367 |
if test "x$OPENJDK_TARGET_OS" = xmacosx \ |
3947187af23d
8062816: Fix configure freetype detection on Mac OS X Yosemite
ihse
parents:
27330
diff
changeset
|
368 |
&& test -s "$POTENTIAL_FREETYPE_LIB_PATH/${LIBRARY_PREFIX}freetype.6${SHARED_LIBRARY_SUFFIX}"; then |
3947187af23d
8062816: Fix configure freetype detection on Mac OS X Yosemite
ihse
parents:
27330
diff
changeset
|
369 |
# On Mac OS X Yosemite, the symlink from libfreetype.dylib to libfreetype.6.dylib disappeared. Check |
3947187af23d
8062816: Fix configure freetype detection on Mac OS X Yosemite
ihse
parents:
27330
diff
changeset
|
370 |
# for the .6 version explicitly. |
3947187af23d
8062816: Fix configure freetype detection on Mac OS X Yosemite
ihse
parents:
27330
diff
changeset
|
371 |
FREETYPE_BASE_NAME=freetype.6 |
3947187af23d
8062816: Fix configure freetype detection on Mac OS X Yosemite
ihse
parents:
27330
diff
changeset
|
372 |
FREETYPE_LIB_NAME="${LIBRARY_PREFIX}${FREETYPE_BASE_NAME}${SHARED_LIBRARY_SUFFIX}" |
3947187af23d
8062816: Fix configure freetype detection on Mac OS X Yosemite
ihse
parents:
27330
diff
changeset
|
373 |
AC_MSG_NOTICE([Compensating for missing symlink by using version 6 explicitly]) |
3947187af23d
8062816: Fix configure freetype detection on Mac OS X Yosemite
ihse
parents:
27330
diff
changeset
|
374 |
else |
3947187af23d
8062816: Fix configure freetype detection on Mac OS X Yosemite
ihse
parents:
27330
diff
changeset
|
375 |
AC_MSG_NOTICE([Could not find $POTENTIAL_FREETYPE_LIB_PATH/$FREETYPE_LIB_NAME. Ignoring location.]) |
3947187af23d
8062816: Fix configure freetype detection on Mac OS X Yosemite
ihse
parents:
27330
diff
changeset
|
376 |
FOUND_FREETYPE=no |
3947187af23d
8062816: Fix configure freetype detection on Mac OS X Yosemite
ihse
parents:
27330
diff
changeset
|
377 |
fi |
20654 | 378 |
else |
379 |
if test "x$OPENJDK_TARGET_OS" = xwindows; then |
|
380 |
# On Windows, we will need both .lib and .dll file. |
|
27331
3947187af23d
8062816: Fix configure freetype detection on Mac OS X Yosemite
ihse
parents:
27330
diff
changeset
|
381 |
if ! test -s "$POTENTIAL_FREETYPE_LIB_PATH/${FREETYPE_BASE_NAME}.lib"; then |
3947187af23d
8062816: Fix configure freetype detection on Mac OS X Yosemite
ihse
parents:
27330
diff
changeset
|
382 |
AC_MSG_NOTICE([Could not find $POTENTIAL_FREETYPE_LIB_PATH/${FREETYPE_BASE_NAME}.lib. Ignoring location.]) |
20654 | 383 |
FOUND_FREETYPE=no |
384 |
fi |
|
24081
f98557ef4bf8
8042213: Freetype detection fails on Solaris sparcv9 when using devkit
erikj
parents:
23428
diff
changeset
|
385 |
elif test "x$OPENJDK_TARGET_OS" = xsolaris \ |
f98557ef4bf8
8042213: Freetype detection fails on Solaris sparcv9 when using devkit
erikj
parents:
23428
diff
changeset
|
386 |
&& test -s "$POTENTIAL_FREETYPE_LIB_PATH$OPENJDK_TARGET_CPU_ISADIR/$FREETYPE_LIB_NAME"; then |
f98557ef4bf8
8042213: Freetype detection fails on Solaris sparcv9 when using devkit
erikj
parents:
23428
diff
changeset
|
387 |
# Found lib in isa dir, use that instead. |
f98557ef4bf8
8042213: Freetype detection fails on Solaris sparcv9 when using devkit
erikj
parents:
23428
diff
changeset
|
388 |
POTENTIAL_FREETYPE_LIB_PATH="$POTENTIAL_FREETYPE_LIB_PATH$OPENJDK_TARGET_CPU_ISADIR" |
27331
3947187af23d
8062816: Fix configure freetype detection on Mac OS X Yosemite
ihse
parents:
27330
diff
changeset
|
389 |
AC_MSG_NOTICE([Rewriting to use $POTENTIAL_FREETYPE_LIB_PATH instead]) |
20654 | 390 |
fi |
391 |
fi |
|
392 |
fi |
|
393 |
||
394 |
if test "x$FOUND_FREETYPE" = xyes; then |
|
395 |
BASIC_FIXUP_PATH(POTENTIAL_FREETYPE_INCLUDE_PATH) |
|
396 |
BASIC_FIXUP_PATH(POTENTIAL_FREETYPE_LIB_PATH) |
|
397 |
||
398 |
FREETYPE_INCLUDE_PATH="$POTENTIAL_FREETYPE_INCLUDE_PATH" |
|
399 |
AC_MSG_CHECKING([for freetype includes]) |
|
400 |
AC_MSG_RESULT([$FREETYPE_INCLUDE_PATH]) |
|
401 |
FREETYPE_LIB_PATH="$POTENTIAL_FREETYPE_LIB_PATH" |
|
402 |
AC_MSG_CHECKING([for freetype libraries]) |
|
403 |
AC_MSG_RESULT([$FREETYPE_LIB_PATH]) |
|
404 |
fi |
|
405 |
]) |
|
406 |
||
13133
701e61c32ece
7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff
changeset
|
407 |
AC_DEFUN_ONCE([LIB_SETUP_FREETYPE], |
701e61c32ece
7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff
changeset
|
408 |
[ |
701e61c32ece
7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff
changeset
|
409 |
|
20363 | 410 |
############################################################################### |
411 |
# |
|
20654 | 412 |
# The ubiquitous freetype library is used to render fonts. |
20363 | 413 |
# |
414 |
AC_ARG_WITH(freetype, [AS_HELP_STRING([--with-freetype], |
|
20654 | 415 |
[specify prefix directory for the freetype package |
20363 | 416 |
(expecting the libraries under PATH/lib and the headers under PATH/include)])]) |
20654 | 417 |
AC_ARG_WITH(freetype-include, [AS_HELP_STRING([--with-freetype-include], |
418 |
[specify directory for the freetype include files])]) |
|
419 |
AC_ARG_WITH(freetype-lib, [AS_HELP_STRING([--with-freetype-lib], |
|
420 |
[specify directory for the freetype library])]) |
|
26400
4d6c6f2df610
8057538: Build the freetype library during configure on Windows
simonis
parents:
25039
diff
changeset
|
421 |
AC_ARG_WITH(freetype-src, [AS_HELP_STRING([--with-freetype-src], |
4d6c6f2df610
8057538: Build the freetype library during configure on Windows
simonis
parents:
25039
diff
changeset
|
422 |
[specify directory with freetype sources to automatically build the library (experimental, Windows-only)])]) |
20654 | 423 |
AC_ARG_ENABLE(freetype-bundling, [AS_HELP_STRING([--disable-freetype-bundling], |
424 |
[disable bundling of the freetype library with the build result @<:@enabled on Windows or when using --with-freetype, disabled otherwise@:>@])]) |
|
13133
701e61c32ece
7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff
changeset
|
425 |
|
27331
3947187af23d
8062816: Fix configure freetype detection on Mac OS X Yosemite
ihse
parents:
27330
diff
changeset
|
426 |
# Need to specify explicitly since it needs to be overridden on some versions of macosx |
3947187af23d
8062816: Fix configure freetype detection on Mac OS X Yosemite
ihse
parents:
27330
diff
changeset
|
427 |
FREETYPE_BASE_NAME=freetype |
20654 | 428 |
FREETYPE_CFLAGS= |
429 |
FREETYPE_LIBS= |
|
430 |
FREETYPE_BUNDLE_LIB_PATH= |
|
13133
701e61c32ece
7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff
changeset
|
431 |
|
20654 | 432 |
if test "x$FREETYPE_NOT_NEEDED" = xyes; then |
26400
4d6c6f2df610
8057538: Build the freetype library during configure on Windows
simonis
parents:
25039
diff
changeset
|
433 |
if test "x$with_freetype" != x || test "x$with_freetype_include" != x || test "x$with_freetype_lib" != x || test "x$with_freetype_src" != x; then |
20363 | 434 |
AC_MSG_WARN([freetype not used, so --with-freetype is ignored]) |
435 |
fi |
|
20654 | 436 |
if test "x$enable_freetype_bundling" != x; then |
437 |
AC_MSG_WARN([freetype not used, so --enable-freetype-bundling is ignored]) |
|
438 |
fi |
|
20363 | 439 |
else |
20654 | 440 |
# freetype is needed to build; go get it! |
441 |
||
442 |
BUNDLE_FREETYPE="$enable_freetype_bundling" |
|
443 |
||
26400
4d6c6f2df610
8057538: Build the freetype library during configure on Windows
simonis
parents:
25039
diff
changeset
|
444 |
if test "x$with_freetype_src" != x; then |
4d6c6f2df610
8057538: Build the freetype library during configure on Windows
simonis
parents:
25039
diff
changeset
|
445 |
if test "x$OPENJDK_TARGET_OS" = xwindows; then |
4d6c6f2df610
8057538: Build the freetype library during configure on Windows
simonis
parents:
25039
diff
changeset
|
446 |
# Try to build freetype if --with-freetype-src was given on Windows |
4d6c6f2df610
8057538: Build the freetype library during configure on Windows
simonis
parents:
25039
diff
changeset
|
447 |
LIB_BUILD_FREETYPE([$with_freetype_src]) |
4d6c6f2df610
8057538: Build the freetype library during configure on Windows
simonis
parents:
25039
diff
changeset
|
448 |
if test "x$BUILD_FREETYPE" = xyes; then |
4d6c6f2df610
8057538: Build the freetype library during configure on Windows
simonis
parents:
25039
diff
changeset
|
449 |
# Okay, we built it. Check that it works. |
4d6c6f2df610
8057538: Build the freetype library during configure on Windows
simonis
parents:
25039
diff
changeset
|
450 |
LIB_CHECK_POTENTIAL_FREETYPE($POTENTIAL_FREETYPE_INCLUDE_PATH, $POTENTIAL_FREETYPE_LIB_PATH, [--with-freetype-src]) |
4d6c6f2df610
8057538: Build the freetype library during configure on Windows
simonis
parents:
25039
diff
changeset
|
451 |
if test "x$FOUND_FREETYPE" != xyes; then |
4d6c6f2df610
8057538: Build the freetype library during configure on Windows
simonis
parents:
25039
diff
changeset
|
452 |
AC_MSG_ERROR([Can not use the built freetype at location given by --with-freetype-src]) |
4d6c6f2df610
8057538: Build the freetype library during configure on Windows
simonis
parents:
25039
diff
changeset
|
453 |
fi |
4d6c6f2df610
8057538: Build the freetype library during configure on Windows
simonis
parents:
25039
diff
changeset
|
454 |
else |
4d6c6f2df610
8057538: Build the freetype library during configure on Windows
simonis
parents:
25039
diff
changeset
|
455 |
AC_MSG_NOTICE([User specified --with-freetype-src but building freetype failed. (see freetype.log for build results)]) |
4d6c6f2df610
8057538: Build the freetype library during configure on Windows
simonis
parents:
25039
diff
changeset
|
456 |
AC_MSG_ERROR([Consider building freetype manually and using --with-freetype instead.]) |
4d6c6f2df610
8057538: Build the freetype library during configure on Windows
simonis
parents:
25039
diff
changeset
|
457 |
fi |
4d6c6f2df610
8057538: Build the freetype library during configure on Windows
simonis
parents:
25039
diff
changeset
|
458 |
else |
4d6c6f2df610
8057538: Build the freetype library during configure on Windows
simonis
parents:
25039
diff
changeset
|
459 |
AC_MSG_WARN([--with-freetype-src is currently only supported on Windows - ignoring]) |
4d6c6f2df610
8057538: Build the freetype library during configure on Windows
simonis
parents:
25039
diff
changeset
|
460 |
fi |
4d6c6f2df610
8057538: Build the freetype library during configure on Windows
simonis
parents:
25039
diff
changeset
|
461 |
fi |
4d6c6f2df610
8057538: Build the freetype library during configure on Windows
simonis
parents:
25039
diff
changeset
|
462 |
|
20654 | 463 |
if test "x$with_freetype" != x || test "x$with_freetype_include" != x || test "x$with_freetype_lib" != x; then |
464 |
# User has specified settings |
|
465 |
||
466 |
if test "x$BUNDLE_FREETYPE" = x; then |
|
467 |
# If not specified, default is to bundle freetype |
|
468 |
BUNDLE_FREETYPE=yes |
|
469 |
fi |
|
26400
4d6c6f2df610
8057538: Build the freetype library during configure on Windows
simonis
parents:
25039
diff
changeset
|
470 |
|
20654 | 471 |
if test "x$with_freetype" != x; then |
472 |
POTENTIAL_FREETYPE_INCLUDE_PATH="$with_freetype/include" |
|
473 |
POTENTIAL_FREETYPE_LIB_PATH="$with_freetype/lib" |
|
474 |
fi |
|
26400
4d6c6f2df610
8057538: Build the freetype library during configure on Windows
simonis
parents:
25039
diff
changeset
|
475 |
|
20654 | 476 |
# Allow --with-freetype-lib and --with-freetype-include to override |
477 |
if test "x$with_freetype_include" != x; then |
|
478 |
POTENTIAL_FREETYPE_INCLUDE_PATH="$with_freetype_include" |
|
479 |
fi |
|
480 |
if test "x$with_freetype_lib" != x; then |
|
481 |
POTENTIAL_FREETYPE_LIB_PATH="$with_freetype_lib" |
|
482 |
fi |
|
13133
701e61c32ece
7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff
changeset
|
483 |
|
20654 | 484 |
if test "x$POTENTIAL_FREETYPE_INCLUDE_PATH" != x && test "x$POTENTIAL_FREETYPE_LIB_PATH" != x; then |
485 |
# Okay, we got it. Check that it works. |
|
486 |
LIB_CHECK_POTENTIAL_FREETYPE($POTENTIAL_FREETYPE_INCLUDE_PATH, $POTENTIAL_FREETYPE_LIB_PATH, [--with-freetype]) |
|
487 |
if test "x$FOUND_FREETYPE" != xyes; then |
|
488 |
AC_MSG_ERROR([Can not find or use freetype at location given by --with-freetype]) |
|
489 |
fi |
|
490 |
else |
|
491 |
# User specified only one of lib or include. This is an error. |
|
492 |
if test "x$POTENTIAL_FREETYPE_INCLUDE_PATH" = x ; then |
|
493 |
AC_MSG_NOTICE([User specified --with-freetype-lib but not --with-freetype-include]) |
|
494 |
AC_MSG_ERROR([Need both freetype lib and include paths. Consider using --with-freetype instead.]) |
|
495 |
else |
|
496 |
AC_MSG_NOTICE([User specified --with-freetype-include but not --with-freetype-lib]) |
|
497 |
AC_MSG_ERROR([Need both freetype lib and include paths. Consider using --with-freetype instead.]) |
|
498 |
fi |
|
20363 | 499 |
fi |
20654 | 500 |
else |
501 |
# User did not specify settings, but we need freetype. Try to locate it. |
|
502 |
||
503 |
if test "x$BUNDLE_FREETYPE" = x; then |
|
504 |
# If not specified, default is to bundle freetype only on windows |
|
505 |
if test "x$OPENJDK_TARGET_OS" = xwindows; then |
|
506 |
BUNDLE_FREETYPE=yes |
|
507 |
else |
|
508 |
BUNDLE_FREETYPE=no |
|
509 |
fi |
|
510 |
fi |
|
511 |
||
512 |
if test "x$FOUND_FREETYPE" != xyes; then |
|
513 |
# Check builddeps |
|
514 |
BDEPS_CHECK_MODULE(FREETYPE, freetype2, xxx, [FOUND_FREETYPE=yes], [FOUND_FREETYPE=no]) |
|
515 |
# BDEPS_CHECK_MODULE will set FREETYPE_CFLAGS and _LIBS, but we don't get a lib path for bundling. |
|
516 |
if test "x$FOUND_FREETYPE" = xyes; then |
|
517 |
if test "x$BUNDLE_FREETYPE" = xyes; then |
|
518 |
AC_MSG_NOTICE([Found freetype using builddeps, but ignoring since we can not bundle that]) |
|
519 |
FOUND_FREETYPE=no |
|
520 |
else |
|
521 |
AC_MSG_CHECKING([for freetype]) |
|
522 |
AC_MSG_RESULT([yes (using builddeps)]) |
|
523 |
fi |
|
524 |
fi |
|
20363 | 525 |
fi |
20654 | 526 |
|
23428
3c8a05bf4656
8038340: Cleanup and fix sysroot and devkit handling on Linux and Solaris
erikj
parents:
23165
diff
changeset
|
527 |
# If we have a sysroot, assume that's where we are supposed to look and skip pkg-config. |
3c8a05bf4656
8038340: Cleanup and fix sysroot and devkit handling on Linux and Solaris
erikj
parents:
23165
diff
changeset
|
528 |
if test "x$SYSROOT" = x; then |
3c8a05bf4656
8038340: Cleanup and fix sysroot and devkit handling on Linux and Solaris
erikj
parents:
23165
diff
changeset
|
529 |
if test "x$FOUND_FREETYPE" != xyes; then |
3c8a05bf4656
8038340: Cleanup and fix sysroot and devkit handling on Linux and Solaris
erikj
parents:
23165
diff
changeset
|
530 |
# Check modules using pkg-config, but only if we have it (ugly output results otherwise) |
3c8a05bf4656
8038340: Cleanup and fix sysroot and devkit handling on Linux and Solaris
erikj
parents:
23165
diff
changeset
|
531 |
if test "x$PKG_CONFIG" != x; then |
3c8a05bf4656
8038340: Cleanup and fix sysroot and devkit handling on Linux and Solaris
erikj
parents:
23165
diff
changeset
|
532 |
PKG_CHECK_MODULES(FREETYPE, freetype2, [FOUND_FREETYPE=yes], [FOUND_FREETYPE=no]) |
3c8a05bf4656
8038340: Cleanup and fix sysroot and devkit handling on Linux and Solaris
erikj
parents:
23165
diff
changeset
|
533 |
if test "x$FOUND_FREETYPE" = xyes; then |
3c8a05bf4656
8038340: Cleanup and fix sysroot and devkit handling on Linux and Solaris
erikj
parents:
23165
diff
changeset
|
534 |
# On solaris, pkg_check adds -lz to freetype libs, which isn't necessary for us. |
3c8a05bf4656
8038340: Cleanup and fix sysroot and devkit handling on Linux and Solaris
erikj
parents:
23165
diff
changeset
|
535 |
FREETYPE_LIBS=`$ECHO $FREETYPE_LIBS | $SED 's/-lz//g'` |
3c8a05bf4656
8038340: Cleanup and fix sysroot and devkit handling on Linux and Solaris
erikj
parents:
23165
diff
changeset
|
536 |
# 64-bit libs for Solaris x86 are installed in the amd64 subdirectory, change lib to lib/amd64 |
3c8a05bf4656
8038340: Cleanup and fix sysroot and devkit handling on Linux and Solaris
erikj
parents:
23165
diff
changeset
|
537 |
if test "x$OPENJDK_TARGET_OS" = xsolaris && test "x$OPENJDK_TARGET_CPU" = xx86_64; then |
3c8a05bf4656
8038340: Cleanup and fix sysroot and devkit handling on Linux and Solaris
erikj
parents:
23165
diff
changeset
|
538 |
FREETYPE_LIBS=`$ECHO $FREETYPE_LIBS | $SED 's?/lib?/lib/amd64?g'` |
3c8a05bf4656
8038340: Cleanup and fix sysroot and devkit handling on Linux and Solaris
erikj
parents:
23165
diff
changeset
|
539 |
fi |
3c8a05bf4656
8038340: Cleanup and fix sysroot and devkit handling on Linux and Solaris
erikj
parents:
23165
diff
changeset
|
540 |
# BDEPS_CHECK_MODULE will set FREETYPE_CFLAGS and _LIBS, but we don't get a lib path for bundling. |
3c8a05bf4656
8038340: Cleanup and fix sysroot and devkit handling on Linux and Solaris
erikj
parents:
23165
diff
changeset
|
541 |
if test "x$BUNDLE_FREETYPE" = xyes; then |
3c8a05bf4656
8038340: Cleanup and fix sysroot and devkit handling on Linux and Solaris
erikj
parents:
23165
diff
changeset
|
542 |
AC_MSG_NOTICE([Found freetype using pkg-config, but ignoring since we can not bundle that]) |
3c8a05bf4656
8038340: Cleanup and fix sysroot and devkit handling on Linux and Solaris
erikj
parents:
23165
diff
changeset
|
543 |
FOUND_FREETYPE=no |
3c8a05bf4656
8038340: Cleanup and fix sysroot and devkit handling on Linux and Solaris
erikj
parents:
23165
diff
changeset
|
544 |
else |
3c8a05bf4656
8038340: Cleanup and fix sysroot and devkit handling on Linux and Solaris
erikj
parents:
23165
diff
changeset
|
545 |
AC_MSG_CHECKING([for freetype]) |
3c8a05bf4656
8038340: Cleanup and fix sysroot and devkit handling on Linux and Solaris
erikj
parents:
23165
diff
changeset
|
546 |
AC_MSG_RESULT([yes (using pkg-config)]) |
3c8a05bf4656
8038340: Cleanup and fix sysroot and devkit handling on Linux and Solaris
erikj
parents:
23165
diff
changeset
|
547 |
fi |
20654 | 548 |
fi |
549 |
fi |
|
20363 | 550 |
fi |
20654 | 551 |
fi |
552 |
||
553 |
if test "x$FOUND_FREETYPE" != xyes; then |
|
554 |
# Check in well-known locations |
|
555 |
if test "x$OPENJDK_TARGET_OS" = xwindows; then |
|
556 |
FREETYPE_BASE_DIR="$PROGRAMFILES/GnuWin32" |
|
557 |
BASIC_WINDOWS_REWRITE_AS_UNIX_PATH(FREETYPE_BASE_DIR) |
|
558 |
LIB_CHECK_POTENTIAL_FREETYPE([$FREETYPE_BASE_DIR/include], [$FREETYPE_BASE_DIR/lib], [well-known location]) |
|
559 |
if test "x$FOUND_FREETYPE" != xyes; then |
|
560 |
FREETYPE_BASE_DIR="$ProgramW6432/GnuWin32" |
|
561 |
BASIC_WINDOWS_REWRITE_AS_UNIX_PATH(FREETYPE_BASE_DIR) |
|
562 |
LIB_CHECK_POTENTIAL_FREETYPE([$FREETYPE_BASE_DIR/include], [$FREETYPE_BASE_DIR/lib], [well-known location]) |
|
563 |
fi |
|
564 |
else |
|
23428
3c8a05bf4656
8038340: Cleanup and fix sysroot and devkit handling on Linux and Solaris
erikj
parents:
23165
diff
changeset
|
565 |
FREETYPE_BASE_DIR="$SYSROOT/usr" |
20654 | 566 |
LIB_CHECK_POTENTIAL_FREETYPE([$FREETYPE_BASE_DIR/include], [$FREETYPE_BASE_DIR/lib], [well-known location]) |
567 |
||
568 |
if test "x$FOUND_FREETYPE" != xyes; then |
|
23428
3c8a05bf4656
8038340: Cleanup and fix sysroot and devkit handling on Linux and Solaris
erikj
parents:
23165
diff
changeset
|
569 |
FREETYPE_BASE_DIR="$SYSROOT/usr/X11" |
20654 | 570 |
LIB_CHECK_POTENTIAL_FREETYPE([$FREETYPE_BASE_DIR/include], [$FREETYPE_BASE_DIR/lib], [well-known location]) |
571 |
fi |
|
572 |
||
573 |
if test "x$FOUND_FREETYPE" != xyes; then |
|
23428
3c8a05bf4656
8038340: Cleanup and fix sysroot and devkit handling on Linux and Solaris
erikj
parents:
23165
diff
changeset
|
574 |
FREETYPE_BASE_DIR="$SYSROOT/usr/sfw" |
3c8a05bf4656
8038340: Cleanup and fix sysroot and devkit handling on Linux and Solaris
erikj
parents:
23165
diff
changeset
|
575 |
LIB_CHECK_POTENTIAL_FREETYPE([$FREETYPE_BASE_DIR/include], [$FREETYPE_BASE_DIR/lib], [well-known location]) |
3c8a05bf4656
8038340: Cleanup and fix sysroot and devkit handling on Linux and Solaris
erikj
parents:
23165
diff
changeset
|
576 |
fi |
3c8a05bf4656
8038340: Cleanup and fix sysroot and devkit handling on Linux and Solaris
erikj
parents:
23165
diff
changeset
|
577 |
|
3c8a05bf4656
8038340: Cleanup and fix sysroot and devkit handling on Linux and Solaris
erikj
parents:
23165
diff
changeset
|
578 |
if test "x$FOUND_FREETYPE" != xyes; then |
3c8a05bf4656
8038340: Cleanup and fix sysroot and devkit handling on Linux and Solaris
erikj
parents:
23165
diff
changeset
|
579 |
FREETYPE_BASE_DIR="$SYSROOT/usr" |
20654 | 580 |
if test "x$OPENJDK_TARGET_CPU_BITS" = x64; then |
581 |
LIB_CHECK_POTENTIAL_FREETYPE([$FREETYPE_BASE_DIR/include], [$FREETYPE_BASE_DIR/lib/x86_64-linux-gnu], [well-known location]) |
|
582 |
else |
|
583 |
LIB_CHECK_POTENTIAL_FREETYPE([$FREETYPE_BASE_DIR/include], [$FREETYPE_BASE_DIR/lib/i386-linux-gnu], [well-known location]) |
|
584 |
if test "x$FOUND_FREETYPE" != xyes; then |
|
585 |
LIB_CHECK_POTENTIAL_FREETYPE([$FREETYPE_BASE_DIR/include], [$FREETYPE_BASE_DIR/lib32], [well-known location]) |
|
586 |
fi |
|
587 |
fi |
|
588 |
fi |
|
20363 | 589 |
fi |
20654 | 590 |
fi # end check in well-known locations |
591 |
||
592 |
if test "x$FOUND_FREETYPE" != xyes; then |
|
593 |
HELP_MSG_MISSING_DEPENDENCY([freetype]) |
|
594 |
AC_MSG_ERROR([Could not find freetype! $HELP_MSG ]) |
|
595 |
fi |
|
596 |
fi # end user specified settings |
|
597 |
||
598 |
# Set FREETYPE_CFLAGS, _LIBS and _LIB_PATH from include and lib dir. |
|
599 |
if test "x$FREETYPE_CFLAGS" = x; then |
|
600 |
BASIC_FIXUP_PATH(FREETYPE_INCLUDE_PATH) |
|
601 |
if test -d $FREETYPE_INCLUDE_PATH/freetype2/freetype; then |
|
602 |
FREETYPE_CFLAGS="-I$FREETYPE_INCLUDE_PATH/freetype2 -I$FREETYPE_INCLUDE_PATH" |
|
603 |
else |
|
604 |
FREETYPE_CFLAGS="-I$FREETYPE_INCLUDE_PATH" |
|
20363 | 605 |
fi |
606 |
fi |
|
26400
4d6c6f2df610
8057538: Build the freetype library during configure on Windows
simonis
parents:
25039
diff
changeset
|
607 |
|
20654 | 608 |
if test "x$FREETYPE_LIBS" = x; then |
609 |
BASIC_FIXUP_PATH(FREETYPE_LIB_PATH) |
|
610 |
if test "x$OPENJDK_TARGET_OS" = xwindows; then |
|
27331
3947187af23d
8062816: Fix configure freetype detection on Mac OS X Yosemite
ihse
parents:
27330
diff
changeset
|
611 |
FREETYPE_LIBS="$FREETYPE_LIB_PATH/$FREETYPE_BASE_NAME.lib" |
20654 | 612 |
else |
27331
3947187af23d
8062816: Fix configure freetype detection on Mac OS X Yosemite
ihse
parents:
27330
diff
changeset
|
613 |
FREETYPE_LIBS="-L$FREETYPE_LIB_PATH -l$FREETYPE_BASE_NAME" |
20363 | 614 |
fi |
615 |
fi |
|
14111 | 616 |
|
20654 | 617 |
# Try to compile it |
618 |
AC_MSG_CHECKING([if we can compile and link with freetype]) |
|
619 |
AC_LANG_PUSH(C++) |
|
620 |
PREV_CXXCFLAGS="$CXXFLAGS" |
|
21056
16245d19b19a
8027300: configure should use LIBS instead of LDFLAGS when testing freetype
ihse
parents:
20655
diff
changeset
|
621 |
PREV_LIBS="$LIBS" |
20654 | 622 |
PREV_CXX="$CXX" |
26400
4d6c6f2df610
8057538: Build the freetype library during configure on Windows
simonis
parents:
25039
diff
changeset
|
623 |
CXXFLAGS="$CXXFLAGS $FREETYPE_CFLAGS" |
21056
16245d19b19a
8027300: configure should use LIBS instead of LDFLAGS when testing freetype
ihse
parents:
20655
diff
changeset
|
624 |
LIBS="$LIBS $FREETYPE_LIBS" |
20654 | 625 |
CXX="$FIXPATH $CXX" |
626 |
AC_LINK_IFELSE([AC_LANG_SOURCE([[ |
|
627 |
#include<ft2build.h> |
|
628 |
#include FT_FREETYPE_H |
|
629 |
int main () { |
|
630 |
FT_Init_FreeType(NULL); |
|
631 |
return 0; |
|
632 |
} |
|
633 |
]])], |
|
634 |
[ |
|
635 |
AC_MSG_RESULT([yes]) |
|
636 |
], |
|
637 |
[ |
|
638 |
AC_MSG_RESULT([no]) |
|
639 |
AC_MSG_NOTICE([Could not compile and link with freetype. This might be a 32/64-bit mismatch.]) |
|
640 |
AC_MSG_NOTICE([Using FREETYPE_CFLAGS=$FREETYPE_CFLAGS and FREETYPE_LIBS=$FREETYPE_LIBS]) |
|
26400
4d6c6f2df610
8057538: Build the freetype library during configure on Windows
simonis
parents:
25039
diff
changeset
|
641 |
|
20654 | 642 |
HELP_MSG_MISSING_DEPENDENCY([freetype]) |
26400
4d6c6f2df610
8057538: Build the freetype library during configure on Windows
simonis
parents:
25039
diff
changeset
|
643 |
|
20654 | 644 |
AC_MSG_ERROR([Can not continue without freetype. $HELP_MSG]) |
645 |
] |
|
646 |
) |
|
647 |
CXXCFLAGS="$PREV_CXXFLAGS" |
|
21056
16245d19b19a
8027300: configure should use LIBS instead of LDFLAGS when testing freetype
ihse
parents:
20655
diff
changeset
|
648 |
LIBS="$PREV_LIBS" |
20654 | 649 |
CXX="$PREV_CXX" |
650 |
AC_LANG_POP(C++) |
|
651 |
||
652 |
AC_MSG_CHECKING([if we should bundle freetype]) |
|
653 |
if test "x$BUNDLE_FREETYPE" = xyes; then |
|
654 |
FREETYPE_BUNDLE_LIB_PATH="$FREETYPE_LIB_PATH" |
|
20363 | 655 |
fi |
20654 | 656 |
AC_MSG_RESULT([$BUNDLE_FREETYPE]) |
657 |
||
658 |
fi # end freetype needed |
|
13133
701e61c32ece
7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff
changeset
|
659 |
|
20654 | 660 |
AC_SUBST(FREETYPE_BUNDLE_LIB_PATH) |
661 |
AC_SUBST(FREETYPE_CFLAGS) |
|
662 |
AC_SUBST(FREETYPE_LIBS) |
|
13133
701e61c32ece
7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff
changeset
|
663 |
]) |
701e61c32ece
7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff
changeset
|
664 |
|
701e61c32ece
7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff
changeset
|
665 |
AC_DEFUN_ONCE([LIB_SETUP_ALSA], |
701e61c32ece
7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff
changeset
|
666 |
[ |
701e61c32ece
7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff
changeset
|
667 |
|
20363 | 668 |
############################################################################### |
669 |
# |
|
670 |
# Check for alsa headers and libraries. Used on Linux/GNU systems. |
|
671 |
# |
|
672 |
AC_ARG_WITH(alsa, [AS_HELP_STRING([--with-alsa], |
|
673 |
[specify prefix directory for the alsa package |
|
674 |
(expecting the libraries under PATH/lib and the headers under PATH/include)])]) |
|
675 |
AC_ARG_WITH(alsa-include, [AS_HELP_STRING([--with-alsa-include], |
|
676 |
[specify directory for the alsa include files])]) |
|
677 |
AC_ARG_WITH(alsa-lib, [AS_HELP_STRING([--with-alsa-lib], |
|
678 |
[specify directory for the alsa library])]) |
|
13133
701e61c32ece
7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff
changeset
|
679 |
|
20363 | 680 |
if test "x$ALSA_NOT_NEEDED" = xyes; then |
681 |
if test "x${with_alsa}" != x || test "x${with_alsa_include}" != x || test "x${with_alsa_lib}" != x; then |
|
682 |
AC_MSG_WARN([alsa not used, so --with-alsa is ignored]) |
|
683 |
fi |
|
684 |
ALSA_CFLAGS= |
|
685 |
ALSA_LIBS= |
|
686 |
else |
|
687 |
ALSA_FOUND=no |
|
13133
701e61c32ece
7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff
changeset
|
688 |
|
20363 | 689 |
if test "x${with_alsa}" = xno || test "x${with_alsa_include}" = xno || test "x${with_alsa_lib}" = xno; then |
690 |
AC_MSG_ERROR([It is not possible to disable the use of alsa. Remove the --without-alsa option.]) |
|
691 |
fi |
|
13133
701e61c32ece
7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff
changeset
|
692 |
|
20363 | 693 |
if test "x${with_alsa}" != x; then |
22710
3a5575792497
8033921: Build fails if --with-alsa option is used due to incorrect ALSA link parameter in autoconf script.
ihse
parents:
22467
diff
changeset
|
694 |
ALSA_LIBS="-L${with_alsa}/lib -lasound" |
20363 | 695 |
ALSA_CFLAGS="-I${with_alsa}/include" |
696 |
ALSA_FOUND=yes |
|
697 |
fi |
|
698 |
if test "x${with_alsa_include}" != x; then |
|
699 |
ALSA_CFLAGS="-I${with_alsa_include}" |
|
700 |
ALSA_FOUND=yes |
|
701 |
fi |
|
702 |
if test "x${with_alsa_lib}" != x; then |
|
22710
3a5575792497
8033921: Build fails if --with-alsa option is used due to incorrect ALSA link parameter in autoconf script.
ihse
parents:
22467
diff
changeset
|
703 |
ALSA_LIBS="-L${with_alsa_lib} -lasound" |
20363 | 704 |
ALSA_FOUND=yes |
705 |
fi |
|
706 |
if test "x$ALSA_FOUND" = xno; then |
|
707 |
BDEPS_CHECK_MODULE(ALSA, alsa, xxx, [ALSA_FOUND=yes], [ALSA_FOUND=no]) |
|
708 |
fi |
|
23428
3c8a05bf4656
8038340: Cleanup and fix sysroot and devkit handling on Linux and Solaris
erikj
parents:
23165
diff
changeset
|
709 |
# Do not try pkg-config if we have a sysroot set. |
3c8a05bf4656
8038340: Cleanup and fix sysroot and devkit handling on Linux and Solaris
erikj
parents:
23165
diff
changeset
|
710 |
if test "x$SYSROOT" = x; then |
3c8a05bf4656
8038340: Cleanup and fix sysroot and devkit handling on Linux and Solaris
erikj
parents:
23165
diff
changeset
|
711 |
if test "x$ALSA_FOUND" = xno; then |
3c8a05bf4656
8038340: Cleanup and fix sysroot and devkit handling on Linux and Solaris
erikj
parents:
23165
diff
changeset
|
712 |
PKG_CHECK_MODULES(ALSA, alsa, [ALSA_FOUND=yes], [ALSA_FOUND=no]) |
3c8a05bf4656
8038340: Cleanup and fix sysroot and devkit handling on Linux and Solaris
erikj
parents:
23165
diff
changeset
|
713 |
fi |
20363 | 714 |
fi |
715 |
if test "x$ALSA_FOUND" = xno; then |
|
716 |
AC_CHECK_HEADERS([alsa/asoundlib.h], |
|
717 |
[ |
|
718 |
ALSA_FOUND=yes |
|
719 |
ALSA_CFLAGS=-Iignoreme |
|
720 |
ALSA_LIBS=-lasound |
|
721 |
DEFAULT_ALSA=yes |
|
722 |
], |
|
723 |
[ALSA_FOUND=no]) |
|
724 |
fi |
|
725 |
if test "x$ALSA_FOUND" = xno; then |
|
726 |
HELP_MSG_MISSING_DEPENDENCY([alsa]) |
|
727 |
AC_MSG_ERROR([Could not find alsa! $HELP_MSG ]) |
|
728 |
fi |
|
729 |
fi |
|
13133
701e61c32ece
7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff
changeset
|
730 |
|
20363 | 731 |
AC_SUBST(ALSA_CFLAGS) |
732 |
AC_SUBST(ALSA_LIBS) |
|
13133
701e61c32ece
7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff
changeset
|
733 |
]) |
701e61c32ece
7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff
changeset
|
734 |
|
701e61c32ece
7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff
changeset
|
735 |
AC_DEFUN_ONCE([LIB_SETUP_MISC_LIBS], |
701e61c32ece
7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff
changeset
|
736 |
[ |
701e61c32ece
7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff
changeset
|
737 |
|
20363 | 738 |
############################################################################### |
739 |
# |
|
740 |
# Check for the jpeg library |
|
741 |
# |
|
13133
701e61c32ece
7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff
changeset
|
742 |
|
25035 | 743 |
AC_ARG_WITH(libjpeg, [AS_HELP_STRING([--with-libjpeg], |
744 |
[use libjpeg from build system or OpenJDK source (system, bundled) @<:@bundled@:>@])]) |
|
745 |
||
746 |
AC_MSG_CHECKING([for which libjpeg to use]) |
|
747 |
||
748 |
# default is bundled |
|
749 |
DEFAULT_LIBJPEG=bundled |
|
750 |
||
751 |
# |
|
752 |
# if user didn't specify, use DEFAULT_LIBJPEG |
|
753 |
# |
|
754 |
if test "x${with_libjpeg}" = "x"; then |
|
755 |
with_libjpeg=${DEFAULT_LIBJPEG} |
|
756 |
fi |
|
757 |
||
758 |
AC_MSG_RESULT(${with_libjpeg}) |
|
759 |
||
760 |
if test "x${with_libjpeg}" = "xbundled"; then |
|
761 |
USE_EXTERNAL_LIBJPEG=false |
|
762 |
elif test "x${with_libjpeg}" = "xsystem"; then |
|
763 |
AC_CHECK_HEADER(jpeglib.h, [], |
|
764 |
[ AC_MSG_ERROR([--with-libjpeg=system specified, but jpeglib.h not found!])]) |
|
765 |
AC_CHECK_LIB(jpeg, jpeg_CreateDecompress, [], |
|
766 |
[ AC_MSG_ERROR([--with-libjpeg=system specified, but no libjpeg found])]) |
|
767 |
||
768 |
USE_EXTERNAL_LIBJPEG=true |
|
769 |
else |
|
770 |
AC_MSG_ERROR([Invalid use of --with-libjpeg: ${with_libjpeg}, use 'system' or 'bundled']) |
|
771 |
fi |
|
772 |
||
20363 | 773 |
AC_SUBST(USE_EXTERNAL_LIBJPEG) |
13133
701e61c32ece
7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff
changeset
|
774 |
|
20363 | 775 |
############################################################################### |
776 |
# |
|
777 |
# Check for the gif library |
|
778 |
# |
|
779 |
||
780 |
AC_ARG_WITH(giflib, [AS_HELP_STRING([--with-giflib], |
|
781 |
[use giflib from build system or OpenJDK source (system, bundled) @<:@bundled@:>@])]) |
|
16424 | 782 |
|
783 |
||
20363 | 784 |
AC_MSG_CHECKING([for which giflib to use]) |
16424 | 785 |
|
20363 | 786 |
# default is bundled |
787 |
DEFAULT_GIFLIB=bundled |
|
16424 | 788 |
|
20363 | 789 |
# |
790 |
# if user didn't specify, use DEFAULT_GIFLIB |
|
791 |
# |
|
792 |
if test "x${with_giflib}" = "x"; then |
|
16424 | 793 |
with_giflib=${DEFAULT_GIFLIB} |
20363 | 794 |
fi |
16424 | 795 |
|
20363 | 796 |
AC_MSG_RESULT(${with_giflib}) |
16424 | 797 |
|
20363 | 798 |
if test "x${with_giflib}" = "xbundled"; then |
16424 | 799 |
USE_EXTERNAL_LIBGIF=false |
20363 | 800 |
elif test "x${with_giflib}" = "xsystem"; then |
16424 | 801 |
AC_CHECK_HEADER(gif_lib.h, [], |
20363 | 802 |
[ AC_MSG_ERROR([--with-giflib=system specified, but gif_lib.h not found!])]) |
16424 | 803 |
AC_CHECK_LIB(gif, DGifGetCode, [], |
20363 | 804 |
[ AC_MSG_ERROR([--with-giflib=system specified, but no giflib found!])]) |
16424 | 805 |
|
806 |
USE_EXTERNAL_LIBGIF=true |
|
20363 | 807 |
else |
16424 | 808 |
AC_MSG_ERROR([Invalid value of --with-giflib: ${with_giflib}, use 'system' or 'bundled']) |
20363 | 809 |
fi |
810 |
AC_SUBST(USE_EXTERNAL_LIBGIF) |
|
13133
701e61c32ece
7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff
changeset
|
811 |
|
20363 | 812 |
############################################################################### |
813 |
# |
|
24413 | 814 |
# Check for the lcms2 library |
815 |
# |
|
816 |
||
817 |
AC_ARG_WITH(lcms, [AS_HELP_STRING([--with-lcms], |
|
818 |
[use lcms2 from build system or OpenJDK source (system, bundled) @<:@bundled@:>@])]) |
|
819 |
||
820 |
AC_MSG_CHECKING([for which lcms to use]) |
|
821 |
||
822 |
DEFAULT_LCMS=bundled |
|
823 |
||
824 |
# |
|
825 |
# If user didn't specify, use DEFAULT_LCMS |
|
826 |
# |
|
827 |
if test "x${with_lcms}" = "x"; then |
|
828 |
with_lcms=${DEFAULT_LCMS} |
|
829 |
fi |
|
830 |
||
831 |
if test "x${with_lcms}" = "xbundled"; then |
|
832 |
USE_EXTERNAL_LCMS=false |
|
833 |
AC_MSG_RESULT([bundled]) |
|
834 |
elif test "x${with_lcms}" = "xsystem"; then |
|
835 |
AC_MSG_RESULT([system]) |
|
836 |
PKG_CHECK_MODULES([LCMS], [lcms2], [LCMS_FOUND=yes], [LCMS_FOUND=no]) |
|
837 |
if test "x${LCMS_FOUND}" = "xyes"; then |
|
838 |
USE_EXTERNAL_LCMS=true |
|
839 |
else |
|
840 |
AC_MSG_ERROR([--with-lcms=system specified, but no lcms found!]) |
|
841 |
fi |
|
842 |
else |
|
843 |
AC_MSG_ERROR([Invalid value for --with-lcms: ${with_lcms}, use 'system' or 'bundled']) |
|
844 |
fi |
|
845 |
||
846 |
AC_SUBST(USE_EXTERNAL_LCMS) |
|
847 |
||
848 |
############################################################################### |
|
849 |
# |
|
23163 | 850 |
# Check for the png library |
851 |
# |
|
852 |
||
853 |
AC_ARG_WITH(libpng, [AS_HELP_STRING([--with-libpng], |
|
854 |
[use libpng from build system or OpenJDK source (system, bundled) @<:@bundled@:>@])]) |
|
855 |
||
856 |
||
857 |
AC_MSG_CHECKING([for which libpng to use]) |
|
858 |
||
859 |
# default is bundled |
|
860 |
DEFAULT_LIBPNG=bundled |
|
861 |
||
862 |
# |
|
863 |
# if user didn't specify, use DEFAULT_LIBPNG |
|
864 |
# |
|
865 |
if test "x${with_libpng}" = "x"; then |
|
866 |
with_libpng=${DEFAULT_LIBPNG} |
|
867 |
fi |
|
868 |
||
869 |
if test "x${with_libpng}" = "xbundled"; then |
|
870 |
USE_EXTERNAL_LIBPNG=false |
|
871 |
AC_MSG_RESULT([bundled]) |
|
872 |
elif test "x${with_libpng}" = "xsystem"; then |
|
873 |
PKG_CHECK_MODULES(PNG, libpng, |
|
874 |
[ LIBPNG_FOUND=yes ], |
|
875 |
[ LIBPNG_FOUND=no ]) |
|
876 |
if test "x${LIBPNG_FOUND}" = "xyes"; then |
|
877 |
USE_EXTERNAL_LIBPNG=true |
|
878 |
AC_MSG_RESULT([system]) |
|
879 |
else |
|
880 |
AC_MSG_RESULT([system not found]) |
|
881 |
AC_MSG_ERROR([--with-libpng=system specified, but no libpng found!]) |
|
882 |
fi |
|
883 |
else |
|
884 |
AC_MSG_ERROR([Invalid value of --with-libpng: ${with_libpng}, use 'system' or 'bundled']) |
|
885 |
fi |
|
886 |
AC_SUBST(USE_EXTERNAL_LIBPNG) |
|
887 |
||
888 |
############################################################################### |
|
889 |
# |
|
20363 | 890 |
# Check for the zlib library |
891 |
# |
|
13133
701e61c32ece
7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff
changeset
|
892 |
|
20363 | 893 |
AC_ARG_WITH(zlib, [AS_HELP_STRING([--with-zlib], |
894 |
[use zlib from build system or OpenJDK source (system, bundled) @<:@bundled@:>@])]) |
|
13133
701e61c32ece
7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff
changeset
|
895 |
|
20363 | 896 |
AC_CHECK_LIB(z, compress, |
897 |
[ ZLIB_FOUND=yes ], |
|
898 |
[ ZLIB_FOUND=no ]) |
|
13133
701e61c32ece
7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff
changeset
|
899 |
|
20363 | 900 |
AC_MSG_CHECKING([for which zlib to use]) |
13133
701e61c32ece
7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff
changeset
|
901 |
|
20363 | 902 |
DEFAULT_ZLIB=bundled |
903 |
if test "x$OPENJDK_TARGET_OS" = xmacosx; then |
|
904 |
# |
|
905 |
# On macosx default is system...on others default is |
|
906 |
# |
|
13133
701e61c32ece
7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff
changeset
|
907 |
DEFAULT_ZLIB=system |
20363 | 908 |
fi |
13133
701e61c32ece
7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff
changeset
|
909 |
|
20363 | 910 |
if test "x${ZLIB_FOUND}" != "xyes"; then |
911 |
# |
|
912 |
# If we don't find any system...set default to bundled |
|
913 |
# |
|
13133
701e61c32ece
7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff
changeset
|
914 |
DEFAULT_ZLIB=bundled |
20363 | 915 |
fi |
13133
701e61c32ece
7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff
changeset
|
916 |
|
20363 | 917 |
# |
918 |
# If user didn't specify, use DEFAULT_ZLIB |
|
919 |
# |
|
920 |
if test "x${with_zlib}" = "x"; then |
|
13133
701e61c32ece
7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff
changeset
|
921 |
with_zlib=${DEFAULT_ZLIB} |
20363 | 922 |
fi |
13133
701e61c32ece
7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff
changeset
|
923 |
|
20363 | 924 |
if test "x${with_zlib}" = "xbundled"; then |
13133
701e61c32ece
7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff
changeset
|
925 |
USE_EXTERNAL_LIBZ=false |
701e61c32ece
7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff
changeset
|
926 |
AC_MSG_RESULT([bundled]) |
20363 | 927 |
elif test "x${with_zlib}" = "xsystem"; then |
13133
701e61c32ece
7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff
changeset
|
928 |
if test "x${ZLIB_FOUND}" = "xyes"; then |
20363 | 929 |
USE_EXTERNAL_LIBZ=true |
930 |
AC_MSG_RESULT([system]) |
|
13133
701e61c32ece
7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff
changeset
|
931 |
else |
20363 | 932 |
AC_MSG_RESULT([system not found]) |
933 |
AC_MSG_ERROR([--with-zlib=system specified, but no zlib found!]) |
|
13133
701e61c32ece
7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff
changeset
|
934 |
fi |
20363 | 935 |
else |
936 |
AC_MSG_ERROR([Invalid value for --with-zlib: ${with_zlib}, use 'system' or 'bundled']) |
|
937 |
fi |
|
13133
701e61c32ece
7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff
changeset
|
938 |
|
20363 | 939 |
AC_SUBST(USE_EXTERNAL_LIBZ) |
13133
701e61c32ece
7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff
changeset
|
940 |
|
20363 | 941 |
############################################################################### |
942 |
LIBZIP_CAN_USE_MMAP=true |
|
13697 | 943 |
|
20363 | 944 |
AC_SUBST(LIBZIP_CAN_USE_MMAP) |
13133
701e61c32ece
7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff
changeset
|
945 |
|
20363 | 946 |
############################################################################### |
947 |
# |
|
948 |
# Check if altzone exists in time.h |
|
949 |
# |
|
13133
701e61c32ece
7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff
changeset
|
950 |
|
20363 | 951 |
AC_LINK_IFELSE([AC_LANG_PROGRAM([#include <time.h>], [return (int)altzone;])], |
952 |
[has_altzone=yes], |
|
953 |
[has_altzone=no]) |
|
954 |
if test "x$has_altzone" = xyes; then |
|
13133
701e61c32ece
7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff
changeset
|
955 |
AC_DEFINE([HAVE_ALTZONE], 1, [Define if you have the external 'altzone' variable in time.h]) |
20363 | 956 |
fi |
13133
701e61c32ece
7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff
changeset
|
957 |
|
20363 | 958 |
############################################################################### |
959 |
# |
|
960 |
# Check the maths library |
|
961 |
# |
|
13133
701e61c32ece
7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff
changeset
|
962 |
|
20363 | 963 |
AC_CHECK_LIB(m, cos, [], |
964 |
[ |
|
965 |
AC_MSG_NOTICE([Maths library was not found]) |
|
966 |
] |
|
967 |
) |
|
968 |
AC_SUBST(LIBM) |
|
13133
701e61c32ece
7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff
changeset
|
969 |
|
20363 | 970 |
############################################################################### |
971 |
# |
|
972 |
# Check for libdl.so |
|
13133
701e61c32ece
7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff
changeset
|
973 |
|
20363 | 974 |
save_LIBS="$LIBS" |
975 |
LIBS="" |
|
976 |
AC_CHECK_LIB(dl,dlopen) |
|
977 |
LIBDL="$LIBS" |
|
978 |
AC_SUBST(LIBDL) |
|
979 |
LIBS="$save_LIBS" |
|
13133
701e61c32ece
7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff
changeset
|
980 |
]) |
701e61c32ece
7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff
changeset
|
981 |
|
701e61c32ece
7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff
changeset
|
982 |
AC_DEFUN_ONCE([LIB_SETUP_STATIC_LINK_LIBSTDCPP], |
701e61c32ece
7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff
changeset
|
983 |
[ |
20363 | 984 |
############################################################################### |
985 |
# |
|
986 |
# statically link libstdc++ before C++ ABI is stablized on Linux unless |
|
987 |
# dynamic build is configured on command line. |
|
988 |
# |
|
989 |
AC_ARG_WITH([stdc++lib], [AS_HELP_STRING([--with-stdc++lib=<static>,<dynamic>,<default>], |
|
990 |
[force linking of the C++ runtime on Linux to either static or dynamic, default is static with dynamic as fallback])], |
|
991 |
[ |
|
992 |
if test "x$with_stdc__lib" != xdynamic && test "x$with_stdc__lib" != xstatic \ |
|
993 |
&& test "x$with_stdc__lib" != xdefault; then |
|
994 |
AC_MSG_ERROR([Bad parameter value --with-stdc++lib=$with_stdc__lib!]) |
|
995 |
fi |
|
996 |
], |
|
997 |
[with_stdc__lib=default] |
|
998 |
) |
|
13133
701e61c32ece
7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff
changeset
|
999 |
|
20363 | 1000 |
if test "x$OPENJDK_TARGET_OS" = xlinux; then |
13133
701e61c32ece
7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff
changeset
|
1001 |
# Test if -lstdc++ works. |
701e61c32ece
7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff
changeset
|
1002 |
AC_MSG_CHECKING([if dynamic link of stdc++ is possible]) |
701e61c32ece
7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff
changeset
|
1003 |
AC_LANG_PUSH(C++) |
701e61c32ece
7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff
changeset
|
1004 |
OLD_CXXFLAGS="$CXXFLAGS" |
701e61c32ece
7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff
changeset
|
1005 |
CXXFLAGS="$CXXFLAGS -lstdc++" |
701e61c32ece
7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff
changeset
|
1006 |
AC_LINK_IFELSE([AC_LANG_PROGRAM([], [return 0;])], |
20363 | 1007 |
[has_dynamic_libstdcxx=yes], |
1008 |
[has_dynamic_libstdcxx=no]) |
|
13133
701e61c32ece
7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff
changeset
|
1009 |
CXXFLAGS="$OLD_CXXFLAGS" |
701e61c32ece
7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff
changeset
|
1010 |
AC_LANG_POP(C++) |
701e61c32ece
7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff
changeset
|
1011 |
AC_MSG_RESULT([$has_dynamic_libstdcxx]) |
701e61c32ece
7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff
changeset
|
1012 |
|
701e61c32ece
7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff
changeset
|
1013 |
# Test if stdc++ can be linked statically. |
701e61c32ece
7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff
changeset
|
1014 |
AC_MSG_CHECKING([if static link of stdc++ is possible]) |
701e61c32ece
7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff
changeset
|
1015 |
STATIC_STDCXX_FLAGS="-Wl,-Bstatic -lstdc++ -lgcc -Wl,-Bdynamic" |
701e61c32ece
7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff
changeset
|
1016 |
AC_LANG_PUSH(C++) |
701e61c32ece
7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff
changeset
|
1017 |
OLD_LIBS="$LIBS" |
701e61c32ece
7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff
changeset
|
1018 |
OLD_CXX="$CXX" |
701e61c32ece
7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff
changeset
|
1019 |
LIBS="$STATIC_STDCXX_FLAGS" |
20363 | 1020 |
CXX="$CC" |
13133
701e61c32ece
7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff
changeset
|
1021 |
AC_LINK_IFELSE([AC_LANG_PROGRAM([], [return 0;])], |
20363 | 1022 |
[has_static_libstdcxx=yes], |
1023 |
[has_static_libstdcxx=no]) |
|
13133
701e61c32ece
7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff
changeset
|
1024 |
LIBS="$OLD_LIBS" |
701e61c32ece
7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff
changeset
|
1025 |
CXX="$OLD_CXX" |
701e61c32ece
7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff
changeset
|
1026 |
AC_LANG_POP(C++) |
701e61c32ece
7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff
changeset
|
1027 |
AC_MSG_RESULT([$has_static_libstdcxx]) |
701e61c32ece
7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff
changeset
|
1028 |
|
14459
6213b3f9e08d
8001875: build-infra: We must be able to force static linking of stdc++
tbell
parents:
14280
diff
changeset
|
1029 |
if test "x$has_static_libstdcxx" = xno && test "x$has_dynamic_libstdcxx" = xno; then |
20363 | 1030 |
AC_MSG_ERROR([Cannot link to stdc++, neither dynamically nor statically!]) |
13133
701e61c32ece
7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff
changeset
|
1031 |
fi |
701e61c32ece
7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff
changeset
|
1032 |
|
14459
6213b3f9e08d
8001875: build-infra: We must be able to force static linking of stdc++
tbell
parents:
14280
diff
changeset
|
1033 |
if test "x$with_stdc__lib" = xstatic && test "x$has_static_libstdcxx" = xno; then |
20363 | 1034 |
AC_MSG_ERROR([Static linking of libstdc++ was not possible!]) |
13133
701e61c32ece
7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff
changeset
|
1035 |
fi |
701e61c32ece
7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff
changeset
|
1036 |
|
14459
6213b3f9e08d
8001875: build-infra: We must be able to force static linking of stdc++
tbell
parents:
14280
diff
changeset
|
1037 |
if test "x$with_stdc__lib" = xdynamic && test "x$has_dynamic_libstdcxx" = xno; then |
20363 | 1038 |
AC_MSG_ERROR([Dynamic linking of libstdc++ was not possible!]) |
13133
701e61c32ece
7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff
changeset
|
1039 |
fi |
701e61c32ece
7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff
changeset
|
1040 |
|
701e61c32ece
7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff
changeset
|
1041 |
AC_MSG_CHECKING([how to link with libstdc++]) |
14459
6213b3f9e08d
8001875: build-infra: We must be able to force static linking of stdc++
tbell
parents:
14280
diff
changeset
|
1042 |
# If dynamic was requested, it's available since it would fail above otherwise. |
6213b3f9e08d
8001875: build-infra: We must be able to force static linking of stdc++
tbell
parents:
14280
diff
changeset
|
1043 |
# If dynamic wasn't requested, go with static unless it isn't available. |
16581
b2cddec593f4
8011388: Support building zero and zeroshark with the new build
omajid
parents:
16424
diff
changeset
|
1044 |
if test "x$with_stdc__lib" = xdynamic || test "x$has_static_libstdcxx" = xno || test "x$JVM_VARIANT_ZEROSHARK" = xtrue; then |
20363 | 1045 |
LIBCXX="$LIBCXX -lstdc++" |
1046 |
LDCXX="$CXX" |
|
1047 |
STATIC_CXX_SETTING="STATIC_CXX=false" |
|
1048 |
AC_MSG_RESULT([dynamic]) |
|
14459
6213b3f9e08d
8001875: build-infra: We must be able to force static linking of stdc++
tbell
parents:
14280
diff
changeset
|
1049 |
else |
20363 | 1050 |
LIBCXX="$LIBCXX $STATIC_STDCXX_FLAGS" |
1051 |
LDCXX="$CC" |
|
1052 |
STATIC_CXX_SETTING="STATIC_CXX=true" |
|
1053 |
AC_MSG_RESULT([static]) |
|
13133
701e61c32ece
7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff
changeset
|
1054 |
fi |
20363 | 1055 |
fi |
1056 |
AC_SUBST(STATIC_CXX_SETTING) |
|
13133
701e61c32ece
7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff
changeset
|
1057 |
|
20363 | 1058 |
if test "x$JVM_VARIANT_ZERO" = xtrue || test "x$JVM_VARIANT_ZEROSHARK" = xtrue; then |
16581
b2cddec593f4
8011388: Support building zero and zeroshark with the new build
omajid
parents:
16424
diff
changeset
|
1059 |
# Figure out LIBFFI_CFLAGS and LIBFFI_LIBS |
b2cddec593f4
8011388: Support building zero and zeroshark with the new build
omajid
parents:
16424
diff
changeset
|
1060 |
PKG_CHECK_MODULES([LIBFFI], [libffi]) |
b2cddec593f4
8011388: Support building zero and zeroshark with the new build
omajid
parents:
16424
diff
changeset
|
1061 |
|
20363 | 1062 |
fi |
16581
b2cddec593f4
8011388: Support building zero and zeroshark with the new build
omajid
parents:
16424
diff
changeset
|
1063 |
|
20363 | 1064 |
if test "x$JVM_VARIANT_ZEROSHARK" = xtrue; then |
16581
b2cddec593f4
8011388: Support building zero and zeroshark with the new build
omajid
parents:
16424
diff
changeset
|
1065 |
AC_CHECK_PROG([LLVM_CONFIG], [llvm-config], [llvm-config]) |
b2cddec593f4
8011388: Support building zero and zeroshark with the new build
omajid
parents:
16424
diff
changeset
|
1066 |
|
b2cddec593f4
8011388: Support building zero and zeroshark with the new build
omajid
parents:
16424
diff
changeset
|
1067 |
if test "x$LLVM_CONFIG" != xllvm-config; then |
20363 | 1068 |
AC_MSG_ERROR([llvm-config not found in $PATH.]) |
16581
b2cddec593f4
8011388: Support building zero and zeroshark with the new build
omajid
parents:
16424
diff
changeset
|
1069 |
fi |
b2cddec593f4
8011388: Support building zero and zeroshark with the new build
omajid
parents:
16424
diff
changeset
|
1070 |
|
b2cddec593f4
8011388: Support building zero and zeroshark with the new build
omajid
parents:
16424
diff
changeset
|
1071 |
llvm_components="jit mcjit engine nativecodegen native" |
b2cddec593f4
8011388: Support building zero and zeroshark with the new build
omajid
parents:
16424
diff
changeset
|
1072 |
unset LLVM_CFLAGS |
b2cddec593f4
8011388: Support building zero and zeroshark with the new build
omajid
parents:
16424
diff
changeset
|
1073 |
for flag in $("$LLVM_CONFIG" --cxxflags); do |
b2cddec593f4
8011388: Support building zero and zeroshark with the new build
omajid
parents:
16424
diff
changeset
|
1074 |
if echo "${flag}" | grep -q '^-@<:@ID@:>@'; then |
b2cddec593f4
8011388: Support building zero and zeroshark with the new build
omajid
parents:
16424
diff
changeset
|
1075 |
if test "${flag}" != "-D_DEBUG" ; then |
b2cddec593f4
8011388: Support building zero and zeroshark with the new build
omajid
parents:
16424
diff
changeset
|
1076 |
if test "${LLVM_CFLAGS}" != "" ; then |
b2cddec593f4
8011388: Support building zero and zeroshark with the new build
omajid
parents:
16424
diff
changeset
|
1077 |
LLVM_CFLAGS="${LLVM_CFLAGS} " |
b2cddec593f4
8011388: Support building zero and zeroshark with the new build
omajid
parents:
16424
diff
changeset
|
1078 |
fi |
b2cddec593f4
8011388: Support building zero and zeroshark with the new build
omajid
parents:
16424
diff
changeset
|
1079 |
LLVM_CFLAGS="${LLVM_CFLAGS}${flag}" |
b2cddec593f4
8011388: Support building zero and zeroshark with the new build
omajid
parents:
16424
diff
changeset
|
1080 |
fi |
b2cddec593f4
8011388: Support building zero and zeroshark with the new build
omajid
parents:
16424
diff
changeset
|
1081 |
fi |
b2cddec593f4
8011388: Support building zero and zeroshark with the new build
omajid
parents:
16424
diff
changeset
|
1082 |
done |
b2cddec593f4
8011388: Support building zero and zeroshark with the new build
omajid
parents:
16424
diff
changeset
|
1083 |
llvm_version=$("${LLVM_CONFIG}" --version | sed 's/\.//; s/svn.*//') |
b2cddec593f4
8011388: Support building zero and zeroshark with the new build
omajid
parents:
16424
diff
changeset
|
1084 |
LLVM_CFLAGS="${LLVM_CFLAGS} -DSHARK_LLVM_VERSION=${llvm_version}" |
b2cddec593f4
8011388: Support building zero and zeroshark with the new build
omajid
parents:
16424
diff
changeset
|
1085 |
|
b2cddec593f4
8011388: Support building zero and zeroshark with the new build
omajid
parents:
16424
diff
changeset
|
1086 |
unset LLVM_LDFLAGS |
b2cddec593f4
8011388: Support building zero and zeroshark with the new build
omajid
parents:
16424
diff
changeset
|
1087 |
for flag in $("${LLVM_CONFIG}" --ldflags); do |
b2cddec593f4
8011388: Support building zero and zeroshark with the new build
omajid
parents:
16424
diff
changeset
|
1088 |
if echo "${flag}" | grep -q '^-L'; then |
b2cddec593f4
8011388: Support building zero and zeroshark with the new build
omajid
parents:
16424
diff
changeset
|
1089 |
if test "${LLVM_LDFLAGS}" != ""; then |
b2cddec593f4
8011388: Support building zero and zeroshark with the new build
omajid
parents:
16424
diff
changeset
|
1090 |
LLVM_LDFLAGS="${LLVM_LDFLAGS} " |
b2cddec593f4
8011388: Support building zero and zeroshark with the new build
omajid
parents:
16424
diff
changeset
|
1091 |
fi |
b2cddec593f4
8011388: Support building zero and zeroshark with the new build
omajid
parents:
16424
diff
changeset
|
1092 |
LLVM_LDFLAGS="${LLVM_LDFLAGS}${flag}" |
b2cddec593f4
8011388: Support building zero and zeroshark with the new build
omajid
parents:
16424
diff
changeset
|
1093 |
fi |
b2cddec593f4
8011388: Support building zero and zeroshark with the new build
omajid
parents:
16424
diff
changeset
|
1094 |
done |
b2cddec593f4
8011388: Support building zero and zeroshark with the new build
omajid
parents:
16424
diff
changeset
|
1095 |
|
b2cddec593f4
8011388: Support building zero and zeroshark with the new build
omajid
parents:
16424
diff
changeset
|
1096 |
unset LLVM_LIBS |
b2cddec593f4
8011388: Support building zero and zeroshark with the new build
omajid
parents:
16424
diff
changeset
|
1097 |
for flag in $("${LLVM_CONFIG}" --libs ${llvm_components}); do |
b2cddec593f4
8011388: Support building zero and zeroshark with the new build
omajid
parents:
16424
diff
changeset
|
1098 |
if echo "${flag}" | grep -q '^-l'; then |
b2cddec593f4
8011388: Support building zero and zeroshark with the new build
omajid
parents:
16424
diff
changeset
|
1099 |
if test "${LLVM_LIBS}" != ""; then |
b2cddec593f4
8011388: Support building zero and zeroshark with the new build
omajid
parents:
16424
diff
changeset
|
1100 |
LLVM_LIBS="${LLVM_LIBS} " |
b2cddec593f4
8011388: Support building zero and zeroshark with the new build
omajid
parents:
16424
diff
changeset
|
1101 |
fi |
b2cddec593f4
8011388: Support building zero and zeroshark with the new build
omajid
parents:
16424
diff
changeset
|
1102 |
LLVM_LIBS="${LLVM_LIBS}${flag}" |
b2cddec593f4
8011388: Support building zero and zeroshark with the new build
omajid
parents:
16424
diff
changeset
|
1103 |
fi |
b2cddec593f4
8011388: Support building zero and zeroshark with the new build
omajid
parents:
16424
diff
changeset
|
1104 |
done |
b2cddec593f4
8011388: Support building zero and zeroshark with the new build
omajid
parents:
16424
diff
changeset
|
1105 |
|
b2cddec593f4
8011388: Support building zero and zeroshark with the new build
omajid
parents:
16424
diff
changeset
|
1106 |
AC_SUBST(LLVM_CFLAGS) |
b2cddec593f4
8011388: Support building zero and zeroshark with the new build
omajid
parents:
16424
diff
changeset
|
1107 |
AC_SUBST(LLVM_LDFLAGS) |
b2cddec593f4
8011388: Support building zero and zeroshark with the new build
omajid
parents:
16424
diff
changeset
|
1108 |
AC_SUBST(LLVM_LIBS) |
20363 | 1109 |
fi |
16581
b2cddec593f4
8011388: Support building zero and zeroshark with the new build
omajid
parents:
16424
diff
changeset
|
1110 |
|
20363 | 1111 |
# libCrun is the c++ runtime-library with SunStudio (roughly the equivalent of gcc's libstdc++.so) |
22721
63761da45392
8034788: Rewrite toolchain.m4 to support multiple toolchains per platform.
ihse
parents:
22710
diff
changeset
|
1112 |
if test "x$TOOLCHAIN_TYPE" = xsolstudio && test "x$LIBCXX" = x; then |
23428
3c8a05bf4656
8038340: Cleanup and fix sysroot and devkit handling on Linux and Solaris
erikj
parents:
23165
diff
changeset
|
1113 |
LIBCXX="${SYSROOT}/usr/lib${OPENJDK_TARGET_CPU_ISADIR}/libCrun.so.1" |
20363 | 1114 |
fi |
13133
701e61c32ece
7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff
changeset
|
1115 |
|
20363 | 1116 |
# TODO better (platform agnostic) test |
22721
63761da45392
8034788: Rewrite toolchain.m4 to support multiple toolchains per platform.
ihse
parents:
22710
diff
changeset
|
1117 |
if test "x$OPENJDK_TARGET_OS" = xmacosx && test "x$LIBCXX" = x && test "x$TOOLCHAIN_TYPE" = xgcc; then |
13133
701e61c32ece
7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff
changeset
|
1118 |
LIBCXX="-lstdc++" |
20363 | 1119 |
fi |
13133
701e61c32ece
7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff
changeset
|
1120 |
|
20363 | 1121 |
AC_SUBST(LIBCXX) |
13133
701e61c32ece
7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff
changeset
|
1122 |
]) |
22721
63761da45392
8034788: Rewrite toolchain.m4 to support multiple toolchains per platform.
ihse
parents:
22710
diff
changeset
|
1123 |
|
63761da45392
8034788: Rewrite toolchain.m4 to support multiple toolchains per platform.
ihse
parents:
22710
diff
changeset
|
1124 |
AC_DEFUN_ONCE([LIB_SETUP_ON_WINDOWS], |
63761da45392
8034788: Rewrite toolchain.m4 to support multiple toolchains per platform.
ihse
parents:
22710
diff
changeset
|
1125 |
[ |
63761da45392
8034788: Rewrite toolchain.m4 to support multiple toolchains per platform.
ihse
parents:
22710
diff
changeset
|
1126 |
if test "x$OPENJDK_TARGET_OS" = "xwindows"; then |
28901
5acc0ec03d06
8042707: Source changes needed to build JDK 9 with Visual Studio 2013 (VS2013)
erikj
parents:
27595
diff
changeset
|
1127 |
TOOLCHAIN_SETUP_VS_RUNTIME_DLLS |
22721
63761da45392
8034788: Rewrite toolchain.m4 to support multiple toolchains per platform.
ihse
parents:
22710
diff
changeset
|
1128 |
BASIC_DEPRECATED_ARG_WITH([dxsdk]) |
63761da45392
8034788: Rewrite toolchain.m4 to support multiple toolchains per platform.
ihse
parents:
22710
diff
changeset
|
1129 |
BASIC_DEPRECATED_ARG_WITH([dxsdk-lib]) |
63761da45392
8034788: Rewrite toolchain.m4 to support multiple toolchains per platform.
ihse
parents:
22710
diff
changeset
|
1130 |
BASIC_DEPRECATED_ARG_WITH([dxsdk-include]) |
63761da45392
8034788: Rewrite toolchain.m4 to support multiple toolchains per platform.
ihse
parents:
22710
diff
changeset
|
1131 |
fi |
63761da45392
8034788: Rewrite toolchain.m4 to support multiple toolchains per platform.
ihse
parents:
22710
diff
changeset
|
1132 |
]) |