changeset 3257:dcf569e8e778

PR2969: ENABLE_SYSTEM_LCMS is not defined if ENABLE_LCMS2 is not set 2016-05-24 Andrew John Hughes <gnu.andrew@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.
author Andrew John Hughes <gnu.andrew@redhat.com>
date Tue, 24 May 2016 17:57:12 +0100
parents 30cfcde89678
children ced27e54d17c
files ChangeLog NEWS acinclude.m4
diffstat 3 files changed, 12 insertions(+), 0 deletions(-) [+]
line wrap: on
line diff
--- 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@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@redhat.com>
 
 	PR2962: System default check doesn't match all
--- a/NEWS	Wed May 18 19:05:31 2016 +0100
+++ b/NEWS	Tue May 24 17:57:12 2016 +0100
@@ -20,6 +20,7 @@
   - PR2954: ecj/override.patch is missing new @Overrides in RMIJRMPServerImpl.java
   - 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):
 
--- 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})