equal
deleted
inserted
replaced
100 FREETYPE_CFLAGS= |
100 FREETYPE_CFLAGS= |
101 FREETYPE_LIBS= |
101 FREETYPE_LIBS= |
102 |
102 |
103 if (test "x$with_freetype_include" = "x" && test "x$with_freetype_lib" != "x") || \ |
103 if (test "x$with_freetype_include" = "x" && test "x$with_freetype_lib" != "x") || \ |
104 (test "x$with_freetype_include" != "x" && test "x$with_freetype_lib" = "x"); then |
104 (test "x$with_freetype_include" != "x" && test "x$with_freetype_lib" = "x"); then |
105 AC_MSG_ERROR(['must specify both or neither of --with_freetype_include and --with_freetype_lib]) |
105 AC_MSG_ERROR(['must specify both or neither of --with-freetype-include and --with-freetype-lib]) |
106 fi |
106 fi |
107 |
107 |
108 FREETYPE_TO_USE=bundled |
108 FREETYPE_TO_USE=bundled |
109 if (test "x$OPENJDK_TARGET_OS" != "xwindows" && test "x$OPENJDK_TARGET_OS" != "xmacosx"); then |
109 if (test "x$OPENJDK_TARGET_OS" != "xwindows" && test "x$OPENJDK_TARGET_OS" != "xmacosx"); then |
110 FREETYPE_TO_USE=system |
110 FREETYPE_TO_USE=system |
113 if (test "x$with_freetype" = "xsystem"); then |
113 if (test "x$with_freetype" = "xsystem"); then |
114 FREETYPE_TO_USE=system |
114 FREETYPE_TO_USE=system |
115 elif (test "x$with_freetype" = "xbundled"); then |
115 elif (test "x$with_freetype" = "xbundled"); then |
116 FREETYPE_TO_USE=bundled |
116 FREETYPE_TO_USE=bundled |
117 if (test "x$with_freetype_include" != "x" || test "x$with_freetype_lib" != "x"); then |
117 if (test "x$with_freetype_include" != "x" || test "x$with_freetype_lib" != "x"); then |
118 AC_MSG_ERROR(['bundled' cannot be specified with --with_freetype_include and --with_freetype_lib]) |
118 AC_MSG_ERROR(['bundled' cannot be specified with --with-freetype-include and --with-freetype-lib]) |
119 fi |
119 fi |
120 else |
120 else |
121 AC_MSG_ERROR(['valid values for --with-freetype are 'system' and 'bundled']) |
121 AC_MSG_ERROR(['valid values for --with-freetype are 'system' and 'bundled']) |
122 fi |
122 fi |
123 fi |
123 fi |