Mercurial > hg > release > icedtea6-1.13
changeset 3266:71cd145e7a3a
PR3142: Don't assume system mime.types supports text/x-java-source
2016-07-27 Andrew John Hughes <gnu.andrew@member.fsf.org>
PR3142: Don't assume system mime.types
supports text/x-java-source
* Makefile.am:
(check-mimetype): Make second test depend
on JAVA_SOURCE_SUPPORTED conditional,
not MIME_TYPES_FILE_FOUND.
* NEWS: Updated.
* acinclude.m4:
(IT_CHECK_FOR_MIME_TYPES): Check if the
system mime types file supports text/x-java-source.
| author | Andrew John Hughes <gnu.andrew@redhat.com> |
|---|---|
| date | Mon, 15 Aug 2016 20:13:54 +0100 |
| parents | d491b689c5b8 |
| children | 8746fd545d78 |
| files | ChangeLog Makefile.am NEWS acinclude.m4 |
| diffstat | 4 files changed, 25 insertions(+), 2 deletions(-) [+] |
line wrap: on
line diff
--- a/ChangeLog Wed Aug 17 03:46:55 2016 +0100 +++ b/ChangeLog Mon Aug 15 20:13:54 2016 +0100 @@ -1,3 +1,16 @@ +2016-07-27 Andrew John Hughes <gnu.andrew@member.fsf.org> + + PR3142: Don't assume system mime.types + supports text/x-java-source + * Makefile.am: + (check-mimetype): Make second test depend + on JAVA_SOURCE_SUPPORTED conditional, + not MIME_TYPES_FILE_FOUND. + * NEWS: Updated. + * acinclude.m4: + (IT_CHECK_FOR_MIME_TYPES): Check if the + system mime types file supports text/x-java-source. + 2016-08-14 Andrew John Hughes <gnu.andrew@member.fsf.org> PR3140: Pass $(CC) and $(CXX) to OpenJDK build
--- a/Makefile.am Wed Aug 17 03:46:55 2016 +0100 +++ b/Makefile.am Mon Aug 15 20:13:54 2016 +0100 @@ -2887,7 +2887,7 @@ exit -1; \ fi ; \ fi -if MIME_TYPES_FILE_FOUND +if JAVA_SOURCE_SUPPORTED if [ -e $(BUILD_SDK_DIR)/bin/java ] ; then \ expected="text/x-java-source" ; \ java=$$($(BUILD_SDK_DIR)/bin/java -cp $(MIME_TYPE_CHECK_BUILD_DIR) RH1195203 \
--- a/NEWS Wed Aug 17 03:46:55 2016 +0100 +++ b/NEWS Mon Aug 15 20:13:54 2016 +0100 @@ -32,6 +32,7 @@ - PR3132: PaX marking fails on filesystems which don't support extended attributes - PR3137: GTKLookAndFeel does not honor gtk-alternative-button-order - PR3140: Pass $(CC) and $(CXX) to OpenJDK build + - PR3142: Don't assume system mime.types supports text/x-java-source New in release 1.13.11 (2016-05-05):
--- a/acinclude.m4 Wed Aug 17 03:46:55 2016 +0100 +++ b/acinclude.m4 Mon Aug 15 20:13:54 2016 +0100 @@ -2437,11 +2437,20 @@ mime_types_file_found=no fi AC_MSG_RESULT([$mime_types_file_found]) - if test "x${mime_types_file_found}" = "xno"; then + if test "x${mime_types_file_found}" = "xyes"; then + AC_MSG_CHECKING([if ${MIME_TYPES_FILE} has text/x-java-source]) + if grep '^text/x-java-source' ${MIME_TYPES_FILE} >&AS_MESSAGE_LOG_FD ; then + java_source_supported=yes + else + java_source_supported=no + fi + AC_MSG_RESULT([$java_source_supported]) + else AC_MSG_WARN([No system MIME types file found.]) fi AC_SUBST([MIME_TYPES_FILE]) AM_CONDITIONAL(MIME_TYPES_FILE_FOUND, test "x${mime_types_file_found}" = "xyes") + AM_CONDITIONAL(JAVA_SOURCE_SUPPORTED, test "x${java_source_supported}" = "xyes") ]) AC_DEFUN_ONCE([IT_WITH_FONTS_DIR],