Mercurial > hg > release > icedtea7-2.6
changeset 2894:c05a822a6ec0
PR3114: Don't assume system mime.types supports text/x-java-source
2016-07-27 Andrew John Hughes <gnu.andrew@member.fsf.org>
PR3114: 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@member.fsf.org> |
|---|---|
| date | Fri, 29 Jul 2016 04:16:05 +0100 |
| parents | 937c6c005478 |
| children | b1af4fd3e218 |
| files | ChangeLog Makefile.am NEWS acinclude.m4 |
| diffstat | 4 files changed, 25 insertions(+), 2 deletions(-) [+] |
line wrap: on
line diff
--- a/ChangeLog Fri Jul 29 04:14:22 2016 +0100 +++ b/ChangeLog Fri Jul 29 04:16:05 2016 +0100 @@ -1,3 +1,16 @@ +2016-07-27 Andrew John Hughes <gnu.andrew@member.fsf.org> + + PR3114: 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-07-20 Andrew John Hughes <gnu.andrew@redhat.com> PR3103: Handle case in clean-fonts where
--- a/Makefile.am Fri Jul 29 04:14:22 2016 +0100 +++ b/Makefile.am Fri Jul 29 04:16:05 2016 +0100 @@ -2977,7 +2977,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 Fri Jul 29 04:14:22 2016 +0100 +++ b/NEWS Fri Jul 29 04:16:05 2016 +0100 @@ -100,6 +100,7 @@ - PR3102: Extend 8022594 to AixPollPort - PR3103: Handle case in clean-fonts where linux.fontconfig.Gentoo.properties.old has not been created - PR3111: Provide option to disable SystemTap tests + - PR3114: Don't assume system mime.types supports text/x-java-source - PR3115: Add check for elliptic curve cryptography implementation * AArch64 port - S8148328, PR3100: aarch64: redundant lsr instructions in stub code.
--- a/acinclude.m4 Fri Jul 29 04:14:22 2016 +0100 +++ b/acinclude.m4 Fri Jul 29 04:16:05 2016 +0100 @@ -3410,11 +3410,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_DISABLE_SYSTEMTAP_TESTS],