1.1 --- a/common/autoconf/generated-configure.sh Tue Jan 15 10:42:40 2019 +0000
1.2 +++ b/common/autoconf/generated-configure.sh Wed Oct 25 13:11:07 2017 -0700
1.3 @@ -657,6 +657,7 @@
1.4 USE_EXTERNAL_LIBZ
1.5 USE_EXTERNAL_LIBGIF
1.6 USE_EXTERNAL_LIBJPEG
1.7 +FONTCONFIG_CFLAGS
1.8 ALSA_LIBS
1.9 ALSA_CFLAGS
1.10 FREETYPE_BUNDLE_LIB_PATH
1.11 @@ -1091,6 +1092,8 @@
1.12 with_alsa
1.13 with_alsa_include
1.14 with_alsa_lib
1.15 +with_fontconfig
1.16 +with_fontconfig_include
1.17 with_giflib
1.18 with_zlib
1.19 with_stdc__lib
1.20 @@ -1946,6 +1949,10 @@
1.21 headers under PATH/include)
1.22 --with-alsa-include specify directory for the alsa include files
1.23 --with-alsa-lib specify directory for the alsa library
1.24 + --with-fontconfig specify prefix directory for the fontconfig package
1.25 + (expecting the headers under PATH/include)
1.26 + --with-fontconfig-include
1.27 + specify directory for the fontconfig include files
1.28 --with-giflib use giflib from build system or OpenJDK source
1.29 (system, bundled) [bundled]
1.30 --with-zlib use zlib from build system or OpenJDK source
1.31 @@ -3827,6 +3834,8 @@
1.32 PKGHANDLER_COMMAND="sudo apt-get install libasound2-dev" ;;
1.33 cups)
1.34 PKGHANDLER_COMMAND="sudo apt-get install libcups2-dev" ;;
1.35 + fontconfig)
1.36 + PKGHANDLER_COMMAND="sudo apt-get install libfontconfig1-dev" ;;
1.37 freetype)
1.38 PKGHANDLER_COMMAND="sudo apt-get install libfreetype6-dev" ;;
1.39 pulse)
1.40 @@ -3848,6 +3857,8 @@
1.41 PKGHANDLER_COMMAND="sudo yum install alsa-lib-devel" ;;
1.42 cups)
1.43 PKGHANDLER_COMMAND="sudo yum install cups-devel" ;;
1.44 + fontconfig)
1.45 + PKGHANDLER_COMMAND="sudo yum install fontconfig-devel" ;;
1.46 freetype)
1.47 PKGHANDLER_COMMAND="sudo yum install freetype-devel" ;;
1.48 pulse)
1.49 @@ -3982,6 +3993,11 @@
1.50
1.51
1.52
1.53 +################################################################################
1.54 +# Setup fontconfig
1.55 +################################################################################
1.56 +
1.57 +
1.58
1.59
1.60
1.61 @@ -4342,7 +4358,7 @@
1.62 #CUSTOM_AUTOCONF_INCLUDE
1.63
1.64 # Do not change or remove the following line, it is needed for consistency checks:
1.65 -DATE_WHEN_GENERATED=1544009140
1.66 +DATE_WHEN_GENERATED=1551441508
1.67
1.68 ###############################################################################
1.69 #
1.70 @@ -42396,6 +42412,7 @@
1.71 ALSA_NOT_NEEDED=yes
1.72 PULSE_NOT_NEEDED=yes
1.73 X11_NOT_NEEDED=yes
1.74 + FONTCONFIG_NOT_NEEDED=yes
1.75 { $as_echo "$as_me:${as_lineno-$LINENO}: result: alsa cups pulse x11" >&5
1.76 $as_echo "alsa cups pulse x11" >&6; }
1.77 fi
1.78 @@ -42406,6 +42423,7 @@
1.79 ALSA_NOT_NEEDED=yes
1.80 PULSE_NOT_NEEDED=yes
1.81 X11_NOT_NEEDED=yes
1.82 + FONTCONFIG_NOT_NEEDED=yes
1.83 { $as_echo "$as_me:${as_lineno-$LINENO}: result: alsa pulse x11" >&5
1.84 $as_echo "alsa pulse x11" >&6; }
1.85 fi
1.86 @@ -47724,6 +47742,114 @@
1.87
1.88
1.89
1.90 +# Check whether --with-fontconfig was given.
1.91 +if test "${with_fontconfig+set}" = set; then :
1.92 + withval=$with_fontconfig;
1.93 +fi
1.94 +
1.95 +
1.96 +# Check whether --with-fontconfig-include was given.
1.97 +if test "${with_fontconfig_include+set}" = set; then :
1.98 + withval=$with_fontconfig_include;
1.99 +fi
1.100 +
1.101 +
1.102 + if test "x$FONTCONFIG_NOT_NEEDED" = xyes; then
1.103 + if (test "x${with_fontconfig}" != x && test "x${with_fontconfig}" != xno) || \
1.104 + (test "x${with_fontconfig_include}" != x && test "x${with_fontconfig_include}" != xno); then
1.105 + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: fontconfig not used, so --with-fontconfig[-*] is ignored" >&5
1.106 +$as_echo "$as_me: WARNING: fontconfig not used, so --with-fontconfig[-*] is ignored" >&2;}
1.107 + fi
1.108 + FONTCONFIG_CFLAGS=
1.109 + else
1.110 + FONTCONFIG_FOUND=no
1.111 +
1.112 + if test "x${with_fontconfig}" = xno || test "x${with_fontconfig_include}" = xno; then
1.113 + as_fn_error $? "It is not possible to disable the use of fontconfig. Remove the --without-fontconfig option." "$LINENO" 5
1.114 + fi
1.115 +
1.116 + if test "x${with_fontconfig}" != x; then
1.117 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for fontconfig headers" >&5
1.118 +$as_echo_n "checking for fontconfig headers... " >&6; }
1.119 + if test -s "${with_fontconfig}/include/fontconfig/fontconfig.h"; then
1.120 + FONTCONFIG_CFLAGS="-I${with_fontconfig}/include"
1.121 + FONTCONFIG_FOUND=yes
1.122 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $FONTCONFIG_FOUND" >&5
1.123 +$as_echo "$FONTCONFIG_FOUND" >&6; }
1.124 + else
1.125 + as_fn_error $? "Can't find 'include/fontconfig/fontconfig.h' under ${with_fontconfig} given with the --with-fontconfig option." "$LINENO" 5
1.126 + fi
1.127 + fi
1.128 + if test "x${with_fontconfig_include}" != x; then
1.129 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for fontconfig headers" >&5
1.130 +$as_echo_n "checking for fontconfig headers... " >&6; }
1.131 + if test -s "${with_fontconfig_include}/fontconfig/fontconfig.h"; then
1.132 + FONTCONFIG_CFLAGS="-I${with_fontconfig_include}"
1.133 + FONTCONFIG_FOUND=yes
1.134 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $FONTCONFIG_FOUND" >&5
1.135 +$as_echo "$FONTCONFIG_FOUND" >&6; }
1.136 + else
1.137 + as_fn_error $? "Can't find 'fontconfig/fontconfig.h' under ${with_fontconfig_include} given with the --with-fontconfig-include option." "$LINENO" 5
1.138 + fi
1.139 + fi
1.140 + if test "x$FONTCONFIG_FOUND" = xno; then
1.141 + # Are the fontconfig headers installed in the default /usr/include location?
1.142 + for ac_header in fontconfig/fontconfig.h
1.143 +do :
1.144 + ac_fn_cxx_check_header_mongrel "$LINENO" "fontconfig/fontconfig.h" "ac_cv_header_fontconfig_fontconfig_h" "$ac_includes_default"
1.145 +if test "x$ac_cv_header_fontconfig_fontconfig_h" = xyes; then :
1.146 + cat >>confdefs.h <<_ACEOF
1.147 +#define HAVE_FONTCONFIG_FONTCONFIG_H 1
1.148 +_ACEOF
1.149 +
1.150 + FONTCONFIG_FOUND=yes
1.151 + FONTCONFIG_CFLAGS=
1.152 + DEFAULT_FONTCONFIG=yes
1.153 +
1.154 +fi
1.155 +
1.156 +done
1.157 +
1.158 + fi
1.159 + if test "x$FONTCONFIG_FOUND" = xno; then
1.160 +
1.161 + # Print a helpful message on how to acquire the necessary build dependency.
1.162 + # fontconfig is the help tag: freetype, cups, pulse, alsa etc
1.163 + MISSING_DEPENDENCY=fontconfig
1.164 +
1.165 + if test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.cygwin"; then
1.166 + cygwin_help $MISSING_DEPENDENCY
1.167 + elif test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.msys"; then
1.168 + msys_help $MISSING_DEPENDENCY
1.169 + else
1.170 + PKGHANDLER_COMMAND=
1.171 +
1.172 + case $PKGHANDLER in
1.173 + apt-get)
1.174 + apt_help $MISSING_DEPENDENCY ;;
1.175 + yum)
1.176 + yum_help $MISSING_DEPENDENCY ;;
1.177 + port)
1.178 + port_help $MISSING_DEPENDENCY ;;
1.179 + pkgutil)
1.180 + pkgutil_help $MISSING_DEPENDENCY ;;
1.181 + pkgadd)
1.182 + pkgadd_help $MISSING_DEPENDENCY ;;
1.183 + esac
1.184 +
1.185 + if test "x$PKGHANDLER_COMMAND" != x; then
1.186 + HELP_MSG="You might be able to fix this by running '$PKGHANDLER_COMMAND'."
1.187 + fi
1.188 + fi
1.189 +
1.190 + as_fn_error $? "Could not find fontconfig! $HELP_MSG " "$LINENO" 5
1.191 + fi
1.192 + fi
1.193 +
1.194 +
1.195 +
1.196 +
1.197 +
1.198 ###############################################################################
1.199 #
1.200 # Check for the jpeg library
