summaryrefslogtreecommitdiffstats
path: root/Makefile.am
diff options
context:
space:
mode:
authorDaniel Macks <dmacks@netspace.org>2009-04-19 03:44:24 +0200
committerLennart Poettering <lennart@poettering.net>2009-04-19 03:44:24 +0200
commitdddb6280678e18f658e65260f3914e22f8fa9639 (patch)
tree23ae59df9e70cbf487a82e6d621da4e4725757df /Makefile.am
parent16e37eaa0855505ce9a1ba9bb8ef4ef9c8cd4e01 (diff)
build-system: don't do gconf if gtk is disabled
libcanberra.schemas is the gconf hook for canberra-gtk-module, so it shouldn't be installed if gtk is disabled in the libcanberra build ("no canberra-gtk-module" should propagate "no pointers to it"). Closes bz #20926
Diffstat (limited to 'Makefile.am')
-rw-r--r--Makefile.am4
1 files changed, 3 insertions, 1 deletions
diff --git a/Makefile.am b/Makefile.am
index 8db04da..d0fc8b6 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -29,7 +29,6 @@ pkgconfig_DATA = libcanberra.pc
if HAVE_GTK
pkgconfig_DATA += libcanberra-gtk.pc
-endif
schemasdir = $(GCONF_SCHEMA_FILE_DIR)
schemas_DATA = libcanberra.schemas
@@ -44,6 +43,9 @@ install-data-local:
else
install-data-local:
endif
+else
+install-data-local:
+endif
DISTCHECK_CONFIGURE_FLAGS=--enable-gtk-doc
ACLOCAL_AMFLAGS = -I m4