equal
deleted
inserted
replaced
29 m4_include([lib-cups.m4]) |
29 m4_include([lib-cups.m4]) |
30 m4_include([lib-ffi.m4]) |
30 m4_include([lib-ffi.m4]) |
31 m4_include([lib-freetype.m4]) |
31 m4_include([lib-freetype.m4]) |
32 m4_include([lib-std.m4]) |
32 m4_include([lib-std.m4]) |
33 m4_include([lib-x11.m4]) |
33 m4_include([lib-x11.m4]) |
|
34 m4_include([lib-fontconfig.m4]) |
34 |
35 |
35 ################################################################################ |
36 ################################################################################ |
36 # Determine which libraries are needed for this configuration |
37 # Determine which libraries are needed for this configuration |
37 ################################################################################ |
38 ################################################################################ |
38 AC_DEFUN_ONCE([LIB_DETERMINE_DEPENDENCIES], |
39 AC_DEFUN_ONCE([LIB_DETERMINE_DEPENDENCIES], |
43 NEEDS_LIB_X11=false |
44 NEEDS_LIB_X11=false |
44 else |
45 else |
45 # All other instances need X11, even if building headless only, libawt still |
46 # All other instances need X11, even if building headless only, libawt still |
46 # needs X11 headers. |
47 # needs X11 headers. |
47 NEEDS_LIB_X11=true |
48 NEEDS_LIB_X11=true |
|
49 fi |
|
50 |
|
51 # Check if fontconfig is needed |
|
52 if test "x$OPENJDK_TARGET_OS" = xwindows || test "x$OPENJDK_TARGET_OS" = xmacosx; then |
|
53 # No fontconfig support on windows or macosx |
|
54 NEEDS_LIB_FONTCONFIG=false |
|
55 else |
|
56 # All other instances need fontconfig, even if building headless only, |
|
57 # libawt still needs fontconfig headers. |
|
58 NEEDS_LIB_FONTCONFIG=true |
48 fi |
59 fi |
49 |
60 |
50 # Check if cups is needed |
61 # Check if cups is needed |
51 if test "x$OPENJDK_TARGET_OS" = xwindows; then |
62 if test "x$OPENJDK_TARGET_OS" = xwindows; then |
52 # Windows have a separate print system |
63 # Windows have a separate print system |
81 AC_DEFUN_ONCE([LIB_SETUP_LIBRARIES], |
92 AC_DEFUN_ONCE([LIB_SETUP_LIBRARIES], |
82 [ |
93 [ |
83 LIB_SETUP_STD_LIBS |
94 LIB_SETUP_STD_LIBS |
84 LIB_SETUP_X11 |
95 LIB_SETUP_X11 |
85 LIB_SETUP_CUPS |
96 LIB_SETUP_CUPS |
|
97 LIB_SETUP_FONTCONFIG |
86 LIB_SETUP_FREETYPE |
98 LIB_SETUP_FREETYPE |
87 LIB_SETUP_ALSA |
99 LIB_SETUP_ALSA |
88 LIB_SETUP_LIBFFI |
100 LIB_SETUP_LIBFFI |
89 LIB_SETUP_BUNDLED_LIBS |
101 LIB_SETUP_BUNDLED_LIBS |
90 LIB_SETUP_MISC_LIBS |
102 LIB_SETUP_MISC_LIBS |