mirror of
https://gitlab.com/CinnamonSlackBuilds/csb.git
synced 2024-12-28 09:58:11 +01:00
53 lines
1.5 KiB
Diff
53 lines
1.5 KiB
Diff
From 99d9b01dac12845d362c5cba14757f9ff90e416d Mon Sep 17 00:00:00 2001
|
|
From: Eli Schwartz <eschwartz@archlinux.org>
|
|
Date: Sat, 3 Nov 2018 22:40:36 -0400
|
|
Subject: [PATCH] always process clutter Makefile.in
|
|
|
|
The current check includes the subdir unless it's explicitly disabled,
|
|
but only builds the Makefile if it's explicitly disabled. This means
|
|
the entire project fails to build while processing the docs folder, even
|
|
if docs are disabled and a no-op... unless clutter docs are separately
|
|
disabled.
|
|
---
|
|
configure.ac | 17 ++++-------------
|
|
1 file changed, 4 insertions(+), 13 deletions(-)
|
|
|
|
diff --git a/configure.ac b/configure.ac
|
|
index 39e6c1af..54388825 100644
|
|
--- a/configure.ac
|
|
+++ b/configure.ac
|
|
@@ -479,6 +479,8 @@ AC_ARG_ENABLE(clutter-doc,
|
|
[ --disable-clutter-doc disable Clutter docs generation],,
|
|
clutter_doc=yes)
|
|
|
|
+AM_CONDITIONAL(CLUTTER_DOC, test "$clutter_doc" = "yes")
|
|
+
|
|
AC_CONFIG_FILES([
|
|
Makefile
|
|
data/Makefile
|
|
@@ -487,18 +489,8 @@ doc/man/Makefile
|
|
doc/reference/Makefile
|
|
doc/reference/muffin/Makefile
|
|
doc/reference/muffin/muffin-docs.sgml
|
|
-])
|
|
-
|
|
-if test "x$clutter_doc" = "xno"; then
|
|
- AC_CONFIG_FILES([
|
|
- doc/reference/clutter/Makefile
|
|
- doc/reference/clutter/clutter-docs.xml
|
|
- ])
|
|
-fi
|
|
-
|
|
-AM_CONDITIONAL(CLUTTER_DOC, test "$clutter_doc" = "yes")
|
|
-
|
|
-AC_CONFIG_FILES([
|
|
+doc/reference/clutter/Makefile
|
|
+doc/reference/clutter/clutter-docs.xml
|
|
doc/reference/cogl/Makefile
|
|
doc/reference/cogl/cogl-docs.xml
|
|
src/Makefile
|
|
@@ -546,4 +538,3 @@ muffin-$VERSION
|
|
Xsync: ${found_xsync}
|
|
Xcursor: ${have_xcursor}
|
|
"
|
|
-
|