common/autoconf/libraries.m4
author ddehaven
Wed, 18 Jun 2014 12:52:13 -0700
changeset 25034 d9ca34c227b8
parent 24415 43aa54df554d
child 25039 a0f814f72ad4
permissions -rw-r--r--
8043340: [macosx] Fix hard-wired paths to JavaVM.framework Summary: Build system tweaks to allow building with Xcode 5 and on OS X 10.9 and later Reviewed-by: erikj, henryjen, dholmes
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
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
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 19524
diff changeset
    28
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 19524
diff changeset
    29
  ###############################################################################
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 19524
diff changeset
    30
  #
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 19524
diff changeset
    31
  # OS specific settings that we never will need to probe.
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 19524
diff changeset
    32
  #
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 19524
diff changeset
    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
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 19524
diff changeset
    37
  fi
13133
701e61c32ece 7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff changeset
    38
20363
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 19524
diff changeset
    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
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 19524
diff changeset
    44
  fi
13133
701e61c32ece 7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff changeset
    45
22467
kvn
parents: 22466 21056
diff changeset
    46
  if test "x$OPENJDK_TARGET_OS" = xaix; then
22466
25aaf85d1ada 8024265: Enable new build on AIX
simonis
parents: 19524
diff changeset
    47
    AC_MSG_CHECKING([what is not needed on AIX?])
25aaf85d1ada 8024265: Enable new build on AIX
simonis
parents: 19524
diff changeset
    48
    ALSA_NOT_NEEDED=yes
25aaf85d1ada 8024265: Enable new build on AIX
simonis
parents: 19524
diff changeset
    49
    PULSE_NOT_NEEDED=yes
25aaf85d1ada 8024265: Enable new build on AIX
simonis
parents: 19524
diff changeset
    50
    AC_MSG_RESULT([alsa pulse])
22467
kvn
parents: 22466 21056
diff changeset
    51
  fi
22466
25aaf85d1ada 8024265: Enable new build on AIX
simonis
parents: 19524
diff changeset
    52
25aaf85d1ada 8024265: Enable new build on AIX
simonis
parents: 19524
diff changeset
    53
20363
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 19524
diff changeset
    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
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 19524
diff changeset
    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
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 19524
diff changeset
    61
  fi
13133
701e61c32ece 7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff changeset
    62
20363
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 19524
diff changeset
    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
2c17cbccf2ef 8001922: Improve freetype handling.
ihse
parents: 20649
diff changeset
    68
    AC_MSG_RESULT([alsa pulse x11])
20363
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 19524
diff changeset
    69
  fi
13133
701e61c32ece 7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff changeset
    70
20363
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 19524
diff changeset
    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
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 19524
diff changeset
    74
    AC_MSG_RESULT([alsa])
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 19524
diff changeset
    75
  fi
13133
701e61c32ece 7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff changeset
    76
20363
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 19524
diff changeset
    77
  if test "x$OPENJDK" = "xfalse"; then
20654
2c17cbccf2ef 8001922: Improve freetype handling.
ihse
parents: 20649
diff changeset
    78
    FREETYPE_NOT_NEEDED=yes
20363
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 19524
diff changeset
    79
  fi
13133
701e61c32ece 7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff changeset
    80
20363
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 19524
diff changeset
    81
  if test "x$SUPPORT_HEADFUL" = xno; then
13697
5262b00bc10c 7197849: Update new build-infra makefiles
ohair
parents: 13133
diff changeset
    82
    X11_NOT_NEEDED=yes
20363
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 19524
diff changeset
    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
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 19524
diff changeset
    89
  ###############################################################################
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 19524
diff changeset
    90
  #
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 19524
diff changeset
    91
  # Check for X Windows
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 19524
diff changeset
    92
  #
13133
701e61c32ece 7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff changeset
    93
20363
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 19524
diff changeset
    94
  # Check if the user has specified sysroot, but not --x-includes or --x-libraries.
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 19524
diff changeset
    95
  # Make a simple check for the libraries at the sysroot, and setup --x-includes and
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 19524
diff changeset
    96
  # --x-libraries for the sysroot, if that seems to be correct.
23428
3c8a05bf4656 8038340: Cleanup and fix sysroot and devkit handling on Linux and Solaris
erikj
parents: 23165
diff changeset
    97
  if test "x$OPENJDK_TARGET_OS" = "xlinux"; then
3c8a05bf4656 8038340: Cleanup and fix sysroot and devkit handling on Linux and Solaris
erikj
parents: 23165
diff changeset
    98
    if test "x$SYSROOT" != "x"; then
3c8a05bf4656 8038340: Cleanup and fix sysroot and devkit handling on Linux and Solaris
erikj
parents: 23165
diff changeset
    99
      if test "x$x_includes" = xNONE; then
3c8a05bf4656 8038340: Cleanup and fix sysroot and devkit handling on Linux and Solaris
erikj
parents: 23165
diff changeset
   100
        if test -f "$SYSROOT/usr/X11R6/include/X11/Xlib.h"; then
3c8a05bf4656 8038340: Cleanup and fix sysroot and devkit handling on Linux and Solaris
erikj
parents: 23165
diff changeset
   101
          x_includes="$SYSROOT/usr/X11R6/include"
3c8a05bf4656 8038340: Cleanup and fix sysroot and devkit handling on Linux and Solaris
erikj
parents: 23165
diff changeset
   102
        elif test -f "$SYSROOT/usr/include/X11/Xlib.h"; then
3c8a05bf4656 8038340: Cleanup and fix sysroot and devkit handling on Linux and Solaris
erikj
parents: 23165
diff changeset
   103
          x_includes="$SYSROOT/usr/include"
3c8a05bf4656 8038340: Cleanup and fix sysroot and devkit handling on Linux and Solaris
erikj
parents: 23165
diff changeset
   104
        fi
20363
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 19524
diff changeset
   105
      fi
23428
3c8a05bf4656 8038340: Cleanup and fix sysroot and devkit handling on Linux and Solaris
erikj
parents: 23165
diff changeset
   106
      if test "x$x_libraries" = xNONE; then
3c8a05bf4656 8038340: Cleanup and fix sysroot and devkit handling on Linux and Solaris
erikj
parents: 23165
diff changeset
   107
        if test -f "$SYSROOT/usr/X11R6/lib/libX11.so"; then
3c8a05bf4656 8038340: Cleanup and fix sysroot and devkit handling on Linux and Solaris
erikj
parents: 23165
diff changeset
   108
          x_libraries="$SYSROOT/usr/X11R6/lib"
3c8a05bf4656 8038340: Cleanup and fix sysroot and devkit handling on Linux and Solaris
erikj
parents: 23165
diff changeset
   109
        elif test "$SYSROOT/usr/lib64/libX11.so" && test "x$OPENJDK_TARGET_CPU_BITS" = x64; then
3c8a05bf4656 8038340: Cleanup and fix sysroot and devkit handling on Linux and Solaris
erikj
parents: 23165
diff changeset
   110
          x_libraries="$SYSROOT/usr/lib64"
3c8a05bf4656 8038340: Cleanup and fix sysroot and devkit handling on Linux and Solaris
erikj
parents: 23165
diff changeset
   111
        elif test -f "$SYSROOT/usr/lib/libX11.so"; then
3c8a05bf4656 8038340: Cleanup and fix sysroot and devkit handling on Linux and Solaris
erikj
parents: 23165
diff changeset
   112
          x_libraries="$SYSROOT/usr/lib"
3c8a05bf4656 8038340: Cleanup and fix sysroot and devkit handling on Linux and Solaris
erikj
parents: 23165
diff changeset
   113
        fi
20363
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 19524
diff changeset
   114
      fi
13133
701e61c32ece 7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff changeset
   115
    fi
701e61c32ece 7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff changeset
   116
  fi
20363
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 19524
diff changeset
   117
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 19524
diff changeset
   118
  # Now let autoconf do it's magic
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 19524
diff changeset
   119
  AC_PATH_X
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 19524
diff changeset
   120
  AC_PATH_XTRA
13133
701e61c32ece 7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff changeset
   121
20363
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 19524
diff changeset
   122
  # AC_PATH_XTRA creates X_LIBS and sometimes adds -R flags. When cross compiling
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 19524
diff changeset
   123
  # this doesn't make sense so we remove it.
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 19524
diff changeset
   124
  if test "x$COMPILE_TYPE" = xcross; then
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 19524
diff changeset
   125
    X_LIBS=`$ECHO $X_LIBS | $SED 's/-R \{0,1\}[[^ ]]*//g'`
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 19524
diff changeset
   126
  fi
13133
701e61c32ece 7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff changeset
   127
20363
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 19524
diff changeset
   128
  if test "x$no_x" = xyes && test "x$X11_NOT_NEEDED" != xyes; then
13133
701e61c32ece 7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff changeset
   129
    HELP_MSG_MISSING_DEPENDENCY([x11])
701e61c32ece 7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff changeset
   130
    AC_MSG_ERROR([Could not find X11 libraries. $HELP_MSG])
20363
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 19524
diff changeset
   131
  fi
13133
701e61c32ece 7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff changeset
   132
20363
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 19524
diff changeset
   133
  if test "x$OPENJDK_TARGET_OS" = xsolaris; then
13133
701e61c32ece 7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff changeset
   134
    OPENWIN_HOME="/usr/openwin"
23428
3c8a05bf4656 8038340: Cleanup and fix sysroot and devkit handling on Linux and Solaris
erikj
parents: 23165
diff changeset
   135
    X_CFLAGS="-I$SYSROOT$OPENWIN_HOME/include -I$SYSROOT$OPENWIN_HOME/include/X11/extensions"
3c8a05bf4656 8038340: Cleanup and fix sysroot and devkit handling on Linux and Solaris
erikj
parents: 23165
diff changeset
   136
    X_LIBS="-L$SYSROOT$OPENWIN_HOME/sfw/lib$OPENJDK_TARGET_CPU_ISADIR \
3c8a05bf4656 8038340: Cleanup and fix sysroot and devkit handling on Linux and Solaris
erikj
parents: 23165
diff changeset
   137
        -L$SYSROOT$OPENWIN_HOME/lib$OPENJDK_TARGET_CPU_ISADIR \
3c8a05bf4656 8038340: Cleanup and fix sysroot and devkit handling on Linux and Solaris
erikj
parents: 23165
diff changeset
   138
        -R$OPENWIN_HOME/sfw/lib$OPENJDK_TARGET_CPU_ISADIR \
3c8a05bf4656 8038340: Cleanup and fix sysroot and devkit handling on Linux and Solaris
erikj
parents: 23165
diff changeset
   139
        -R$OPENWIN_HOME/lib$OPENJDK_TARGET_CPU_ISADIR"
20363
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 19524
diff changeset
   140
  fi
13133
701e61c32ece 7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff changeset
   141
20363
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 19524
diff changeset
   142
  #
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 19524
diff changeset
   143
  # Weird Sol10 something check...TODO change to try compile
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 19524
diff changeset
   144
  #
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 19524
diff changeset
   145
  if test "x${OPENJDK_TARGET_OS}" = xsolaris; then
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 19524
diff changeset
   146
    if test "`uname -r`" = "5.10"; then
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 19524
diff changeset
   147
      if test "`${EGREP} -c XLinearGradient ${OPENWIN_HOME}/share/include/X11/extensions/Xrender.h`" = "0"; then
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 19524
diff changeset
   148
        X_CFLAGS="${X_CFLAGS} -DSOLARIS10_NO_XRENDER_STRUCTS"
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 19524
diff changeset
   149
      fi
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 19524
diff changeset
   150
    fi
13133
701e61c32ece 7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff changeset
   151
  fi
20363
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 19524
diff changeset
   152
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 19524
diff changeset
   153
  AC_LANG_PUSH(C)
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 19524
diff changeset
   154
  OLD_CFLAGS="$CFLAGS"
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 19524
diff changeset
   155
  CFLAGS="$CFLAGS $X_CFLAGS"
13133
701e61c32ece 7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff changeset
   156
20363
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 19524
diff changeset
   157
  # Need to include Xlib.h and Xutil.h to avoid "present but cannot be compiled" warnings on Solaris 10
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 19524
diff changeset
   158
  AC_CHECK_HEADERS([X11/extensions/shape.h X11/extensions/Xrender.h X11/extensions/XTest.h X11/Intrinsic.h],
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 19524
diff changeset
   159
      [X11_A_OK=yes],
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 19524
diff changeset
   160
      [X11_A_OK=no; break],
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 19524
diff changeset
   161
      [
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 19524
diff changeset
   162
        # include <X11/Xlib.h>
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 19524
diff changeset
   163
        # include <X11/Xutil.h>
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 19524
diff changeset
   164
      ]
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 19524
diff changeset
   165
  )
14111
2a82ecb35fc7 8000992: Update new build-infra makefiles
ohair
parents: 13697
diff changeset
   166
20363
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 19524
diff changeset
   167
  CFLAGS="$OLD_CFLAGS"
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 19524
diff changeset
   168
  AC_LANG_POP(C)
14111
2a82ecb35fc7 8000992: Update new build-infra makefiles
ohair
parents: 13697
diff changeset
   169
