summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--Makefile.am4
-rw-r--r--configure.ac3
2 files changed, 5 insertions, 2 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
diff --git a/configure.ac b/configure.ac
index 86f064c..f0abff5 100644
--- a/configure.ac
+++ b/configure.ac
@@ -346,6 +346,7 @@ AC_ARG_ENABLE([gtk],
],
[gtk=auto])
+AM_CONDITIONAL([GCONF_SCHEMAS_INSTALL], [false])
if test "x${gtk}" != xno ; then
PKG_CHECK_MODULES(GTK, [ gtk+-2.0 >= 2.13.4 gthread-2.0 ],
[
@@ -353,6 +354,7 @@ if test "x${gtk}" != xno ; then
AC_DEFINE([HAVE_GTK], 1, [Have GTK?])
AC_PATH_PROG(GCONFTOOL, gconftool-2)
+ AM_GCONF_SOURCE_2
GTK_VERSION=`$PKG_CONFIG --variable=gtk_binary_version gtk+-2.0`
GTK_MODULES_DIR="${libdir}/gtk-2.0/modules"
@@ -367,7 +369,6 @@ else
HAVE_GTK=0
fi
-AM_GCONF_SOURCE_2
AC_SUBST(GTK_CFLAGS)
AC_SUBST(GTK_LIBS)