/hg/icedtea6: PR2969: ENABLE_SYSTEM_LCMS is not defined if ENABL...

[andrew at icedtea.classpath.org]

changeset cc7089689313 in /hg/icedtea6
details: http://icedtea.classpath.org/hg/icedtea6?cmd=changeset;node=cc7089689313
author: Andrew John Hughes <gnu.andrew at redhat.com>
date: Tue May 24 17:57:12 2016 +0100

	PR2969: ENABLE_SYSTEM_LCMS is not defined if ENABLE_LCMS2 is not set

	2016-05-24  Andrew John Hughes  <gnu.andrew at redhat.com>

		PR2969: ENABLE_SYSTEM_LCMS is not defined
		if ENABLE_LCMS2 is not set
		* NEWS: Updated.
		* acinclude.m4:
		(IT_CHECK_FOR_LCMS): Set ENABLE_SYSTEM_LCMS
		to no if ENABLE_LCMS2 is not set.


diffstat:

 ChangeLog    |  9 +++++++++
 NEWS         |  1 +
 acinclude.m4 |  2 ++
 3 files changed, 12 insertions(+), 0 deletions(-)

diffs (39 lines):

diff -r b04ff35af086 -r cc7089689313 ChangeLog
--- a/ChangeLog	Wed May 18 19:05:31 2016 +0100
+++ b/ChangeLog	Tue May 24 17:57:12 2016 +0100
@@ -1,3 +1,12 @@
+2016-05-24  Andrew John Hughes  <gnu.andrew at redhat.com>
+
+	PR2969: ENABLE_SYSTEM_LCMS is not defined
+	if ENABLE_LCMS2 is not set
+	* NEWS: Updated.
+	* acinclude.m4:
+	(IT_CHECK_FOR_LCMS): Set ENABLE_SYSTEM_LCMS
+	to no if ENABLE_LCMS2 is not set.
+
 2016-05-17  Andrew John Hughes  <gnu.andrew at redhat.com>
 
 	PR2962: System default check doesn't match all
diff -r b04ff35af086 -r cc7089689313 NEWS
--- a/NEWS	Wed May 18 19:05:31 2016 +0100
+++ b/NEWS	Tue May 24 17:57:12 2016 +0100
@@ -32,6 +32,7 @@
   - PR2957: Build bootstrap code (rt-class-files.stamp) using bootstrap flags (source/target 1.5)
   - PR2961: Latest security update broke bundled LCMS2 build
   - PR2962: System default check doesn't match all GNU/Linux systems
+  - PR2969: ENABLE_SYSTEM_LCMS is not defined if ENABLE_LCMS2 is not set
 
 New in release 1.13.11 (2016-05-05):
 
diff -r b04ff35af086 -r cc7089689313 acinclude.m4
--- a/acinclude.m4	Wed May 18 19:05:31 2016 +0100
+++ b/acinclude.m4	Tue May 24 17:57:12 2016 +0100
@@ -1575,6 +1575,8 @@
           ENABLE_SYSTEM_LCMS="no" ;
 	  ;;
       esac
+    else
+      ENABLE_SYSTEM_LCMS="no"
     fi;
   ])
   AC_MSG_RESULT(${ENABLE_SYSTEM_LCMS})