20363
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 19524
diff changeset
   170
  if test "x$X11_A_OK" = xno && test "x$X11_NOT_NEEDED" != xyes; then
13133
701e61c32ece 7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff changeset
   171
    HELP_MSG_MISSING_DEPENDENCY([x11])
19524
51009a053562 8003162: build-infra: Improve suggestions for missing packages on linux
erikj
parents: 18021
diff changeset
   172
    AC_MSG_ERROR([Could not find all X11 headers (shape.h Xrender.h XTest.h Intrinsic.h). $HELP_MSG])
20363
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 19524
diff changeset
   173
  fi
13133
701e61c32ece 7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff changeset
   174
20363
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 19524
diff changeset
   175
  AC_SUBST(X_CFLAGS)
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 19524
diff changeset
   176
  AC_SUBST(X_LIBS)
13133
701e61c32ece 7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff changeset
   177
])
701e61c32ece 7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff changeset
   178
701e61c32ece 7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff changeset
   179
AC_DEFUN_ONCE([LIB_SETUP_CUPS],
701e61c32ece 7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff changeset
   180
[
701e61c32ece 7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff changeset
   181
20363
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 19524
diff changeset
   182
  ###############################################################################
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 19524
diff changeset
   183
  #
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 19524
diff changeset
   184
  # The common unix printing system cups is used to print from java.
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 19524
diff changeset
   185
  #
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 19524
diff changeset
   186
  AC_ARG_WITH(cups, [AS_HELP_STRING([--with-cups],
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 19524
diff changeset
   187
      [specify prefix directory for the cups package
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 19524
diff changeset
   188
      (expecting the headers under PATH/include)])])
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 19524
diff changeset
   189
  AC_ARG_WITH(cups-include, [AS_HELP_STRING([--with-cups-include],
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 19524
diff changeset
   190
      [specify directory for the cups include files])])
13133
701e61c32ece 7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff changeset
   191
20363
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 19524
diff changeset
   192
  if test "x$CUPS_NOT_NEEDED" = xyes; then
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 19524
diff changeset
   193
    if test "x${with_cups}" != x || test "x${with_cups_include}" != x; then
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 19524
diff changeset
   194
      AC_MSG_WARN([cups not used, so --with-cups is ignored])
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 19524
diff changeset
   195
    fi
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 19524
diff changeset
   196
    CUPS_CFLAGS=
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 19524
diff changeset
   197
  else
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 19524
diff changeset
   198
    CUPS_FOUND=no
13133
701e61c32ece 7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff changeset
   199
20363
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 19524
diff changeset
   200
    if test "x${with_cups}" = xno || test "x${with_cups_include}" = xno; then
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 19524
diff changeset
   201
      AC_MSG_ERROR([It is not possible to disable the use of cups. Remove the --without-cups option.])
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 19524
diff changeset
   202
    fi
13133
701e61c32ece 7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff changeset
   203
20363
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 19524
diff changeset
   204
    if test "x${with_cups}" != x; then
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 19524
diff changeset
   205
      CUPS_CFLAGS="-I${with_cups}/include"
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 19524
diff changeset
   206
      CUPS_FOUND=yes
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 19524
diff changeset
   207
    fi
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 19524
diff changeset
   208
    if test "x${with_cups_include}" != x; then
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 19524
diff changeset
   209
      CUPS_CFLAGS="-I${with_cups_include}"
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 19524
diff changeset
   210
      CUPS_FOUND=yes
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 19524
diff changeset
   211
    fi
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 19524
diff changeset
   212
    if test "x$CUPS_FOUND" = xno; then
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 19524
diff changeset
   213
      BDEPS_CHECK_MODULE(CUPS, cups, xxx, [CUPS_FOUND=yes])
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 19524
diff changeset
   214
    fi
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 19524
diff changeset
   215
    if test "x$CUPS_FOUND" = xno; then
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 19524
diff changeset
   216
      # Are the cups headers installed in the default /usr/include location?
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 19524
diff changeset
   217
      AC_CHECK_HEADERS([cups/cups.h cups/ppd.h],
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 19524
diff changeset
   218
          [
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 19524
diff changeset
   219
            CUPS_FOUND=yes
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 19524
diff changeset
   220
            CUPS_CFLAGS=
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 19524
diff changeset
   221
            DEFAULT_CUPS=yes
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 19524
diff changeset
   222
          ]
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 19524
diff changeset
   223
      )
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 19524
diff changeset
   224
    fi
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 19524
diff changeset
   225
    if test "x$CUPS_FOUND" = xno; then
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 19524
diff changeset
   226
      # Getting nervous now? Lets poke around for standard Solaris third-party
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 19524
diff changeset
   227
      # package installation locations.
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 19524
diff changeset
   228
      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
   229
      if test -s $SYSROOT/opt/sfw/cups/include/cups/cups.h; then
20363
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 19524
diff changeset
   230
        # An SFW package seems to be installed!
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 19524
diff changeset
   231
        CUPS_FOUND=yes
23428
3c8a05bf4656 8038340: Cleanup and fix sysroot and devkit handling on Linux and Solaris
erikj
parents: 23165
diff changeset
   232
        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
   233
      elif test -s $SYSROOT/opt/csw/include/cups/cups.h; then
20363
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 19524
diff changeset
   234
        # A CSW package seems to be installed!
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 19524
diff changeset
   235
        CUPS_FOUND=yes
23428
3c8a05bf4656 8038340: Cleanup and fix sysroot and devkit handling on Linux and Solaris
erikj
parents: 23165
diff changeset
   236
        CUPS_CFLAGS="-I$SYSROOT/opt/csw/include"
20363
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 19524
diff changeset
   237
      fi
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 19524
diff changeset
   238
      AC_MSG_RESULT([$CUPS_FOUND])
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 19524
diff changeset
   239
    fi
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 19524
diff changeset
   240
    if test "x$CUPS_FOUND" = xno; then
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 19524
diff changeset
   241
      HELP_MSG_MISSING_DEPENDENCY([cups])
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 19524
diff changeset
   242
      AC_MSG_ERROR([Could not find cups! $HELP_MSG ])
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 19524
diff changeset
   243
    fi
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 19524
diff changeset
   244
  fi
13133
701e61c32ece 7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff changeset
   245
20363
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 19524
diff changeset
   246
  AC_SUBST(CUPS_CFLAGS)
13133
701e61c32ece 7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff changeset
   247
701e61c32ece 7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff changeset
   248
])
701e61c32ece 7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff changeset
   249
20654
2c17cbccf2ef 8001922: Improve freetype handling.
ihse
parents: 20649
diff changeset
   250
AC_DEFUN([LIB_CHECK_POTENTIAL_FREETYPE],
2c17cbccf2ef 8001922: Improve freetype handling.
ihse
parents: 20649
diff changeset
   251
[
2c17cbccf2ef 8001922: Improve freetype handling.
ihse
parents: 20649
diff changeset
   252
  POTENTIAL_FREETYPE_INCLUDE_PATH="$1"
2c17cbccf2ef 8001922: Improve freetype handling.
ihse
parents: 20649
diff changeset
   253
  POTENTIAL_FREETYPE_LIB_PATH="$2"
2c17cbccf2ef 8001922: Improve freetype handling.
ihse
parents: 20649
diff changeset
   254
  METHOD="$3"
2c17cbccf2ef 8001922: Improve freetype handling.
ihse
parents: 20649
diff changeset
   255
  
2c17cbccf2ef 8001922: Improve freetype handling.
ihse
parents: 20649
diff changeset
   256
  # First check if the files exists.
2c17cbccf2ef 8001922: Improve freetype handling.
ihse
parents: 20649
diff changeset
   257
  if test -s "$POTENTIAL_FREETYPE_INCLUDE_PATH/ft2build.h"; then
2c17cbccf2ef 8001922: Improve freetype handling.
ihse
parents: 20649
diff changeset
   258
    # We found an arbitrary include file. That's a good sign.
2c17cbccf2ef 8001922: Improve freetype handling.
ihse
parents: 20649
diff changeset
   259
    AC_MSG_NOTICE([Found freetype include files at $POTENTIAL_FREETYPE_INCLUDE_PATH using $METHOD])
2c17cbccf2ef 8001922: Improve freetype handling.
ihse
parents: 20649
diff changeset
   260
    FOUND_FREETYPE=yes
2c17cbccf2ef 8001922: Improve freetype handling.
ihse
parents: 20649
diff changeset
   261
2c17cbccf2ef 8001922: Improve freetype handling.
ihse
parents: 20649
diff changeset
   262
    FREETYPE_LIB_NAME="${LIBRARY_PREFIX}freetype${SHARED_LIBRARY_SUFFIX}"
2c17cbccf2ef 8001922: Improve freetype handling.
ihse
parents: 20649
diff changeset
   263
    if ! test -s "$POTENTIAL_FREETYPE_LIB_PATH/$FREETYPE_LIB_NAME"; then
2c17cbccf2ef 8001922: Improve freetype handling.
ihse
parents: 20649
diff changeset
   264
      AC_MSG_NOTICE([Could not find $POTENTIAL_FREETYPE_LIB_PATH/$FREETYPE_LIB_NAME. Ignoring location.])
2c17cbccf2ef 8001922: Improve freetype handling.
ihse
parents: 20649
diff changeset
   265
      FOUND_FREETYPE=no
2c17cbccf2ef 8001922: Improve freetype handling.
ihse
parents: 20649
diff changeset
   266
    else
2c17cbccf2ef 8001922: Improve freetype handling.
ihse
parents: 20649
diff changeset
   267
      if test "x$OPENJDK_TARGET_OS" = xwindows; then
2c17cbccf2ef 8001922: Improve freetype handling.
ihse
parents: 20649
diff changeset
   268
        # On Windows, we will need both .lib and .dll file.
2c17cbccf2ef 8001922: Improve freetype handling.
ihse
parents: 20649
diff changeset
   269
        if ! test -s "$POTENTIAL_FREETYPE_LIB_PATH/freetype.lib"; then
2c17cbccf2ef 8001922: Improve freetype handling.
ihse
parents: 20649
diff changeset
   270
          AC_MSG_NOTICE([Could not find $POTENTIAL_FREETYPE_LIB_PATH/freetype.lib. Ignoring location.])
2c17cbccf2ef 8001922: Improve freetype handling.
ihse
parents: 20649
diff changeset
   271
          FOUND_FREETYPE=no
2c17cbccf2ef 8001922: Improve freetype handling.
ihse
parents: 20649
diff changeset
   272
        fi
24081
f98557ef4bf8 8042213: Freetype detection fails on Solaris sparcv9 when using devkit
erikj
parents: 23428
diff changeset
   273
      elif test "x$OPENJDK_TARGET_OS" = xsolaris \
f98557ef4bf8 8042213: Freetype detection fails on Solaris sparcv9 when using devkit
erikj
parents: 23428
diff changeset
   274
          && 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
   275
        # Found lib in isa dir, use that instead.
f98557ef4bf8 8042213: Freetype detection fails on Solaris sparcv9 when using devkit
erikj
parents: 23428
diff changeset
   276
        POTENTIAL_FREETYPE_LIB_PATH="$POTENTIAL_FREETYPE_LIB_PATH$OPENJDK_TARGET_CPU_ISADIR"
20654
2c17cbccf2ef 8001922: Improve freetype handling.
ihse
parents: 20649
diff changeset
   277
      fi
2c17cbccf2ef 8001922: Improve freetype handling.
ihse
parents: 20649
diff changeset
   278
    fi
2c17cbccf2ef 8001922: Improve freetype handling.
ihse
parents: 20649
diff changeset
   279
  fi
2c17cbccf2ef 8001922: Improve freetype handling.
ihse
parents: 20649
diff changeset
   280
2c17cbccf2ef 8001922: Improve freetype handling.
ihse
parents: 20649
diff changeset
   281
  if test "x$FOUND_FREETYPE" = xyes; then
2c17cbccf2ef 8001922: Improve freetype handling.
ihse
parents: 20649
diff changeset
   282
    BASIC_FIXUP_PATH(POTENTIAL_FREETYPE_INCLUDE_PATH)
2c17cbccf2ef 8001922: Improve freetype handling.
ihse
parents: 20649
diff changeset
   283
    BASIC_FIXUP_PATH(POTENTIAL_FREETYPE_LIB_PATH)
2c17cbccf2ef 8001922: Improve freetype handling.
ihse
parents: 20649
diff changeset
   284
2c17cbccf2ef 8001922: Improve freetype handling.
ihse
parents: 20649
diff changeset
   285
    FREETYPE_INCLUDE_PATH="$POTENTIAL_FREETYPE_INCLUDE_PATH"
2c17cbccf2ef 8001922: Improve freetype handling.
ihse
parents: 20649
diff changeset
   286
    AC_MSG_CHECKING([for freetype includes])
2c17cbccf2ef 8001922: Improve freetype handling.
ihse
parents: 20649
diff changeset
   287
    AC_MSG_RESULT([$FREETYPE_INCLUDE_PATH])
2c17cbccf2ef 8001922: Improve freetype handling.
ihse
parents: 20649
diff changeset
   288
    FREETYPE_LIB_PATH="$POTENTIAL_FREETYPE_LIB_PATH"
2c17cbccf2ef 8001922: Improve freetype handling.
ihse
parents: 20649
diff changeset
   289
    AC_MSG_CHECKING([for freetype libraries])
2c17cbccf2ef 8001922: Improve freetype handling.
ihse
parents: 20649
diff changeset
   290
    AC_MSG_RESULT([$FREETYPE_LIB_PATH])
2c17cbccf2ef 8001922: Improve freetype handling.
ihse
parents: 20649
diff changeset
   291
  fi
2c17cbccf2ef 8001922: Improve freetype handling.
ihse
parents: 20649
diff changeset
   292
])
2c17cbccf2ef 8001922: Improve freetype handling.
ihse
parents: 20649
diff changeset
   293
