< prev index next >
common/autoconf/generated-configure.sh
Print this page
rev 2361 : 8170681: Remove fontconfig header files from JDK source tree
Reviewed-by: serb, erikj
*** 655,664 ****
--- 655,665 ----
LIBM
LIBZIP_CAN_USE_MMAP
USE_EXTERNAL_LIBZ
USE_EXTERNAL_LIBGIF
USE_EXTERNAL_LIBJPEG
+ FONTCONFIG_CFLAGS
ALSA_LIBS
ALSA_CFLAGS
FREETYPE_BUNDLE_LIB_PATH
FREETYPE_LIBS
FREETYPE_CFLAGS
*** 1089,1098 ****
--- 1090,1101 ----
with_freetype_src
enable_freetype_bundling
with_alsa
with_alsa_include
with_alsa_lib
+ with_fontconfig
+ with_fontconfig_include
with_giflib
with_zlib
with_stdc__lib
with_msvcr_dll
with_msvcp_dll
*** 1944,1953 ****
--- 1947,1960 ----
--with-alsa specify prefix directory for the alsa package
(expecting the libraries under PATH/lib and the
headers under PATH/include)
--with-alsa-include specify directory for the alsa include files
--with-alsa-lib specify directory for the alsa library
+ --with-fontconfig specify prefix directory for the fontconfig package
+ (expecting the headers under PATH/include)
+ --with-fontconfig-include
+ specify directory for the fontconfig include files
--with-giflib use giflib from build system or OpenJDK source
(system, bundled) [bundled]
--with-zlib use zlib from build system or OpenJDK source
(system, bundled) [bundled]
--with-stdc++lib=<static>,<dynamic>,<default>
*** 3825,3834 ****
--- 3832,3843 ----
PKGHANDLER_COMMAND="sudo apt-get install openjdk-7-jdk" ;;
alsa)
PKGHANDLER_COMMAND="sudo apt-get install libasound2-dev" ;;
cups)
PKGHANDLER_COMMAND="sudo apt-get install libcups2-dev" ;;
+ fontconfig)
+ PKGHANDLER_COMMAND="sudo apt-get install libfontconfig1-dev" ;;
freetype)
PKGHANDLER_COMMAND="sudo apt-get install libfreetype6-dev" ;;
pulse)
PKGHANDLER_COMMAND="sudo apt-get install libpulse-dev" ;;
x11)
*** 3846,3855 ****
--- 3855,3866 ----
PKGHANDLER_COMMAND="sudo yum install java-1.7.0-openjdk" ;;
alsa)
PKGHANDLER_COMMAND="sudo yum install alsa-lib-devel" ;;
cups)
PKGHANDLER_COMMAND="sudo yum install cups-devel" ;;
+ fontconfig)
+ PKGHANDLER_COMMAND="sudo yum install fontconfig-devel" ;;
freetype)
PKGHANDLER_COMMAND="sudo yum install freetype-devel" ;;
pulse)
PKGHANDLER_COMMAND="sudo yum install pulseaudio-libs-devel" ;;
x11)
*** 3980,3989 ****
--- 3991,4005 ----
+ ################################################################################
+ # Setup fontconfig
+ ################################################################################
+
+
*** 4340,4350 ****
# definitions. It is replaced with custom functionality when building
# custom sources.
#CUSTOM_AUTOCONF_INCLUDE
# Do not change or remove the following line, it is needed for consistency checks:
! DATE_WHEN_GENERATED=1544009140
###############################################################################
#
# Initialization / Boot-strapping
#
--- 4356,4366 ----
# definitions. It is replaced with custom functionality when building
# custom sources.
#CUSTOM_AUTOCONF_INCLUDE
# Do not change or remove the following line, it is needed for consistency checks:
! DATE_WHEN_GENERATED=1551441508
###############################################################################
#
# Initialization / Boot-strapping
#
*** 42394,42413 ****
--- 42410,42431 ----
$as_echo_n "checking what is not needed on Windows?... " >&6; }
CUPS_NOT_NEEDED=yes
ALSA_NOT_NEEDED=yes
PULSE_NOT_NEEDED=yes
X11_NOT_NEEDED=yes
+ FONTCONFIG_NOT_NEEDED=yes
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: alsa cups pulse x11" >&5
$as_echo "alsa cups pulse x11" >&6; }
fi
if test "x$OPENJDK_TARGET_OS" = xmacosx; then
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking what is not needed on MacOSX?" >&5
$as_echo_n "checking what is not needed on MacOSX?... " >&6; }
ALSA_NOT_NEEDED=yes
PULSE_NOT_NEEDED=yes
X11_NOT_NEEDED=yes
+ FONTCONFIG_NOT_NEEDED=yes
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: alsa pulse x11" >&5
$as_echo "alsa pulse x11" >&6; }
fi
if test "x$OPENJDK_TARGET_OS" = xbsd; then
*** 47722,47731 ****
--- 47740,47857 ----
+ # Check whether --with-fontconfig was given.
+ if test "${with_fontconfig+set}" = set; then :
+ withval=$with_fontconfig;
+ fi
+
+
+ # Check whether --with-fontconfig-include was given.
+ if test "${with_fontconfig_include+set}" = set; then :
+ withval=$with_fontconfig_include;
+ fi
+
+
+ if test "x$FONTCONFIG_NOT_NEEDED" = xyes; then
+ if (test "x${with_fontconfig}" != x && test "x${with_fontconfig}" != xno) || \
+ (test "x${with_fontconfig_include}" != x && test "x${with_fontconfig_include}" != xno); then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: fontconfig not used, so --with-fontconfig[-*] is ignored" >&5
+ $as_echo "$as_me: WARNING: fontconfig not used, so --with-fontconfig[-*] is ignored" >&2;}
+ fi
+ FONTCONFIG_CFLAGS=
+ else
+ FONTCONFIG_FOUND=no
+
+ if test "x${with_fontconfig}" = xno || test "x${with_fontconfig_include}" = xno; then
+ as_fn_error $? "It is not possible to disable the use of fontconfig. Remove the --without-fontconfig option." "$LINENO" 5
+ fi
+
+ if test "x${with_fontconfig}" != x; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for fontconfig headers" >&5
+ $as_echo_n "checking for fontconfig headers... " >&6; }
+ if test -s "${with_fontconfig}/include/fontconfig/fontconfig.h"; then
+ FONTCONFIG_CFLAGS="-I${with_fontconfig}/include"
+ FONTCONFIG_FOUND=yes
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $FONTCONFIG_FOUND" >&5
+ $as_echo "$FONTCONFIG_FOUND" >&6; }
+ else
+ as_fn_error $? "Can't find 'include/fontconfig/fontconfig.h' under ${with_fontconfig} given with the --with-fontconfig option." "$LINENO" 5
+ fi
+ fi
+ if test "x${with_fontconfig_include}" != x; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for fontconfig headers" >&5
+ $as_echo_n "checking for fontconfig headers... " >&6; }
+ if test -s "${with_fontconfig_include}/fontconfig/fontconfig.h"; then
+ FONTCONFIG_CFLAGS="-I${with_fontconfig_include}"
+ FONTCONFIG_FOUND=yes
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $FONTCONFIG_FOUND" >&5
+ $as_echo "$FONTCONFIG_FOUND" >&6; }
+ else
+ as_fn_error $? "Can't find 'fontconfig/fontconfig.h' under ${with_fontconfig_include} given with the --with-fontconfig-include option." "$LINENO" 5
+ fi
+ fi
+ if test "x$FONTCONFIG_FOUND" = xno; then
+ # Are the fontconfig headers installed in the default /usr/include location?
+ for ac_header in fontconfig/fontconfig.h
+ do :
+ ac_fn_cxx_check_header_mongrel "$LINENO" "fontconfig/fontconfig.h" "ac_cv_header_fontconfig_fontconfig_h" "$ac_includes_default"
+ if test "x$ac_cv_header_fontconfig_fontconfig_h" = xyes; then :
+ cat >>confdefs.h <<_ACEOF
+ #define HAVE_FONTCONFIG_FONTCONFIG_H 1
+ _ACEOF
+
+ FONTCONFIG_FOUND=yes
+ FONTCONFIG_CFLAGS=
+ DEFAULT_FONTCONFIG=yes
+
+ fi
+
+ done
+
+ fi
+ if test "x$FONTCONFIG_FOUND" = xno; then
+
+ # Print a helpful message on how to acquire the necessary build dependency.
+ # fontconfig is the help tag: freetype, cups, pulse, alsa etc
+ MISSING_DEPENDENCY=fontconfig
+
+ if test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.cygwin"; then
+ cygwin_help $MISSING_DEPENDENCY
+ elif test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.msys"; then
+ msys_help $MISSING_DEPENDENCY
+ else
+ PKGHANDLER_COMMAND=
+
+ case $PKGHANDLER in
+ apt-get)
+ apt_help $MISSING_DEPENDENCY ;;
+ yum)
+ yum_help $MISSING_DEPENDENCY ;;
+ port)
+ port_help $MISSING_DEPENDENCY ;;
+ pkgutil)
+ pkgutil_help $MISSING_DEPENDENCY ;;
+ pkgadd)
+ pkgadd_help $MISSING_DEPENDENCY ;;
+ esac
+
+ if test "x$PKGHANDLER_COMMAND" != x; then
+ HELP_MSG="You might be able to fix this by running '$PKGHANDLER_COMMAND'."
+ fi
+ fi
+
+ as_fn_error $? "Could not find fontconfig! $HELP_MSG " "$LINENO" 5
+ fi
+ fi
+
+
+
+
+
###############################################################################
#
# Check for the jpeg library
#
< prev index next >