From 987a50be91f67a64cca32e7403b98c69b5aedb4c Mon Sep 17 00:00:00 2001 From: Emmanuele Bassi Date: Fri, 17 Dec 2010 15:43:24 +0000 Subject: [PATCH] build: Fix release-check for cogl2 reference --- configure.ac | 10 ++++++++-- doc/reference/Makefile.am | 7 ++----- 2 files changed, 10 insertions(+), 7 deletions(-) diff --git a/configure.ac b/configure.ac index e3aa6ef8f..07278f578 100644 --- a/configure.ac +++ b/configure.ac @@ -1152,8 +1152,6 @@ AC_CONFIG_FILES([ doc/reference/clutter/clutter-docs.xml doc/reference/cogl/Makefile doc/reference/cogl/cogl-docs.xml - doc/reference/cogl-2.0/Makefile - doc/reference/cogl-2.0/cogl-docs.xml doc/reference/cally/Makefile doc/reference/cally/cally-docs.xml doc/common/Makefile @@ -1166,6 +1164,14 @@ AC_CONFIG_FILES([ po/Makefile.in ]) +AS_IF([test "x$enable_cogl2_reference" = "xyes"], + [ + AC_CONFIG_FILES([ + doc/reference/cogl-2.0/Makefile + doc/reference/cogl-2.0/cogl-docs.xml + ]) +]) + AC_OUTPUT dnl === Summary =============================================================== diff --git a/doc/reference/Makefile.am b/doc/reference/Makefile.am index 873378a5a..f93f8f542 100644 --- a/doc/reference/Makefile.am +++ b/doc/reference/Makefile.am @@ -1,12 +1,9 @@ SUBDIRS = cogl clutter cally -if BUILD_COGL2_REFERENCE -SUBDIRS += cogl-2.0 -endif - DIST_SUBDIRS = cogl clutter cally if BUILD_COGL2_REFERENCE +SUBDIRS += cogl-2.0 + DIST_SUBDIRS += cogl-2.0 endif -