13133
701e61c32ece 7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff changeset
   294
AC_DEFUN_ONCE([LIB_SETUP_FREETYPE],
701e61c32ece 7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff changeset
   295
[
701e61c32ece 7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff changeset
   296
20363
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 19524
diff changeset
   297
  ###############################################################################
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 19524
diff changeset
   298
  #
20654
2c17cbccf2ef 8001922: Improve freetype handling.
ihse
parents: 20649
diff changeset
   299
  # The ubiquitous freetype library is used to render fonts.
20363
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 19524
diff changeset
   300
  #
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 19524
diff changeset
   301
  AC_ARG_WITH(freetype, [AS_HELP_STRING([--with-freetype],
20654
2c17cbccf2ef 8001922: Improve freetype handling.
ihse
parents: 20649
diff changeset
   302
      [specify prefix directory for the freetype package
20363
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 19524
diff changeset
   303
      (expecting the libraries under PATH/lib and the headers under PATH/include)])])
20654
2c17cbccf2ef 8001922: Improve freetype handling.
ihse
parents: 20649
diff changeset
   304
  AC_ARG_WITH(freetype-include, [AS_HELP_STRING([--with-freetype-include],
2c17cbccf2ef 8001922: Improve freetype handling.
ihse
parents: 20649
diff changeset
   305
      [specify directory for the freetype include files])])
2c17cbccf2ef 8001922: Improve freetype handling.
ihse
parents: 20649
diff changeset
   306
  AC_ARG_WITH(freetype-lib, [AS_HELP_STRING([--with-freetype-lib],
2c17cbccf2ef 8001922: Improve freetype handling.
ihse
parents: 20649
diff changeset
   307
      [specify directory for the freetype library])])
2c17cbccf2ef 8001922: Improve freetype handling.
ihse
parents: 20649
diff changeset
   308
  AC_ARG_ENABLE(freetype-bundling, [AS_HELP_STRING([--disable-freetype-bundling],
2c17cbccf2ef 8001922: Improve freetype handling.
ihse
parents: 20649
diff changeset
   309
      [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
   310
20654
2c17cbccf2ef 8001922: Improve freetype handling.
ihse
parents: 20649
diff changeset
   311
  FREETYPE_CFLAGS=
2c17cbccf2ef 8001922: Improve freetype handling.
ihse
parents: 20649
diff changeset
   312
  FREETYPE_LIBS=
2c17cbccf2ef 8001922: Improve freetype handling.
ihse
parents: 20649
diff changeset
   313
  FREETYPE_BUNDLE_LIB_PATH=
13133
701e61c32ece 7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff changeset
   314
20654
2c17cbccf2ef 8001922: Improve freetype handling.
ihse
parents: 20649
diff changeset
   315
  if test "x$FREETYPE_NOT_NEEDED" = xyes; then
20363
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 19524
diff changeset
   316
    if test "x$with_freetype" != x || test "x$with_freetype_include" != x || test "x$with_freetype_lib" != x; then
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 19524
diff changeset
   317
      AC_MSG_WARN([freetype not used, so --with-freetype is ignored])
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 19524
diff changeset
   318
    fi
20654
2c17cbccf2ef 8001922: Improve freetype handling.
ihse
parents: 20649
diff changeset
   319
    if test "x$enable_freetype_bundling" != x; then
2c17cbccf2ef 8001922: Improve freetype handling.
ihse
parents: 20649
diff changeset
   320
      AC_MSG_WARN([freetype not used, so --enable-freetype-bundling is ignored])
2c17cbccf2ef 8001922: Improve freetype handling.
ihse
parents: 20649
diff changeset
   321
    fi
20363
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 19524
diff changeset
   322
  else
20654
2c17cbccf2ef 8001922: Improve freetype handling.
ihse
parents: 20649
diff changeset
   323
    # freetype is needed to build; go get it!
2c17cbccf2ef 8001922: Improve freetype handling.
ihse
parents: 20649
diff changeset
   324
2c17cbccf2ef 8001922: Improve freetype handling.
ihse
parents: 20649
diff changeset
   325
    BUNDLE_FREETYPE="$enable_freetype_bundling"
2c17cbccf2ef 8001922: Improve freetype handling.
ihse
parents: 20649
diff changeset
   326
2c17cbccf2ef 8001922: Improve freetype handling.
ihse
parents: 20649
diff changeset
   327
    if test "x$with_freetype" != x || test "x$with_freetype_include" != x || test "x$with_freetype_lib" != x; then
2c17cbccf2ef 8001922: Improve freetype handling.
ihse
parents: 20649
diff changeset
   328
      # User has specified settings
2c17cbccf2ef 8001922: Improve freetype handling.
ihse
parents: 20649
diff changeset
   329
2c17cbccf2ef 8001922: Improve freetype handling.
ihse
parents: 20649
diff changeset
   330
      if test "x$BUNDLE_FREETYPE" = x; then
2c17cbccf2ef 8001922: Improve freetype handling.
ihse
parents: 20649
diff changeset
   331
        # If not specified, default is to bundle freetype
2c17cbccf2ef 8001922: Improve freetype handling.
ihse
parents: 20649
diff changeset
   332
        BUNDLE_FREETYPE=yes
2c17cbccf2ef 8001922: Improve freetype handling.
ihse
parents: 20649
diff changeset
   333
      fi
2c17cbccf2ef 8001922: Improve freetype handling.
ihse
parents: 20649
diff changeset
   334
      
2c17cbccf2ef 8001922: Improve freetype handling.
ihse
parents: 20649
diff changeset
   335
      if test "x$with_freetype" != x; then
2c17cbccf2ef 8001922: Improve freetype handling.
ihse
parents: 20649
diff changeset
   336
        POTENTIAL_FREETYPE_INCLUDE_PATH="$with_freetype/include"
2c17cbccf2ef 8001922: Improve freetype handling.
ihse
parents: 20649
diff changeset
   337
        POTENTIAL_FREETYPE_LIB_PATH="$with_freetype/lib"
2c17cbccf2ef 8001922: Improve freetype handling.
ihse
parents: 20649
diff changeset
   338
      fi
2c17cbccf2ef 8001922: Improve freetype handling.
ihse
parents: 20649
diff changeset
   339
      
2c17cbccf2ef 8001922: Improve freetype handling.
ihse
parents: 20649
diff changeset
   340
      # Allow --with-freetype-lib and --with-freetype-include to override
2c17cbccf2ef 8001922: Improve freetype handling.
ihse
parents: 20649
diff changeset
   341
      if test "x$with_freetype_include" != x; then
2c17cbccf2ef 8001922: Improve freetype handling.
ihse
parents: 20649
diff changeset
   342
        POTENTIAL_FREETYPE_INCLUDE_PATH="$with_freetype_include"
2c17cbccf2ef 8001922: Improve freetype handling.
ihse
parents: 20649
diff changeset
   343
      fi
2c17cbccf2ef 8001922: Improve freetype handling.
ihse
parents: 20649
diff changeset
   344
      if test "x$with_freetype_lib" != x; then
2c17cbccf2ef 8001922: Improve freetype handling.
ihse
parents: 20649
diff changeset
   345
        POTENTIAL_FREETYPE_LIB_PATH="$with_freetype_lib"
2c17cbccf2ef 8001922: Improve freetype handling.
ihse
parents: 20649
diff changeset
   346
      fi
13133
701e61c32ece 7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff changeset
   347
20654
2c17cbccf2ef 8001922: Improve freetype handling.
ihse
parents: 20649
diff changeset
   348
      if test "x$POTENTIAL_FREETYPE_INCLUDE_PATH" != x && test "x$POTENTIAL_FREETYPE_LIB_PATH" != x; then
2c17cbccf2ef 8001922: Improve freetype handling.
ihse
parents: 20649
diff changeset
   349
        # Okay, we got it. Check that it works.
2c17cbccf2ef 8001922: Improve freetype handling.
ihse
parents: 20649
diff changeset
   350
        LIB_CHECK_POTENTIAL_FREETYPE($POTENTIAL_FREETYPE_INCLUDE_PATH, $POTENTIAL_FREETYPE_LIB_PATH, [--with-freetype])
2c17cbccf2ef 8001922: Improve freetype handling.
ihse
parents: 20649
diff changeset
   351
        if test "x$FOUND_FREETYPE" != xyes; then
2c17cbccf2ef 8001922: Improve freetype handling.
ihse
parents: 20649
diff changeset
   352
          AC_MSG_ERROR([Can not find or use freetype at location given by --with-freetype])
2c17cbccf2ef 8001922: Improve freetype handling.
ihse
parents: 20649
diff changeset
   353
        fi
2c17cbccf2ef 8001922: Improve freetype handling.
ihse
parents: 20649
diff changeset
   354
      else
2c17cbccf2ef 8001922: Improve freetype handling.
ihse
parents: 20649
diff changeset
   355
        # User specified only one of lib or include. This is an error.
2c17cbccf2ef 8001922: Improve freetype handling.
ihse
parents: 20649
diff changeset
   356
        if test "x$POTENTIAL_FREETYPE_INCLUDE_PATH" = x ; then
2c17cbccf2ef 8001922: Improve freetype handling.
ihse
parents: 20649
diff changeset
   357
          AC_MSG_NOTICE([User specified --with-freetype-lib but not --with-freetype-include])
2c17cbccf2ef 8001922: Improve freetype handling.
ihse
parents: 20649
diff changeset
   358
          AC_MSG_ERROR([Need both freetype lib and include paths. Consider using --with-freetype instead.])
2c17cbccf2ef 8001922: Improve freetype handling.
ihse
parents: 20649
diff changeset
   359
        else
2c17cbccf2ef 8001922: Improve freetype handling.
ihse
parents: 20649
diff changeset
   360
          AC_MSG_NOTICE([User specified --with-freetype-include but not --with-freetype-lib])
2c17cbccf2ef 8001922: Improve freetype handling.
ihse
parents: 20649
diff changeset
   361
          AC_MSG_ERROR([Need both freetype lib and include paths. Consider using --with-freetype instead.])
2c17cbccf2ef 8001922: Improve freetype handling.
ihse
parents: 20649
diff changeset
   362
        fi
20363
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 19524
diff changeset
   363
      fi
20654
2c17cbccf2ef 8001922: Improve freetype handling.
ihse
parents: 20649
diff changeset
   364
    else
2c17cbccf2ef 8001922: Improve freetype handling.
ihse
parents: 20649
diff changeset
   365
      # User did not specify settings, but we need freetype. Try to locate it.
2c17cbccf2ef 8001922: Improve freetype handling.
ihse
parents: 20649
diff changeset
   366
2c17cbccf2ef 8001922: Improve freetype handling.
ihse
parents: 20649
diff changeset
   367
      if test "x$BUNDLE_FREETYPE" = x; then
2c17cbccf2ef 8001922: Improve freetype handling.
ihse
parents: 20649
diff changeset
   368
        # If not specified, default is to bundle freetype only on windows
2c17cbccf2ef 8001922: Improve freetype handling.
ihse
parents: 20649
diff changeset
   369
        if test "x$OPENJDK_TARGET_OS" = xwindows; then
2c17cbccf2ef 8001922: Improve freetype handling.
ihse
parents: 20649
diff changeset
   370
          BUNDLE_FREETYPE=yes
2c17cbccf2ef 8001922: Improve freetype handling.
ihse
parents: 20649
diff changeset
   371
        else
2c17cbccf2ef 8001922: Improve freetype handling.
ihse
parents: 20649
diff changeset
   372
          BUNDLE_FREETYPE=no
2c17cbccf2ef 8001922: Improve freetype handling.
ihse
parents: 20649
diff changeset
   373
        fi
2c17cbccf2ef 8001922: Improve freetype handling.
ihse
parents: 20649
diff changeset
   374
      fi
2c17cbccf2ef 8001922: Improve freetype handling.
ihse
parents: 20649
diff changeset
   375
2c17cbccf2ef 8001922: Improve freetype handling.
ihse
parents: 20649
diff changeset
   376
      if test "x$FOUND_FREETYPE" != xyes; then
2c17cbccf2ef 8001922: Improve freetype handling.
ihse
parents: 20649
diff changeset
   377
        # Check builddeps
2c17cbccf2ef 8001922: Improve freetype handling.
ihse
parents: 20649
diff changeset
   378
        BDEPS_CHECK_MODULE(FREETYPE, freetype2, xxx, [FOUND_FREETYPE=yes], [FOUND_FREETYPE=no])
2c17cbccf2ef 8001922: Improve freetype handling.
ihse
parents: 20649
diff changeset
   379
        # BDEPS_CHECK_MODULE will set FREETYPE_CFLAGS and _LIBS, but we don't get a lib path for bundling.
2c17cbccf2ef 8001922: Improve freetype handling.
ihse
parents: 20649
diff changeset
   380
        if test "x$FOUND_FREETYPE" = xyes; then
2c17cbccf2ef 8001922: Improve freetype handling.
ihse
parents: 20649
diff changeset
   381
          if test "x$BUNDLE_FREETYPE" = xyes; then
2c17cbccf2ef 8001922: Improve freetype handling.
ihse
parents: 20649
diff changeset
   382
            AC_MSG_NOTICE([Found freetype using builddeps, but ignoring since we can not bundle that])
2c17cbccf2ef 8001922: Improve freetype handling.
ihse
parents: 20649
diff changeset
   383
            FOUND_FREETYPE=no
2c17cbccf2ef 8001922: Improve freetype handling.
ihse
parents: 20649
diff changeset
   384
          else
2c17cbccf2ef 8001922: Improve freetype handling.
ihse
parents: 20649
diff changeset
   385
            AC_MSG_CHECKING([for freetype])
2c17cbccf2ef 8001922: Improve freetype handling.
ihse
parents: 20649
diff changeset
   386
            AC_MSG_RESULT([yes (using builddeps)])
2c17cbccf2ef 8001922: Improve freetype handling.
ihse
parents: 20649
diff changeset
   387
          fi
2c17cbccf2ef 8001922: Improve freetype handling.
ihse
parents: 20649
diff changeset
   388
        fi
20363
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 19524
diff changeset
   389
      fi
20654
2c17cbccf2ef 8001922: Improve freetype handling.
ihse
parents: 20649
diff changeset
   390
23428
3c8a05bf4656 8038340: Cleanup and fix sysroot and devkit handling on Linux and Solaris
erikj
parents: 23165
diff changeset
   391
      # 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
   392
      if test "x$SYSROOT" = x; then
3c8a05bf4656 8038340: Cleanup and fix sysroot and devkit handling on Linux and Solaris
erikj
parents: 23165
diff changeset
   393
        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
   394
          # 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
   395
          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
   396
            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
   397
            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
   398
              # 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
   399
              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
   400
              # 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
   401
              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
   402
                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
   403
              fi
3c8a05bf4656 8038340: Cleanup and fix sysroot and devkit handling on Linux and Solaris
erikj
parents: 23165
diff changeset
   404
              # 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
   405
              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
   406
                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
   407
                FOUND_FREETYPE=no
3c8a05bf4656 8038340: Cleanup and fix sysroot and devkit handling on Linux and Solaris
erikj
parents: 23165
diff changeset
   408
              else
3c8a05bf4656 8038340: Cleanup and fix sysroot and devkit handling on Linux and Solaris
erikj
parents: 23165
diff changeset
   409
                AC_MSG_CHECKING([for freetype])
3c8a05bf4656 8038340: Cleanup and fix sysroot and devkit handling on Linux and Solaris
erikj
parents: 23165
diff changeset
   410
                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
   411
              fi
20654
2c17cbccf2ef 8001922: Improve freetype handling.
ihse
parents: 20649
diff changeset
   412
            fi
2c17cbccf2ef 8001922: Improve freetype handling.
ihse
parents: 20649
diff changeset
   413
          fi
20363
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 19524
diff changeset
   414
        fi
20654
2c17cbccf2ef 8001922: Improve freetype handling.
ihse
parents: 20649
diff changeset
   415
      fi
2c17cbccf2ef 8001922: Improve freetype handling.
ihse
parents: 20649
diff changeset
   416
2c17cbccf2ef 8001922: Improve freetype handling.
ihse
parents: 20649
diff changeset
   417
      if test "x$FOUND_FREETYPE" != xyes; then
2c17cbccf2ef 8001922: Improve freetype handling.
ihse
parents: 20649
diff changeset
   418
        # Check in well-known locations
2c17cbccf2ef 8001922: Improve freetype handling.
ihse
parents: 20649
diff changeset
   419
        if test "x$OPENJDK_TARGET_OS" = xwindows; then
2c17cbccf2ef 8001922: Improve freetype handling.
ihse
parents: 20649
diff changeset
   420
          FREETYPE_BASE_DIR="$PROGRAMFILES/GnuWin32"
2c17cbccf2ef 8001922: Improve freetype handling.
ihse
parents: 20649
diff changeset
   421
          BASIC_WINDOWS_REWRITE_AS_UNIX_PATH(FREETYPE_BASE_DIR)
2c17cbccf2ef 8001922: Improve freetype handling.
ihse
parents: 20649
diff changeset
   422
          LIB_CHECK_POTENTIAL_FREETYPE([$FREETYPE_BASE_DIR/include], [$FREETYPE_BASE_DIR/lib], [well-known location])
2c17cbccf2ef 8001922: Improve freetype handling.
ihse
parents: 20649
diff changeset
   423
          if test "x$FOUND_FREETYPE" != xyes; then
2c17cbccf2ef 8001922: Improve freetype handling.
ihse
parents: 20649
diff changeset
   424
            FREETYPE_BASE_DIR="$ProgramW6432/GnuWin32"
2c17cbccf2ef 8001922: Improve freetype handling.
ihse
parents: 20649
diff changeset
   425
            BASIC_WINDOWS_REWRITE_AS_UNIX_PATH(FREETYPE_BASE_DIR)
2c17cbccf2ef 8001922: Improve freetype handling.
ihse
parents: 20649
diff changeset
   426
            LIB_CHECK_POTENTIAL_FREETYPE([$FREETYPE_BASE_DIR/include], [$FREETYPE_BASE_DIR/lib], [well-known location])
2c17cbccf2ef 8001922: Improve freetype handling.
ihse
parents: 20649
diff changeset
   427
          fi
2c17cbccf2ef 8001922: Improve freetype handling.
ihse
parents: 20649
diff changeset
   428
        else
23428
3c8a05bf4656 8038340: Cleanup and fix sysroot and devkit handling on Linux and Solaris
erikj
parents: 23165
diff changeset
   429
          FREETYPE_BASE_DIR="$SYSROOT/usr"
20654
2c17cbccf2ef 8001922: Improve freetype handling.
ihse
parents: 20649
diff changeset
   430
          LIB_CHECK_POTENTIAL_FREETYPE([$FREETYPE_BASE_DIR/include], [$FREETYPE_BASE_DIR/lib], [well-known location])
2c17cbccf2ef 8001922: Improve freetype handling.
ihse
parents: 20649
diff changeset
   431
2c17cbccf2ef 8001922: Improve freetype handling.
ihse
parents: 20649
diff changeset
   432
          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
   433
            FREETYPE_BASE_DIR="$SYSROOT/usr/X11"
20654
2c17cbccf2ef 8001922: Improve freetype handling.
ihse
parents: 20649
diff changeset
   434
            LIB_CHECK_POTENTIAL_FREETYPE([$FREETYPE_BASE_DIR/include], [$FREETYPE_BASE_DIR/lib], [well-known location])
2c17cbccf2ef 8001922: Improve freetype handling.
ihse
parents: 20649
diff changeset
   435
          fi
2c17cbccf2ef 8001922: Improve freetype handling.
ihse
parents: 20649
diff changeset
   436
2c17cbccf2ef 8001922: Improve freetype handling.
ihse
parents: 20649
diff changeset
   437
          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
   438
            FREETYPE_BASE_DIR="$SYSROOT/usr/sfw"
3c8a05bf4656 8038340: Cleanup and fix sysroot and devkit handling on Linux and Solaris
erikj
parents: 23165
diff changeset
   439
            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
   440
          fi
3c8a05bf4656 8038340: Cleanup and fix sysroot and devkit handling on Linux and Solaris
erikj
parents: 23165
diff changeset
   441
3c8a05bf4656 8038340: Cleanup and fix sysroot and devkit handling on Linux and Solaris
erikj
parents: 23165
diff changeset
   442
          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
   443
            FREETYPE_BASE_DIR="$SYSROOT/usr"
20654
2c17cbccf2ef 8001922: Improve freetype handling.
ihse
parents: 20649
diff changeset
   444
            if test "x$OPENJDK_TARGET_CPU_BITS" = x64; then
2c17cbccf2ef 8001922: Improve freetype handling.
ihse
parents: 20649
diff changeset
   445
              LIB_CHECK_POTENTIAL_FREETYPE([$FREETYPE_BASE_DIR/include], [$FREETYPE_BASE_DIR/lib/x86_64-linux-gnu], [well-known location])
2c17cbccf2ef 8001922: Improve freetype handling.
ihse
parents: 20649
diff changeset
   446
            else
2c17cbccf2ef 8001922: Improve freetype handling.
ihse
parents: 20649
diff changeset
   447
              LIB_CHECK_POTENTIAL_FREETYPE([$FREETYPE_BASE_DIR/include], [$FREETYPE_BASE_DIR/lib/i386-linux-gnu], [well-known location])
2c17cbccf2ef 8001922: Improve freetype handling.
ihse
parents: 20649
diff changeset
   448
              if test "x$FOUND_FREETYPE" != xyes; then
2c17cbccf2ef 8001922: Improve freetype handling.
ihse
parents: 20649
diff changeset
   449
                LIB_CHECK_POTENTIAL_FREETYPE([$FREETYPE_BASE_DIR/include], [$FREETYPE_BASE_DIR/lib32], [well-known location])
2c17cbccf2ef 8001922: Improve freetype handling.
ihse
parents: 20649
diff changeset
   450
              fi
2c17cbccf2ef 8001922: Improve freetype handling.
ihse
parents: 20649
diff changeset
   451
            fi
2c17cbccf2ef 8001922: Improve freetype handling.
ihse
parents: 20649
diff changeset
   452
          fi
20363
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 19524
diff changeset
   453
        fi
20654
2c17cbccf2ef 8001922: Improve freetype handling.
ihse
parents: 20649
diff changeset
   454
      fi # end check in well-known locations
2c17cbccf2ef 8001922: Improve freetype handling.
ihse
parents: 20649
diff changeset
   455
2c17cbccf2ef 8001922: Improve freetype handling.
ihse
parents: 20649
diff changeset
   456
      if test "x$FOUND_FREETYPE" != xyes; then
2c17cbccf2ef 8001922: Improve freetype handling.
ihse
parents: 20649
diff changeset
   457
        HELP_MSG_MISSING_DEPENDENCY([freetype])
2c17cbccf2ef 8001922: Improve freetype handling.
ihse
parents: 20649
diff changeset
   458
        AC_MSG_ERROR([Could not find freetype! $HELP_MSG ])
2c17cbccf2ef 8001922: Improve freetype handling.
ihse
parents: 20649
diff changeset
   459
      fi
2c17cbccf2ef 8001922: Improve freetype handling.
ihse
parents: 20649
diff changeset
   460
    fi # end user specified settings
2c17cbccf2ef 8001922: Improve freetype handling.
ihse
parents: 20649
diff changeset
   461
2c17cbccf2ef 8001922: Improve freetype handling.
ihse
parents: 20649
diff changeset
   462
    # Set FREETYPE_CFLAGS, _LIBS and _LIB_PATH from include and lib dir.
2c17cbccf2ef 8001922: Improve freetype handling.
ihse
parents: 20649
diff changeset
   463
    if test "x$FREETYPE_CFLAGS" = x; then
2c17cbccf2ef 8001922: Improve freetype handling.
ihse
parents: 20649
diff changeset
   464
      BASIC_FIXUP_PATH(FREETYPE_INCLUDE_PATH)
2c17cbccf2ef 8001922: Improve freetype handling.
ihse
parents: 20649
diff changeset
   465
      if test -d $FREETYPE_INCLUDE_PATH/freetype2/freetype; then
2c17cbccf2ef 8001922: Improve freetype handling.
ihse
parents: 20649
diff changeset
   466
        FREETYPE_CFLAGS="-I$FREETYPE_INCLUDE_PATH/freetype2 -I$FREETYPE_INCLUDE_PATH"
2c17cbccf2ef 8001922: Improve freetype handling.
ihse
parents: 20649
diff changeset
   467
      else
2c17cbccf2ef 8001922: Improve freetype handling.
ihse
parents: 20649
diff changeset
   468
        FREETYPE_CFLAGS="-I$FREETYPE_INCLUDE_PATH"
20363
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 19524
diff changeset
   469
      fi
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 19524
diff changeset
   470
    fi
20654
2c17cbccf2ef 8001922: Improve freetype handling.
ihse
parents: 20649
diff changeset
   471
    
2c17cbccf2ef 8001922: Improve freetype handling.
ihse
parents: 20649
diff changeset
   472
    if test "x$FREETYPE_LIBS" = x; then
2c17cbccf2ef 8001922: Improve freetype handling.
ihse
parents: 20649
diff changeset
   473
      BASIC_FIXUP_PATH(FREETYPE_LIB_PATH)
2c17cbccf2ef 8001922: Improve freetype handling.
ihse
parents: 20649
diff changeset
   474
      if test "x$OPENJDK_TARGET_OS" = xwindows; then
2c17cbccf2ef 8001922: Improve freetype handling.
ihse
parents: 20649
diff changeset
   475
        FREETYPE_LIBS="$FREETYPE_LIB_PATH/freetype.lib"
2c17cbccf2ef 8001922: Improve freetype handling.
ihse
parents: 20649
diff changeset
   476
      else
2c17cbccf2ef 8001922: Improve freetype handling.
ihse
parents: 20649
diff changeset
   477
        FREETYPE_LIBS="-L$FREETYPE_LIB_PATH -lfreetype"
20363
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 19524
diff changeset
   478
      fi
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 19524
diff changeset
   479
    fi
14111
2a82ecb35fc7 8000992: Update new build-infra makefiles
ohair
parents: 13697
diff changeset
   480
20654
2c17cbccf2ef 8001922: Improve freetype handling.
ihse
parents: 20649
diff changeset
   481
    # Try to compile it
2c17cbccf2ef 8001922: Improve freetype handling.
ihse
parents: 20649
diff changeset
   482
    AC_MSG_CHECKING([if we can compile and link with freetype])
2c17cbccf2ef 8001922: Improve freetype handling.
ihse
parents: 20649
diff changeset
   483
    AC_LANG_PUSH(C++)
2c17cbccf2ef 8001922: Improve freetype handling.
ihse
parents: 20649
diff changeset
   484
    PREV_CXXCFLAGS="$CXXFLAGS"
21056
16245d19b19a 8027300: configure should use LIBS instead of LDFLAGS when testing freetype
ihse
parents: 20655
diff changeset
   485
    PREV_LIBS="$LIBS"
20654
2c17cbccf2ef 8001922: Improve freetype handling.
ihse
parents: 20649
diff changeset
   486
    PREV_CXX="$CXX"
2c17cbccf2ef 8001922: Improve freetype handling.
ihse
parents: 20649
diff changeset
   487
    CXXFLAGS="$CXXFLAGS $FREETYPE_CFLAGS" 
21056
16245d19b19a 8027300: configure should use LIBS instead of LDFLAGS when testing freetype
ihse
parents: 20655
diff changeset
   488
    LIBS="$LIBS $FREETYPE_LIBS"
20654
2c17cbccf2ef 8001922: Improve freetype handling.
ihse
parents: 20649
diff changeset
   489
    CXX="$FIXPATH $CXX"
2c17cbccf2ef 8001922: Improve freetype handling.
ihse
parents: 20649
diff changeset
   490
    AC_LINK_IFELSE([AC_LANG_SOURCE([[
2c17cbccf2ef 8001922: Improve freetype handling.
ihse
parents: 20649
diff changeset
   491
          #include<ft2build.h>
2c17cbccf2ef 8001922: Improve freetype handling.
ihse
parents: 20649
diff changeset
   492
          #include FT_FREETYPE_H
2c17cbccf2ef 8001922: Improve freetype handling.
ihse
parents: 20649
diff changeset
   493
          int main () {
2c17cbccf2ef 8001922: Improve freetype handling.
ihse
parents: 20649
diff changeset
   494
            FT_Init_FreeType(NULL);
2c17cbccf2ef 8001922: Improve freetype handling.
ihse
parents: 20649
diff changeset
   495
            return 0;
2c17cbccf2ef 8001922: Improve freetype handling.
ihse
parents: 20649
diff changeset
   496
          }
2c17cbccf2ef 8001922: Improve freetype handling.
ihse
parents: 20649
diff changeset
   497
        ]])],
2c17cbccf2ef 8001922: Improve freetype handling.
ihse
parents: 20649
diff changeset
   498
        [
2c17cbccf2ef 8001922: Improve freetype handling.
ihse
parents: 20649
diff changeset
   499
          AC_MSG_RESULT([yes])
2c17cbccf2ef 8001922: Improve freetype handling.
ihse
parents: 20649
diff changeset
   500
        ],
2c17cbccf2ef 8001922: Improve freetype handling.
ihse
parents: 20649
diff changeset
   501
        [
2c17cbccf2ef 8001922: Improve freetype handling.
ihse
parents: 20649
diff changeset
   502
          AC_MSG_RESULT([no])
2c17cbccf2ef 8001922: Improve freetype handling.
ihse
parents: 20649
diff changeset
   503
          AC_MSG_NOTICE([Could not compile and link with freetype. This might be a 32/64-bit mismatch.])
2c17cbccf2ef 8001922: Improve freetype handling.
ihse
parents: 20649
diff changeset
   504
          AC_MSG_NOTICE([Using FREETYPE_CFLAGS=$FREETYPE_CFLAGS and FREETYPE_LIBS=$FREETYPE_LIBS])
2c17cbccf2ef 8001922: Improve freetype handling.
ihse
parents: 20649
diff changeset
   505
          
2c17cbccf2ef 8001922: Improve freetype handling.
ihse
parents: 20649
diff changeset
   506
          HELP_MSG_MISSING_DEPENDENCY([freetype])
2c17cbccf2ef 8001922: Improve freetype handling.
ihse
parents: 20649
diff changeset
   507
          
2c17cbccf2ef 8001922: Improve freetype handling.
ihse
parents: 20649
diff changeset
   508
          AC_MSG_ERROR([Can not continue without freetype. $HELP_MSG])
2c17cbccf2ef 8001922: Improve freetype handling.
ihse
parents: 20649
diff changeset
   509
        ]
2c17cbccf2ef 8001922: Improve freetype handling.
ihse
parents: 20649
diff changeset
   510
    )
2c17cbccf2ef 8001922: Improve freetype handling.
ihse
parents: 20649
diff changeset
   511
    CXXCFLAGS="$PREV_CXXFLAGS"
21056
16245d19b19a 8027300: configure should use LIBS instead of LDFLAGS when testing freetype
ihse
parents: 20655
diff changeset
   512
    LIBS="$PREV_LIBS"
20654
2c17cbccf2ef 8001922: Improve freetype handling.
ihse
parents: 20649
diff changeset
   513
    CXX="$PREV_CXX"
2c17cbccf2ef 8001922: Improve freetype handling.
ihse
parents: 20649
diff changeset
   514
    AC_LANG_POP(C++)
2c17cbccf2ef 8001922: Improve freetype handling.
ihse
parents: 20649
diff changeset
   515
2c17cbccf2ef 8001922: Improve freetype handling.
ihse
parents: 20649
diff changeset
   516
    AC_MSG_CHECKING([if we should bundle freetype])
2c17cbccf2ef 8001922: Improve freetype handling.
ihse
parents: 20649
diff changeset
   517
    if test "x$BUNDLE_FREETYPE" = xyes; then
2c17cbccf2ef 8001922: Improve freetype handling.
ihse
parents: 20649
diff changeset
   518
      FREETYPE_BUNDLE_LIB_PATH="$FREETYPE_LIB_PATH"
20363
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 19524
diff changeset
   519
    fi
20654
2c17cbccf2ef 8001922: Improve freetype handling.
ihse
parents: 20649
diff changeset
   520
    AC_MSG_RESULT([$BUNDLE_FREETYPE])
2c17cbccf2ef 8001922: Improve freetype handling.
ihse
parents: 20649
diff changeset
   521
2c17cbccf2ef 8001922: Improve freetype handling.
ihse
parents: 20649
diff changeset
   522
  fi # end freetype needed
13133
701e61c32ece 7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff changeset
   523
20654
2c17cbccf2ef 8001922: Improve freetype handling.
ihse
parents: 20649
diff changeset
   524
  AC_SUBST(FREETYPE_BUNDLE_LIB_PATH)
2c17cbccf2ef 8001922: Improve freetype handling.
ihse
parents: 20649
diff changeset
   525
  AC_SUBST(FREETYPE_CFLAGS)
2c17cbccf2ef 8001922: Improve freetype handling.
ihse
parents: 20649
diff changeset
   526
  AC_SUBST(FREETYPE_LIBS)
13133
701e61c32ece 7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff changeset
   527
])
701e61c32ece 7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff changeset
   528
701e61c32ece 7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff changeset
   529
AC_DEFUN_ONCE([LIB_SETUP_ALSA],
701e61c32ece 7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff changeset
   530
[
701e61c32ece 7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff changeset
   531
20363
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 19524
diff changeset
   532
  ###############################################################################
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 19524
diff changeset
   533
  #
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 19524
diff changeset
   534
  # Check for alsa headers and libraries. Used on Linux/GNU systems.
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 19524
diff changeset
   535
  #
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 19524
diff changeset
   536
  AC_ARG_WITH(alsa, [AS_HELP_STRING([--with-alsa],
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 19524
diff changeset
   537
      [specify prefix directory for the alsa package
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 19524
diff changeset
   538
      (expecting the libraries under PATH/lib and the headers under PATH/include)])])
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 19524
diff changeset
   539
  AC_ARG_WITH(alsa-include, [AS_HELP_STRING([--with-alsa-include],
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 19524
diff changeset
   540
      [specify directory for the alsa include files])])
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 19524
diff changeset
   541
  AC_ARG_WITH(alsa-lib, [AS_HELP_STRING([--with-alsa-lib],
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 19524
diff changeset
   542
      [specify directory for the alsa library])])
13133
701e61c32ece 7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff changeset
   543
20363
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 19524
diff changeset
   544
  if test "x$ALSA_NOT_NEEDED" = xyes; then
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 19524
diff changeset
   545
    if test "x${with_alsa}" != x || test "x${with_alsa_include}" != x || test "x${with_alsa_lib}" != x; then
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 19524
diff changeset
   546
      AC_MSG_WARN([alsa not used, so --with-alsa is ignored])
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 19524
diff changeset
   547
    fi
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 19524
diff changeset
   548
    ALSA_CFLAGS=
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 19524
diff changeset
   549
    ALSA_LIBS=
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 19524
diff changeset
   550
  else
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 19524
diff changeset
   551
    ALSA_FOUND=no
13133
701e61c32ece 7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff changeset
   552
20363
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 19524
diff changeset
   553
    if test "x${with_alsa}" = xno || test "x${with_alsa_include}" = xno || test "x${with_alsa_lib}" = xno; then
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 19524
diff changeset
   554
      AC_MSG_ERROR([It is not possible to disable the use of alsa. Remove the --without-alsa option.])
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 19524
diff changeset
   555
    fi
13133
701e61c32ece 7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff changeset
   556
20363
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 19524
diff changeset
   557
    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
   558
      ALSA_LIBS="-L${with_alsa}/lib -lasound"
20363
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 19524
diff changeset
   559
      ALSA_CFLAGS="-I${with_alsa}/include"
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 19524
diff changeset
   560
      ALSA_FOUND=yes
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 19524
diff changeset
   561
    fi
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 19524
diff changeset
   562
    if test "x${with_alsa_include}" != x; then
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 19524
diff changeset
   563
      ALSA_CFLAGS="-I${with_alsa_include}"
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 19524
diff changeset
   564
      ALSA_FOUND=yes
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 19524
diff changeset
   565
    fi
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 19524
diff changeset
   566
    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
   567
      ALSA_LIBS="-L${with_alsa_lib} -lasound"
20363
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 19524
diff changeset
   568
      ALSA_FOUND=yes
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 19524
diff changeset
   569
    fi
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 19524
diff changeset
   570
    if test "x$ALSA_FOUND" = xno; then
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 19524
diff changeset
   571
      BDEPS_CHECK_MODULE(ALSA, alsa, xxx, [ALSA_FOUND=yes], [ALSA_FOUND=no])
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 19524
diff changeset
   572
    fi
23428
3c8a05bf4656 8038340: Cleanup and fix sysroot and devkit handling on Linux and Solaris
erikj
parents: 23165
diff changeset
   573
    # 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
   574
    if test "x$SYSROOT" = x; then
3c8a05bf4656 8038340: Cleanup and fix sysroot and devkit handling on Linux and Solaris
erikj
parents: 23165
diff changeset
   575
      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
   576
        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
   577
      fi
20363
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 19524
diff changeset
   578
    fi
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 19524
diff changeset
   579
    if test "x$ALSA_FOUND" = xno; then
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 19524
diff changeset
   580
      AC_CHECK_HEADERS([alsa/asoundlib.h],
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 19524
diff changeset
   581
          [
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 19524
diff changeset
   582
            ALSA_FOUND=yes
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 19524
diff changeset
   583
            ALSA_CFLAGS=-Iignoreme
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 19524
diff changeset
   584
            ALSA_LIBS=-lasound
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 19524
diff changeset
   585
            DEFAULT_ALSA=yes
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 19524
diff changeset
   586
          ],
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 19524
diff changeset
   587
          [ALSA_FOUND=no])
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 19524
diff changeset
   588
    fi
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 19524
diff changeset
   589
    if test "x$ALSA_FOUND" = xno; then
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 19524
diff changeset
   590
      HELP_MSG_MISSING_DEPENDENCY([alsa])
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 19524
diff changeset
   591
      AC_MSG_ERROR([Could not find alsa! $HELP_MSG ])
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 19524
diff changeset
   592
    fi
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 19524
diff changeset
   593
  fi
13133
701e61c32ece 7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff changeset
   594
20363
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 19524
diff changeset
   595
  AC_SUBST(ALSA_CFLAGS)
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 19524
diff changeset
   596
  AC_SUBST(ALSA_LIBS)
13133
701e61c32ece 7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff changeset
   597
])
701e61c32ece 7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff changeset
   598
701e61c32ece 7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff changeset
   599
AC_DEFUN_ONCE([LIB_SETUP_MISC_LIBS],
701e61c32ece 7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff changeset
   600
[
701e61c32ece 7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff changeset
   601
20363
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 19524
diff changeset
   602
  ###############################################################################
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 19524
diff changeset
   603
  #
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 19524
diff changeset
   604
  # Check for the jpeg library
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 19524
diff changeset
   605
  #
13133
701e61c32ece 7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff changeset
   606
20363
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 19524
diff changeset
   607
  USE_EXTERNAL_LIBJPEG=true
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 19524
diff changeset
   608
  AC_CHECK_LIB(jpeg, main, [],
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 19524
diff changeset
   609
      [ USE_EXTERNAL_LIBJPEG=false
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 19524
diff changeset
   610
      AC_MSG_NOTICE([Will use jpeg decoder bundled with the OpenJDK source])
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 19524
diff changeset
   611
  ])
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 19524
diff changeset
   612
  AC_SUBST(USE_EXTERNAL_LIBJPEG)
13133
701e61c32ece 7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff changeset
   613
20363
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 19524
diff changeset
   614
  ###############################################################################
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 19524
diff changeset
   615
  #
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 19524
diff changeset
   616
  # Check for the gif library
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 19524
diff changeset
   617
  #
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 19524
diff changeset
   618
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 19524
diff changeset
   619
  AC_ARG_WITH(giflib, [AS_HELP_STRING([--with-giflib],
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 19524
diff changeset
   620
      [use giflib from build system or OpenJDK source (system, bundled) @<:@bundled@:>@])])
16424
d955df81d716 8011278: Allow using a system-installed giflib
omajid
parents: 15915
diff changeset
   621
d955df81d716 8011278: Allow using a system-installed giflib
omajid
parents: 15915
diff changeset
   622
20363
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 19524
diff changeset
   623
  AC_MSG_CHECKING([for which giflib to use])
16424
d955df81d716 8011278: Allow using a system-installed giflib
omajid
parents: 15915
diff changeset
   624
20363
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 19524
diff changeset
   625
  # default is bundled
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 19524
diff changeset
   626
  DEFAULT_GIFLIB=bundled
16424
d955df81d716 8011278: Allow using a system-installed giflib
omajid
parents: 15915
diff changeset
   627
20363
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 19524
diff changeset
   628
  #
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 19524
diff changeset
   629
  # if user didn't specify, use DEFAULT_GIFLIB
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 19524
diff changeset
   630
  #
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 19524
diff changeset
   631
  if test "x${with_giflib}" = "x"; then
16424
d955df81d716 8011278: Allow using a system-installed giflib
omajid
parents: 15915
diff changeset
   632
    with_giflib=${DEFAULT_GIFLIB}
20363
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 19524
diff changeset
   633
  fi
16424
d955df81d716 8011278: Allow using a system-installed giflib
omajid
parents: 15915
diff changeset
   634
20363
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 19524
diff changeset
   635
  AC_MSG_RESULT(${with_giflib})
16424
d955df81d716 8011278: Allow using a system-installed giflib
omajid
parents: 15915
diff changeset
   636
20363
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 19524
diff changeset
   637
  if test "x${with_giflib}" = "xbundled"; then
16424
d955df81d716 8011278: Allow using a system-installed giflib
omajid
parents: 15915
diff changeset
   638
    USE_EXTERNAL_LIBGIF=false
20363
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 19524
diff changeset
   639
  elif test "x${with_giflib}" = "xsystem"; then
16424
d955df81d716 8011278: Allow using a system-installed giflib
omajid
parents: 15915
diff changeset
   640
    AC_CHECK_HEADER(gif_lib.h, [],
20363
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 19524
diff changeset
   641
        [ AC_MSG_ERROR([--with-giflib=system specified, but gif_lib.h not found!])])
16424
d955df81d716 8011278: Allow using a system-installed giflib
omajid
parents: 15915
diff changeset
   642
    AC_CHECK_LIB(gif, DGifGetCode, [],
20363
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 19524
diff changeset
   643
        [ AC_MSG_ERROR([--with-giflib=system specified, but no giflib found!])])
16424
d955df81d716 8011278: Allow using a system-installed giflib
omajid
parents: 15915
diff changeset
   644
d955df81d716 8011278: Allow using a system-installed giflib
omajid
parents: 15915
diff changeset
   645
    USE_EXTERNAL_LIBGIF=true
20363
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 19524
diff changeset
   646
  else
16424
d955df81d716 8011278: Allow using a system-installed giflib
omajid
parents: 15915
diff changeset
   647
    AC_MSG_ERROR([Invalid value of --with-giflib: ${with_giflib}, use 'system' or 'bundled'])
20363
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 19524
diff changeset
   648
  fi
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 19524
diff changeset
   649
  AC_SUBST(USE_EXTERNAL_LIBGIF)
13133
701e61c32ece 7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff changeset
   650
20363
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 19524
diff changeset
   651
  ###############################################################################
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 19524
diff changeset
   652
  #
24413
1d117d2dfe92 8042159: Allow using a system-installed lcms2
omajid
parents: 23428
diff changeset
   653
  # Check for the lcms2 library
1d117d2dfe92 8042159: Allow using a system-installed lcms2
omajid
parents: 23428
diff changeset
   654
  #
1d117d2dfe92 8042159: Allow using a system-installed lcms2
omajid
parents: 23428
diff changeset
   655
1d117d2dfe92 8042159: Allow using a system-installed lcms2
omajid
parents: 23428
diff changeset
   656
  AC_ARG_WITH(lcms, [AS_HELP_STRING([--with-lcms],
1d117d2dfe92 8042159: Allow using a system-installed lcms2
omajid
parents: 23428
diff changeset
   657
  	[use lcms2 from build system or OpenJDK source (system, bundled) @<:@bundled@:>@])])
1d117d2dfe92 8042159: Allow using a system-installed lcms2
omajid
parents: 23428
diff changeset
   658
1d117d2dfe92 8042159: Allow using a system-installed lcms2
omajid
parents: 23428
diff changeset
   659
  AC_MSG_CHECKING([for which lcms to use])
1d117d2dfe92 8042159: Allow using a system-installed lcms2
omajid
parents: 23428
diff changeset
   660
1d117d2dfe92 8042159: Allow using a system-installed lcms2
omajid
parents: 23428
diff changeset
   661
  DEFAULT_LCMS=bundled
1d117d2dfe92 8042159: Allow using a system-installed lcms2
omajid
parents: 23428
diff changeset
   662
1d117d2dfe92 8042159: Allow using a system-installed lcms2
omajid
parents: 23428
diff changeset
   663
  #
1d117d2dfe92 8042159: Allow using a system-installed lcms2
omajid
parents: 23428
diff changeset
   664
  # If user didn't specify, use DEFAULT_LCMS
1d117d2dfe92 8042159: Allow using a system-installed lcms2
omajid
parents: 23428
diff changeset
   665
  #
1d117d2dfe92 8042159: Allow using a system-installed lcms2
omajid
parents: 23428
diff changeset
   666
  if test "x${with_lcms}" = "x"; then
1d117d2dfe92 8042159: Allow using a system-installed lcms2
omajid
parents: 23428
diff changeset
   667
      with_lcms=${DEFAULT_LCMS}
1d117d2dfe92 8042159: Allow using a system-installed lcms2
omajid
parents: 23428
diff changeset
   668
  fi
1d117d2dfe92 8042159: Allow using a system-installed lcms2
omajid
parents: 23428
diff changeset
   669
1d117d2dfe92 8042159: Allow using a system-installed lcms2
omajid
parents: 23428
diff changeset
   670
  if test "x${with_lcms}" = "xbundled"; then
1d117d2dfe92 8042159: Allow using a system-installed lcms2
omajid
parents: 23428
diff changeset
   671
    USE_EXTERNAL_LCMS=false
1d117d2dfe92 8042159: Allow using a system-installed lcms2
omajid
parents: 23428
diff changeset
   672
    AC_MSG_RESULT([bundled])
1d117d2dfe92 8042159: Allow using a system-installed lcms2
omajid
parents: 23428
diff changeset
   673
  elif test "x${with_lcms}" = "xsystem"; then
1d117d2dfe92 8042159: Allow using a system-installed lcms2
omajid
parents: 23428
diff changeset
   674
    AC_MSG_RESULT([system])
1d117d2dfe92 8042159: Allow using a system-installed lcms2
omajid
parents: 23428
diff changeset
   675
    PKG_CHECK_MODULES([LCMS], [lcms2], [LCMS_FOUND=yes], [LCMS_FOUND=no])
1d117d2dfe92 8042159: Allow using a system-installed lcms2
omajid
parents: 23428
diff changeset
   676
    if test "x${LCMS_FOUND}" = "xyes"; then
1d117d2dfe92 8042159: Allow using a system-installed lcms2
omajid
parents: 23428
diff changeset
   677
      USE_EXTERNAL_LCMS=true
1d117d2dfe92 8042159: Allow using a system-installed lcms2
omajid
parents: 23428
diff changeset
   678
    else
1d117d2dfe92 8042159: Allow using a system-installed lcms2
omajid
parents: 23428
diff changeset
   679
      AC_MSG_ERROR([--with-lcms=system specified, but no lcms found!])
1d117d2dfe92 8042159: Allow using a system-installed lcms2
omajid
parents: 23428
diff changeset
   680
    fi
1d117d2dfe92 8042159: Allow using a system-installed lcms2
omajid
parents: 23428
diff changeset
   681
  else
1d117d2dfe92 8042159: Allow using a system-installed lcms2
omajid
parents: 23428
diff changeset
   682
    AC_MSG_ERROR([Invalid value for --with-lcms: ${with_lcms}, use 'system' or 'bundled'])
1d117d2dfe92 8042159: Allow using a system-installed lcms2
omajid
parents: 23428
diff changeset
   683
  fi
1d117d2dfe92 8042159: Allow using a system-installed lcms2
omajid
parents: 23428
diff changeset
   684
1d117d2dfe92 8042159: Allow using a system-installed lcms2
omajid
parents: 23428
diff changeset
   685
  AC_SUBST(USE_EXTERNAL_LCMS)
1d117d2dfe92 8042159: Allow using a system-installed lcms2
omajid
parents: 23428
diff changeset
   686
1d117d2dfe92 8042159: Allow using a system-installed lcms2
omajid
parents: 23428
diff changeset
   687
  ###############################################################################
1d117d2dfe92 8042159: Allow using a system-installed lcms2
omajid
parents: 23428
diff changeset
   688
  #
23163
1e2f42892ffe 8035341: Allow using a system installed libpng
omajid
parents: 22710
diff changeset
   689
  # Check for the png library
1e2f42892ffe 8035341: Allow using a system installed libpng
omajid
parents: 22710
diff changeset
   690
  #
1e2f42892ffe 8035341: Allow using a system installed libpng
omajid
parents: 22710
diff changeset
   691
1e2f42892ffe 8035341: Allow using a system installed libpng
omajid
parents: 22710
diff changeset
   692
  AC_ARG_WITH(libpng, [AS_HELP_STRING([--with-libpng],
1e2f42892ffe 8035341: Allow using a system installed libpng
omajid
parents: 22710
diff changeset
   693
     [use libpng from build system or OpenJDK source (system, bundled) @<:@bundled@:>@])])
1e2f42892ffe 8035341: Allow using a system installed libpng
omajid
parents: 22710
diff changeset
   694
1e2f42892ffe 8035341: Allow using a system installed libpng
omajid
parents: 22710
diff changeset
   695
1e2f42892ffe 8035341: Allow using a system installed libpng
omajid
parents: 22710
diff changeset
   696
  AC_MSG_CHECKING([for which libpng to use])
1e2f42892ffe 8035341: Allow using a system installed libpng
omajid
parents: 22710
diff changeset
   697
1e2f42892ffe 8035341: Allow using a system installed libpng
omajid
parents: 22710
diff changeset
   698
  # default is bundled
1e2f42892ffe 8035341: Allow using a system installed libpng
omajid
parents: 22710
diff changeset
   699
  DEFAULT_LIBPNG=bundled
1e2f42892ffe 8035341: Allow using a system installed libpng
omajid
parents: 22710
diff changeset
   700
1e2f42892ffe 8035341: Allow using a system installed libpng
omajid
parents: 22710
diff changeset
   701
  #
1e2f42892ffe 8035341: Allow using a system installed libpng
omajid
parents: 22710
diff changeset
   702
  # if user didn't specify, use DEFAULT_LIBPNG
1e2f42892ffe 8035341: Allow using a system installed libpng
omajid
parents: 22710
diff changeset
   703
  #
1e2f42892ffe 8035341: Allow using a system installed libpng
omajid
parents: 22710
diff changeset
   704
  if test "x${with_libpng}" = "x"; then
1e2f42892ffe 8035341: Allow using a system installed libpng
omajid
parents: 22710
diff changeset
   705
      with_libpng=${DEFAULT_LIBPNG}
1e2f42892ffe 8035341: Allow using a system installed libpng
omajid
parents: 22710
diff changeset
   706
  fi
1e2f42892ffe 8035341: Allow using a system installed libpng
omajid
parents: 22710
diff changeset
   707
1e2f42892ffe 8035341: Allow using a system installed libpng
omajid
parents: 22710
diff changeset
   708
  if test "x${with_libpng}" = "xbundled"; then
1e2f42892ffe 8035341: Allow using a system installed libpng
omajid
parents: 22710
diff changeset
   709
      USE_EXTERNAL_LIBPNG=false
1e2f42892ffe 8035341: Allow using a system installed libpng
omajid
parents: 22710
diff changeset
   710
      AC_MSG_RESULT([bundled])
1e2f42892ffe 8035341: Allow using a system installed libpng
omajid
parents: 22710
diff changeset
   711
  elif test "x${with_libpng}" = "xsystem"; then
1e2f42892ffe 8035341: Allow using a system installed libpng
omajid
parents: 22710
diff changeset
   712
      PKG_CHECK_MODULES(PNG, libpng,
1e2f42892ffe 8035341: Allow using a system installed libpng
omajid
parents: 22710
diff changeset
   713
                   [ LIBPNG_FOUND=yes ],
1e2f42892ffe 8035341: Allow using a system installed libpng
omajid
parents: 22710
diff changeset
   714
                   [ LIBPNG_FOUND=no ])
1e2f42892ffe 8035341: Allow using a system installed libpng
omajid
parents: 22710
diff changeset
   715
      if test "x${LIBPNG_FOUND}" = "xyes"; then
1e2f42892ffe 8035341: Allow using a system installed libpng
omajid
parents: 22710
diff changeset
   716
          USE_EXTERNAL_LIBPNG=true
1e2f42892ffe 8035341: Allow using a system installed libpng
omajid
parents: 22710
diff changeset
   717
          AC_MSG_RESULT([system])
1e2f42892ffe 8035341: Allow using a system installed libpng
omajid
parents: 22710
diff changeset
   718
      else
1e2f42892ffe 8035341: Allow using a system installed libpng
omajid
parents: 22710
diff changeset
   719
          AC_MSG_RESULT([system not found])
1e2f42892ffe 8035341: Allow using a system installed libpng
omajid
parents: 22710
diff changeset
   720
          AC_MSG_ERROR([--with-libpng=system specified, but no libpng found!])
1e2f42892ffe 8035341: Allow using a system installed libpng
omajid
parents: 22710
diff changeset
   721
      fi
1e2f42892ffe 8035341: Allow using a system installed libpng
omajid
parents: 22710
diff changeset
   722
  else
1e2f42892ffe 8035341: Allow using a system installed libpng
omajid
parents: 22710
diff changeset
   723
      AC_MSG_ERROR([Invalid value of --with-libpng: ${with_libpng}, use 'system' or 'bundled'])
1e2f42892ffe 8035341: Allow using a system installed libpng
omajid
parents: 22710
diff changeset
   724
  fi
1e2f42892ffe 8035341: Allow using a system installed libpng
omajid
parents: 22710
diff changeset
   725
  AC_SUBST(USE_EXTERNAL_LIBPNG)
1e2f42892ffe 8035341: Allow using a system installed libpng
omajid
parents: 22710
diff changeset
   726
1e2f42892ffe 8035341: Allow using a system installed libpng
omajid
parents: 22710
diff changeset
   727
  ###############################################################################
1e2f42892ffe 8035341: Allow using a system installed libpng
omajid
parents: 22710
diff changeset
   728
  #
20363
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 19524
diff changeset
   729
  # Check for the zlib library
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 19524
diff changeset
   730
  #
13133
701e61c32ece 7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff changeset
   731
20363
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 19524
diff changeset
   732
  AC_ARG_WITH(zlib, [AS_HELP_STRING([--with-zlib],
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 19524
diff changeset
   733
      [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
   734
20363
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 19524
diff changeset
   735
  AC_CHECK_LIB(z, compress,
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 19524
diff changeset
   736
      [ ZLIB_FOUND=yes ],
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 19524
diff changeset
   737
      [ ZLIB_FOUND=no ])
13133
701e61c32ece 7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff changeset
   738
20363
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 19524
diff changeset
   739
  AC_MSG_CHECKING([for which zlib to use])
13133
701e61c32ece 7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff changeset
   740
20363
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 19524
diff changeset
   741
  DEFAULT_ZLIB=bundled
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 19524
diff changeset
   742
  if test "x$OPENJDK_TARGET_OS" = xmacosx; then
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 19524
diff changeset
   743
    #
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 19524
diff changeset
   744
    # On macosx default is system...on others default is
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 19524
diff changeset
   745
    #
13133
701e61c32ece 7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff changeset
   746
    DEFAULT_ZLIB=system
20363
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 19524
diff changeset
   747
  fi
13133
701e61c32ece 7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff changeset
   748
20363
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 19524
diff changeset
   749
  if test "x${ZLIB_FOUND}" != "xyes"; then
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 19524
diff changeset
   750
    #
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 19524
diff changeset
   751
    # If we don't find any system...set default to bundled
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 19524
diff changeset
   752
    #
13133
701e61c32ece 7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff changeset
   753
    DEFAULT_ZLIB=bundled
20363
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 19524
diff changeset
   754
  fi
13133
701e61c32ece 7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff changeset
   755
20363
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 19524
diff changeset
   756
  #
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 19524
diff changeset
   757
  # If user didn't specify, use DEFAULT_ZLIB
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 19524
diff changeset
   758
  #
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 19524
diff changeset
   759
  if test "x${with_zlib}" = "x"; then
13133
701e61c32ece 7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff changeset
   760
    with_zlib=${DEFAULT_ZLIB}
20363
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 19524
diff changeset
   761
  fi
13133
701e61c32ece 7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff changeset
   762
20363
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 19524
diff changeset
   763
  if test "x${with_zlib}" = "xbundled"; then
13133
701e61c32ece 7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff changeset
   764
    USE_EXTERNAL_LIBZ=false
701e61c32ece 7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff changeset
   765
    AC_MSG_RESULT([bundled])
20363
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 19524
diff changeset
   766
  elif test "x${with_zlib}" = "xsystem"; then
13133
701e61c32ece 7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff changeset
   767
    if test "x${ZLIB_FOUND}" = "xyes"; then
20363
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 19524
diff changeset
   768
      USE_EXTERNAL_LIBZ=true
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 19524
diff changeset
   769
      AC_MSG_RESULT([system])
13133
701e61c32ece 7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff changeset
   770
    else
20363
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 19524
diff changeset
   771
      AC_MSG_RESULT([system not found])
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 19524
diff changeset
   772
      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
   773
    fi
20363
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 19524
diff changeset
   774
  else
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 19524
diff changeset
   775
    AC_MSG_ERROR([Invalid value for --with-zlib: ${with_zlib}, use 'system' or 'bundled'])
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 19524
diff changeset
   776
  fi
13133
701e61c32ece 7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff changeset
   777
20363
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 19524
diff changeset
   778
  AC_SUBST(USE_EXTERNAL_LIBZ)
13133
701e61c32ece 7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff changeset
   779
20363
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 19524
diff changeset
   780
  ###############################################################################
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 19524
diff changeset
   781
  LIBZIP_CAN_USE_MMAP=true
13697
5262b00bc10c 7197849: Update new build-infra makefiles
ohair
parents: 13133
diff changeset
   782
20363
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 19524
diff changeset
   783
  AC_SUBST(LIBZIP_CAN_USE_MMAP)
13133
701e61c32ece 7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff changeset
   784
20363
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 19524
diff changeset
   785
  ###############################################################################
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 19524
diff changeset
   786
  #
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 19524
diff changeset
   787
  # Check if altzone exists in time.h
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 19524
diff changeset
   788
  #
13133
701e61c32ece 7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff changeset
   789
20363
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 19524
diff changeset
   790
  AC_LINK_IFELSE([AC_LANG_PROGRAM([#include <time.h>], [return (int)altzone;])],
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 19524
diff changeset
   791
      [has_altzone=yes],
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 19524
diff changeset
   792
      [has_altzone=no])
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 19524
diff changeset
   793
  if test "x$has_altzone" = xyes; then
13133
701e61c32ece 7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff changeset
   794
    AC_DEFINE([HAVE_ALTZONE], 1, [Define if you have the external 'altzone' variable in time.h])
20363
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 19524
diff changeset
   795
  fi
13133
701e61c32ece 7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff changeset
   796
20363
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 19524
diff changeset
   797
  ###############################################################################
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 19524
diff changeset
   798
  #
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 19524
diff changeset
   799
  # Check the maths library
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 19524
diff changeset
   800
  #
13133
701e61c32ece 7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff changeset
   801
20363
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 19524
diff changeset
   802
  AC_CHECK_LIB(m, cos, [],
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 19524
diff changeset
   803
      [
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 19524
diff changeset
   804
        AC_MSG_NOTICE([Maths library was not found])
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 19524
diff changeset
   805
      ]
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 19524
diff changeset
   806
  )
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 19524
diff changeset
   807
  AC_SUBST(LIBM)
13133
701e61c32ece 7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff changeset
   808
20363
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 19524
diff changeset
   809
  ###############################################################################
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 19524
diff changeset
   810
  #
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 19524
diff changeset
   811
  # Check for libdl.so
13133
701e61c32ece 7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff changeset
   812
20363
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 19524
diff changeset
   813
  save_LIBS="$LIBS"
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 19524
diff changeset
   814
  LIBS=""
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 19524
diff changeset
   815
  AC_CHECK_LIB(dl,dlopen)
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 19524
diff changeset
   816
  LIBDL="$LIBS"
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 19524
diff changeset
   817
  AC_SUBST(LIBDL)
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 19524
diff changeset
   818
  LIBS="$save_LIBS"
13133
701e61c32ece 7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff changeset
   819
])
701e61c32ece 7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff changeset
   820
701e61c32ece 7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff changeset
   821
AC_DEFUN_ONCE([LIB_SETUP_STATIC_LINK_LIBSTDCPP],
701e61c32ece 7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff changeset
   822
[
20363
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 19524
diff changeset
   823
  ###############################################################################
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 19524
diff changeset
   824
  #
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 19524
diff changeset
   825
  # statically link libstdc++ before C++ ABI is stablized on Linux unless
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 19524
diff changeset
   826
  # dynamic build is configured on command line.
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 19524
diff changeset
   827
  #
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 19524
diff changeset
   828
  AC_ARG_WITH([stdc++lib], [AS_HELP_STRING([--with-stdc++lib=<static>,<dynamic>,<default>],
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 19524
diff changeset
   829
      [force linking of the C++ runtime on Linux to either static or dynamic, default is static with dynamic as fallback])],
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 19524
diff changeset
   830
      [
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 19524
diff changeset
   831
        if test "x$with_stdc__lib" != xdynamic && test "x$with_stdc__lib" != xstatic \
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 19524
diff changeset
   832
                && test "x$with_stdc__lib" != xdefault; then
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 19524
diff changeset
   833
          AC_MSG_ERROR([Bad parameter value --with-stdc++lib=$with_stdc__lib!])
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 19524
diff changeset
   834
        fi
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 19524
diff changeset
   835
      ],
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 19524
diff changeset
   836
      [with_stdc__lib=default]
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 19524
diff changeset
   837
  )
13133
701e61c32ece 7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff changeset
   838
20363
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 19524
diff changeset
   839
  if test "x$OPENJDK_TARGET_OS" = xlinux; then
13133
701e61c32ece 7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff changeset
   840
    # Test if -lstdc++ works.
701e61c32ece 7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff changeset
   841
    AC_MSG_CHECKING([if dynamic link of stdc++ is possible])
701e61c32ece 7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff changeset
   842
    AC_LANG_PUSH(C++)
701e61c32ece 7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff changeset
   843
    OLD_CXXFLAGS="$CXXFLAGS"
701e61c32ece 7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff changeset
   844
    CXXFLAGS="$CXXFLAGS -lstdc++"
701e61c32ece 7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff changeset
   845
    AC_LINK_IFELSE([AC_LANG_PROGRAM([], [return 0;])],
20363
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 19524
diff changeset
   846
        [has_dynamic_libstdcxx=yes],
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 19524
diff changeset
   847
        [has_dynamic_libstdcxx=no])
13133
701e61c32ece 7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff changeset
   848
    CXXFLAGS="$OLD_CXXFLAGS"
701e61c32ece 7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff changeset
   849
    AC_LANG_POP(C++)
701e61c32ece 7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff changeset
   850
    AC_MSG_RESULT([$has_dynamic_libstdcxx])
701e61c32ece 7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff changeset
   851
701e61c32ece 7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff changeset
   852
    # Test if stdc++ can be linked statically.
701e61c32ece 7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff changeset
   853
    AC_MSG_CHECKING([if static link of stdc++ is possible])
701e61c32ece 7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff changeset
   854
    STATIC_STDCXX_FLAGS="-Wl,-Bstatic -lstdc++ -lgcc -Wl,-Bdynamic"
701e61c32ece 7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff changeset
   855
    AC_LANG_PUSH(C++)
701e61c32ece 7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff changeset
   856
    OLD_LIBS="$LIBS"
701e61c32ece 7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff changeset
   857
    OLD_CXX="$CXX"
701e61c32ece 7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff changeset
   858
    LIBS="$STATIC_STDCXX_FLAGS"
20363
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 19524
diff changeset
   859
    CXX="$CC"
13133
701e61c32ece 7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff changeset
   860
    AC_LINK_IFELSE([AC_LANG_PROGRAM([], [return 0;])],
20363
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 19524
diff changeset
   861
        [has_static_libstdcxx=yes],
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 19524
diff changeset
   862
        [has_static_libstdcxx=no])
13133
701e61c32ece 7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff changeset
   863
    LIBS="$OLD_LIBS"
701e61c32ece 7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff changeset
   864
    CXX="$OLD_CXX"
701e61c32ece 7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff changeset
   865
    AC_LANG_POP(C++)
701e61c32ece 7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff changeset
   866
    AC_MSG_RESULT([$has_static_libstdcxx])
701e61c32ece 7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff changeset
   867
14459
6213b3f9e08d 8001875: build-infra: We must be able to force static linking of stdc++
tbell
parents: 14280
diff changeset
   868
    if test "x$has_static_libstdcxx" = xno && test "x$has_dynamic_libstdcxx" = xno; then
20363
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 19524
diff changeset
   869
      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
   870
    fi
701e61c32ece 7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff changeset
   871
14459
6213b3f9e08d 8001875: build-infra: We must be able to force static linking of stdc++
tbell
parents: 14280
diff changeset
   872
    if test "x$with_stdc__lib" = xstatic && test "x$has_static_libstdcxx" = xno; then
20363
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 19524
diff changeset
   873
      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
   874
    fi
701e61c32ece 7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff changeset
   875
14459
6213b3f9e08d 8001875: build-infra: We must be able to force static linking of stdc++
tbell
parents: 14280
diff changeset
   876
    if test "x$with_stdc__lib" = xdynamic && test "x$has_dynamic_libstdcxx" = xno; then
20363
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 19524
diff changeset
   877
      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
   878
    fi
701e61c32ece 7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff changeset
   879
701e61c32ece 7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff changeset
   880
    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
   881
    # 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
   882
    # 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
   883
    if test "x$with_stdc__lib" = xdynamic || test "x$has_static_libstdcxx" = xno || test "x$JVM_VARIANT_ZEROSHARK" = xtrue; then
20363
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 19524
diff changeset
   884
      LIBCXX="$LIBCXX -lstdc++"
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 19524
diff changeset
   885
      LDCXX="$CXX"
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 19524
diff changeset
   886
      STATIC_CXX_SETTING="STATIC_CXX=false"
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 19524
diff changeset
   887
      AC_MSG_RESULT([dynamic])
14459
6213b3f9e08d 8001875: build-infra: We must be able to force static linking of stdc++
tbell
parents: 14280
diff changeset
   888
    else
20363
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 19524
diff changeset
   889
      LIBCXX="$LIBCXX $STATIC_STDCXX_FLAGS"
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 19524
diff changeset
   890
      LDCXX="$CC"
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 19524
diff changeset
   891
      STATIC_CXX_SETTING="STATIC_CXX=true"
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 19524
diff changeset
   892
      AC_MSG_RESULT([static])
13133
701e61c32ece 7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff changeset
   893
    fi
20363
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 19524
diff changeset
   894
  fi
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 19524
diff changeset
   895
  AC_SUBST(STATIC_CXX_SETTING)
13133
701e61c32ece 7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff changeset
   896
20363
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 19524
diff changeset
   897
  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
   898
    # Figure out LIBFFI_CFLAGS and LIBFFI_LIBS
b2cddec593f4 8011388: Support building zero and zeroshark with the new build
omajid
parents: 16424
diff changeset
   899
    PKG_CHECK_MODULES([LIBFFI], [libffi])
b2cddec593f4 8011388: Support building zero and zeroshark with the new build
omajid
parents: 16424
diff changeset
   900
20363
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 19524
diff changeset
   901
  fi
16581
b2cddec593f4 8011388: Support building zero and zeroshark with the new build
omajid
parents: 16424
diff changeset
   902
20363
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 19524
diff changeset
   903
  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
   904
    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
   905
b2cddec593f4 8011388: Support building zero and zeroshark with the new build
omajid
parents: 16424
diff changeset
   906
    if test "x$LLVM_CONFIG" != xllvm-config; then
20363
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 19524
diff changeset
   907
      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
   908
    fi
b2cddec593f4 8011388: Support building zero and zeroshark with the new build
omajid
parents: 16424
diff changeset
   909
b2cddec593f4 8011388: Support building zero and zeroshark with the new build
omajid
parents: 16424
diff changeset
   910
    llvm_components="jit mcjit engine nativecodegen native"
b2cddec593f4 8011388: Support building zero and zeroshark with the new build
omajid
parents: 16424
diff changeset
   911
    unset LLVM_CFLAGS
b2cddec593f4 8011388: Support building zero and zeroshark with the new build
omajid
parents: 16424
diff changeset
   912
    for flag in $("$LLVM_CONFIG" --cxxflags); do
b2cddec593f4 8011388: Support building zero and zeroshark with the new build
omajid
parents: 16424
diff changeset
   913
      if echo "${flag}" | grep -q '^-@<:@ID@:>@'; then
b2cddec593f4 8011388: Support building zero and zeroshark with the new build
omajid
parents: 16424
diff changeset
   914
        if test "${flag}" != "-D_DEBUG" ; then
b2cddec593f4 8011388: Support building zero and zeroshark with the new build
omajid
parents: 16424
diff changeset
   915
          if test "${LLVM_CFLAGS}" != "" ; then
b2cddec593f4 8011388: Support building zero and zeroshark with the new build
omajid
parents: 16424
diff changeset
   916
            LLVM_CFLAGS="${LLVM_CFLAGS} "
b2cddec593f4 8011388: Support building zero and zeroshark with the new build
omajid
parents: 16424
diff changeset
   917
          fi
b2cddec593f4 8011388: Support building zero and zeroshark with the new build
omajid
parents: 16424
diff changeset
   918
          LLVM_CFLAGS="${LLVM_CFLAGS}${flag}"
b2cddec593f4 8011388: Support building zero and zeroshark with the new build
omajid
parents: 16424
diff changeset
   919
        fi
b2cddec593f4 8011388: Support building zero and zeroshark with the new build
omajid
parents: 16424
diff changeset
   920
      fi
b2cddec593f4 8011388: Support building zero and zeroshark with the new build
omajid
parents: 16424
diff changeset
   921
    done
b2cddec593f4 8011388: Support building zero and zeroshark with the new build
omajid
parents: 16424
diff changeset
   922
    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
   923
    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
   924
b2cddec593f4 8011388: Support building zero and zeroshark with the new build
omajid
parents: 16424
diff changeset
   925
    unset LLVM_LDFLAGS
b2cddec593f4 8011388: Support building zero and zeroshark with the new build
omajid
parents: 16424
diff changeset
   926
    for flag in $("${LLVM_CONFIG}" --ldflags); do
b2cddec593f4 8011388: Support building zero and zeroshark with the new build
omajid
parents: 16424
diff changeset
   927
      if echo "${flag}" | grep -q '^-L'; then
b2cddec593f4 8011388: Support building zero and zeroshark with the new build
omajid
parents: 16424
diff changeset
   928
        if test "${LLVM_LDFLAGS}" != ""; then
b2cddec593f4 8011388: Support building zero and zeroshark with the new build
omajid
parents: 16424
diff changeset
   929
          LLVM_LDFLAGS="${LLVM_LDFLAGS} "
b2cddec593f4 8011388: Support building zero and zeroshark with the new build
omajid
parents: 16424
diff changeset
   930
        fi
b2cddec593f4 8011388: Support building zero and zeroshark with the new build
omajid
parents: 16424
diff changeset
   931
        LLVM_LDFLAGS="${LLVM_LDFLAGS}${flag}"
b2cddec593f4 8011388: Support building zero and zeroshark with the new build
omajid
parents: 16424
diff changeset
   932
      fi
b2cddec593f4 8011388: Support building zero and zeroshark with the new build
omajid
parents: 16424
diff changeset
   933
    done
b2cddec593f4 8011388: Support building zero and zeroshark with the new build
omajid
parents: 16424
diff changeset
   934
b2cddec593f4 8011388: Support building zero and zeroshark with the new build
omajid
parents: 16424
diff changeset
   935
    unset LLVM_LIBS
b2cddec593f4 8011388: Support building zero and zeroshark with the new build
omajid
parents: 16424
diff changeset
   936
    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
   937
      if echo "${flag}" | grep -q '^-l'; then
b2cddec593f4 8011388: Support building zero and zeroshark with the new build
omajid
parents: 16424
diff changeset
   938
        if test "${LLVM_LIBS}" != ""; then
b2cddec593f4 8011388: Support building zero and zeroshark with the new build
omajid
parents: 16424
diff changeset
   939
          LLVM_LIBS="${LLVM_LIBS} "
b2cddec593f4 8011388: Support building zero and zeroshark with the new build
omajid
parents: 16424
diff changeset
   940
        fi
b2cddec593f4 8011388: Support building zero and zeroshark with the new build
omajid
parents: 16424
diff changeset
   941
        LLVM_LIBS="${LLVM_LIBS}${flag}"
b2cddec593f4 8011388: Support building zero and zeroshark with the new build
omajid
parents: 16424
diff changeset
   942
      fi
b2cddec593f4 8011388: Support building zero and zeroshark with the new build
omajid
parents: 16424
diff changeset
   943
    done
b2cddec593f4 8011388: Support building zero and zeroshark with the new build
omajid
parents: 16424
diff changeset
   944
b2cddec593f4 8011388: Support building zero and zeroshark with the new build
omajid
parents: 16424
diff changeset
   945
    AC_SUBST(LLVM_CFLAGS)
b2cddec593f4 8011388: Support building zero and zeroshark with the new build
omajid
parents: 16424
diff changeset
   946
    AC_SUBST(LLVM_LDFLAGS)
b2cddec593f4 8011388: Support building zero and zeroshark with the new build
omajid
parents: 16424
diff changeset
   947
    AC_SUBST(LLVM_LIBS)
20363
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 19524
diff changeset
   948
  fi
16581
b2cddec593f4 8011388: Support building zero and zeroshark with the new build
omajid
parents: 16424
diff changeset
   949
20363
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 19524
diff changeset
   950
  # 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
   951
  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
   952
    LIBCXX="${SYSROOT}/usr/lib${OPENJDK_TARGET_CPU_ISADIR}/libCrun.so.1"
20363
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 19524
diff changeset
   953
  fi
13133
701e61c32ece 7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff changeset
   954
20363
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 19524
diff changeset
   955
  # TODO better (platform agnostic) test
22721
63761da45392 8034788: Rewrite toolchain.m4 to support multiple toolchains per platform.
ihse
parents: 22710
diff changeset
   956
  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
   957
    LIBCXX="-lstdc++"
20363
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 19524
diff changeset
   958
  fi
13133
701e61c32ece 7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff changeset
   959
20363
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 19524
diff changeset
   960
  AC_SUBST(LIBCXX)
13133
701e61c32ece 7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff changeset
   961
])
22721
63761da45392 8034788: Rewrite toolchain.m4 to support multiple toolchains per platform.
ihse
parents: 22710
diff changeset
   962
63761da45392 8034788: Rewrite toolchain.m4 to support multiple toolchains per platform.
ihse
parents: 22710
diff changeset
   963
AC_DEFUN_ONCE([LIB_SETUP_ON_WINDOWS],
63761da45392 8034788: Rewrite toolchain.m4 to support multiple toolchains per platform.
ihse
parents: 22710
diff changeset
   964
[
63761da45392 8034788: Rewrite toolchain.m4 to support multiple toolchains per platform.
ihse
parents: 22710
diff changeset
   965
  if test "x$OPENJDK_TARGET_OS" = "xwindows"; then
63761da45392 8034788: Rewrite toolchain.m4 to support multiple toolchains per platform.
ihse
parents: 22710
diff changeset
   966
    TOOLCHAIN_SETUP_MSVCR_DLL
63761da45392 8034788: Rewrite toolchain.m4 to support multiple toolchains per platform.
ihse
parents: 22710
diff changeset
   967
    BASIC_DEPRECATED_ARG_WITH([dxsdk])
63761da45392 8034788: Rewrite toolchain.m4 to support multiple toolchains per platform.
ihse
parents: 22710
diff changeset
   968
    BASIC_DEPRECATED_ARG_WITH([dxsdk-lib])
63761da45392 8034788: Rewrite toolchain.m4 to support multiple toolchains per platform.
ihse
parents: 22710
diff changeset
   969
    BASIC_DEPRECATED_ARG_WITH([dxsdk-include])
63761da45392 8034788: Rewrite toolchain.m4 to support multiple toolchains per platform.
ihse
parents: 22710
diff changeset
   970
  fi
63761da45392 8034788: Rewrite toolchain.m4 to support multiple toolchains per platform.
ihse
parents: 22710
diff changeset
   971
  AC_SUBST(MSVCR_DLL)
63761da45392 8034788: Rewrite toolchain.m4 to support multiple toolchains per platform.
ihse
parents: 22710
diff changeset
   972
])